Changeset 863 in 3DVCSoftware

Timestamp:

5 Mar 2014, 20:27:09 (11 years ago)

Author:

tech

Message:

Merged HTM-10.0-Fix@861.

Added bug fix for ticket 56.

Location:

trunk/source/Lib/TLibCommon

Files:

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

trunk/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4737 +4737 @@
 
           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() )
               {
@@ -4763 +4771 @@
               }
           }
+
+#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() )
               {

trunk/source/Lib/TLibCommon/TypeDef.h

@@ -279 +279 @@
 
 #define MTK_DDD_G0063                     1   // Disparity derived depth coding
+#define HTM10RC1_FIX                           1   // Fix of DDD
+
 
 #if H_3D_VSP