Changeset 105 in 3DVCSoftware for trunk

Timestamp:

14 Aug 2012, 20:24:45 (12 years ago)

Author:

tech

Message:

Fixes and update of xcode project

• FIX_DECODING_WO_WRITING
• FIX_INIT_ROM
• FIX_VIRT_DESTRUCTOR

Location:

trunk

Files:

• HTM.xcodeproj/project.pbxproj (modified) (2 diffs)
• source/App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• source/Lib/TLibCommon/CommonDef.h (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• source/Lib/TLibEncoder/TEncTop.cpp (modified) (1 diff)
• source/Lib/TLibRenderer/TRenSingleModel.h (modified) (1 diff)

trunk/HTM.xcodeproj/project.pbxproj

@@ -1503 +1503 @@
                                 GCC_WARN_UNUSED_VARIABLE = YES;
                                 HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/source/Lib/";
+                                MACOSX_DEPLOYMENT_TARGET = 10.7;
                                 ONLY_ACTIVE_ARCH = YES;
                                 SDKROOT = macosx;
@@ -1518 +1519 @@
                                 GCC_WARN_UNUSED_VARIABLE = YES;
                                 HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/source/Lib/";
+                                MACOSX_DEPLOYMENT_TARGET = 10.7;
                                 SDKROOT = macosx;
                         };

trunk/source/App/TAppDecoder/TAppDecTop.cpp

@@ -435 +435 @@
   if( isDepth )
     m_useDepth = true;
-  while( m_tVideoIOYuvReconFile.size() < newNumberOfViewDepth)
-  {
-    m_tVideoIOYuvReconFile.push_back(new TVideoIOYuv);
-    Char buffer[4];
-#if VIDYO_VPS_INTEGRATION
-    sprintf(buffer,"_%i", viewId );
-#else
-    sprintf(buffer,"_%i", (Int)(m_tVideoIOYuvReconFile.size()-1) / 2 );
-#endif
-    Char* nextFilename = NULL;
-#if VIDYO_VPS_INTEGRATION
-    if( isDepth)
-#else
-    if( (m_tVideoIOYuvReconFile.size() % 2) == 0 )
-#endif
-    {
-      Char* pchTempFilename = NULL;
-      xAppendToFileNameEnd( m_pchReconFile, "_depth", pchTempFilename);
-      xAppendToFileNameEnd( pchTempFilename, buffer, nextFilename);
-      free ( pchTempFilename );
-    }
-    else
-    {
-      xAppendToFileNameEnd( m_pchReconFile, buffer, nextFilename);
-    }
+
+#if FIX_DECODING_WO_WRITING
+  if ( m_pchReconFile )
+  { 
+#endif
+    while( m_tVideoIOYuvReconFile.size() < newNumberOfViewDepth)
+    {
+      m_tVideoIOYuvReconFile.push_back(new TVideoIOYuv);
+      Char buffer[4];
+#if VIDYO_VPS_INTEGRATION
+      sprintf(buffer,"_%i", viewId );
+#else
+      sprintf(buffer,"_%i", (Int)(m_tVideoIOYuvReconFile.size()-1) / 2 );
+#endif
+      Char* nextFilename = NULL;
+#if VIDYO_VPS_INTEGRATION
+      if( isDepth)
+#else
+      if( (m_tVideoIOYuvReconFile.size() % 2) == 0 )
+#endif
+      {
+        Char* pchTempFilename = NULL;
+        xAppendToFileNameEnd( m_pchReconFile, "_depth", pchTempFilename);
+        xAppendToFileNameEnd( pchTempFilename, buffer, nextFilename);
+        free ( pchTempFilename );
+      }
+      else
+      {
+        xAppendToFileNameEnd( m_pchReconFile, buffer, nextFilename);
+      }
 #if !VIDYO_VPS_INTEGRATION
-    if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
-#endif
-    {
-      m_tVideoIOYuvReconFile.back()->open( nextFilename, true, m_outputBitDepth, g_uiBitDepth + g_uiBitIncrement );
-    }
+      if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
+#endif
+      {
+        m_tVideoIOYuvReconFile.back()->open( nextFilename, true, m_outputBitDepth, g_uiBitDepth + g_uiBitIncrement );
+      }
       free ( nextFilename );
-  }
+    }
+#if FIX_DECODING_WO_WRITING
+  }
+#endif
+
   while( m_pocLastDisplay.size() < newNumberOfViewDepth )
   {

trunk/source/Lib/TLibCommon/CommonDef.h

@@ -58 +58 @@
 
 #define HM_VERSION        "6.1"
-#define NV_VERSION        "4.0rc1"                 ///< Current software version
+#define NV_VERSION        "4.0"                  ///< Current software version
 
 // ====================================================================================================================

trunk/source/Lib/TLibCommon/TypeDef.h

@@ -44 +44 @@
 #define FIXES                             1
 #define POZNAN_CABAC_INIT_FLAG_FIX        1
+#define FIX_DECODING_WO_WRITING           1
+#define FIX_INIT_ROM                      1
+#define FIX_VIRT_DESTRUCTOR               1
 
 

trunk/source/Lib/TLibEncoder/TEncTop.cpp

@@ -91 +91 @@
 {
   // initialize global variables
-  initROM();
-  
+#if FIX_INIT_ROM
+  if( m_viewId == 0 && m_isDepth == false )
+  {
+#endif
+    initROM();
+#if FIX_INIT_ROM
+  }
+#endif
+
+
   // create processing unit classes
   m_cGOPEncoder.        create( getSourceWidth(), getSourceHeight(), g_uiMaxCUWidth, g_uiMaxCUHeight );

trunk/source/Lib/TLibRenderer/TRenSingleModel.h

@@ -68 +68 @@
 {
 public: 
+
+#if FIX_VIRT_DESTRUCTOR
+  virtual ~TRenSingleModel() { }  
+#endif
 #if LGE_VSO_EARLY_SKIP_A0093
   virtual Void   create    ( Int iMode, Int iWidth, Int iHeight, Int iShiftPrec, Int*** aaaiSubPelShiftTable, Int iHoleMargin, Bool bUseOrgRef, Int iBlendMode, Bool bEarlySkip ) = 0;