Changeset 28 in SHVCSoftware for trunk/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

7 Feb 2013, 02:16:51 (12 years ago)

Author:

seregin

Message:

Reintegrate SHM-1.0-dev branch

File:

• trunk/source/Lib/TLibEncoder/TEncCu.cpp (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1351 +1351 @@
     for( UInt uiMergeCand = 0; uiMergeCand < numValidMergeCand; ++uiMergeCand )
     {
+#if REF_IDX_ME_ZEROMV
+                Bool bZeroMVILR = rpcTempCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
+                if(bZeroMVILR)
+                {
+#endif
         if(!(uiNoResidual==1 && mergeCandBuffer[uiMergeCand]==1))
         {
@@ -1402 +1407 @@
     }
     }
+#if REF_IDX_ME_ZEROMV 
+        }
+#endif
    }