Changeset 12 in SHVCSoftware

Timestamp:

28 Jan 2013, 21:16:05 (12 years ago)

Author:

seregin

Message:

BUGFIX_925: integrated fix for the ticket #925

Location:

trunk/source/Lib/TLibCommon

Files:

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

trunk/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2840 +2840 @@
 {
   UInt uiAbsPartAddr = m_uiAbsIdxInLCU + uiAbsPartIdx;
+#if !BUGFIX_925
   UInt uiIdx = 1;
+#endif
   bool abCandIsInter[ MRG_MAX_NUM_CANDS ];
   for( UInt ui = 0; ui < getSlice()->getMaxNumMergeCand(); ++ui )
@@ -3192 +3194 @@
     UInt uiPartIdxCenter;
     UInt uiCurLCUIdx = getAddr();
+#if BUGFIX_925
+    Int dir = 0;
+    UInt uiArrayAddr = iCount;
+#endif
     xDeriveCenterIdx( eCUMode, uiPUIdx, uiPartIdxCenter );
     bExistMV = uiLCUIdx >= 0 && xGetColMVP( REF_PIC_LIST_0, uiLCUIdx, uiAbsPartAddr, cColMv, iRefIdx );
@@ -3198 +3204 @@
       bExistMV = xGetColMVP( REF_PIC_LIST_0, uiCurLCUIdx, uiPartIdxCenter,  cColMv, iRefIdx );
     }
+#if BUGFIX_925
+    if( bExistMV )
+    {
+      dir |= 1;
+      pcMvFieldNeighbours[ 2 * uiArrayAddr ].setMvField( cColMv, iRefIdx );
+    }
+
+    if( getSlice()->isInterB() )
+    {
+      bExistMV = uiLCUIdx >= 0 && xGetColMVP( REF_PIC_LIST_1, uiLCUIdx, uiAbsPartAddr, cColMv, iRefIdx);
+      if( bExistMV == false )
+      {
+        bExistMV = xGetColMVP( REF_PIC_LIST_1, uiCurLCUIdx, uiPartIdxCenter, cColMv, iRefIdx );
+      }
+      if( bExistMV )
+      {
+        dir |= 2;
+        pcMvFieldNeighbours[ 2 * uiArrayAddr + 1 ].setMvField( cColMv, iRefIdx );
+      }
+    }
+
+    if( dir != 0 )
+    {
+      puhInterDirNeighbours[uiArrayAddr] = dir;
+      abCandIsInter[uiArrayAddr] = true;
+
+      if( mrgCandIdx == iCount )
+      {
+        return;
+      }
+      iCount++;
+    }
+#else
     if( bExistMV )
     {
@@ -3233 +3272 @@
     }
     uiIdx++;
+#endif
 
   }

trunk/source/Lib/TLibCommon/TypeDef.h

@@ -47 +47 @@
 #define PHASE_DERIVATION_IN_INTEGER      1      ///< upsampling filters implementation using only integer arithmetic
 #define SET_SLICE_LAYER_ID               1      ///< set layerId to the slice
+#define BUGFIX_925                       1      ///< bug fix ticket #925
 
 #define AVC_BASE                         0      ///< YUV BL reading for AVC base SVC