Changeset 868 in 3DVCSoftware for branches/HTM-10.0-dev0/source/Lib/TLibCommon

Timestamp:

25 Mar 2014, 12:11:22 (11 years ago)

Author:

tech

Message:

Merged fix from 10.0r1.

Location:

branches/HTM-10.0-dev0/source/Lib/TLibCommon

Files:

• CommonDef.h (modified) (1 diff)
• TComDataCU.cpp (modified) (2 diffs)
• TypeDef.h (modified) (2 diffs)

branches/HTM-10.0-dev0/source/Lib/TLibCommon/CommonDef.h

@@ -60 +60 @@
 
 #if H_MV
-#define NV_VERSION        "10.0"              ///< Current software version
+#define NV_VERSION        "10.0r1"                ///< Current software version
 #define HM_VERSION        "13.0"                ///< 
 #else

branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4718 +4718 @@
 
           TComMvField cMVField;
+#if !HTM10RC1_FIX
           UChar ucInterDir = pcTextureCU->getInterDir( uiPartIdx );
-
+#endif
           Int iDV = 0;
           Int iViewIdx = 0;
+#if !HTM10RC1_FIX
           if( ucInterDir & 1 )
           {
+#endif
               pcTextureCU->getMvField( pcTextureCU, uiPartIdx, REF_PIC_LIST_0, cMVField );
+#if HTM10RC1_FIX
+              if( cMVField.getRefIdx() >= 0 )
+              {
+#endif
               if( pcTextureSlice->getRefPOC( REF_PIC_LIST_0, cMVField.getRefIdx()) == pcTextureSlice->getPOC() )
               {
@@ -4744 +4751 @@
               }
           }
+
+#if !HTM10RC1_FIX
           if( !tmpDir && ( ucInterDir & 2 ))
           {
+#endif
               pcTextureCU->getMvField( pcTextureCU, uiPartIdx, REF_PIC_LIST_1, cMVField );
+
+#if HTM10RC1_FIX
+              if( !tmpDir && cMVField.getRefIdx() >= 0 )
+              {
+#endif
               if( pcTextureSlice->getRefPOC( REF_PIC_LIST_1, cMVField.getRefIdx()) == pcTextureSlice->getPOC() )
               {

branches/HTM-10.0-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -55 +55 @@
 
 #ifndef HEVC_EXT
-#define HEVC_EXT                    1
+#define HEVC_EXT                    2
 #endif
 
@@ -279 +279 @@
 
 #define MTK_DDD_G0063                     1   // Disparity derived depth coding
+#define HTM10RC1_FIX                           1   // Fix of DDD
+
 
 #if H_3D_VSP