Changeset 23 in SHVCSoftware for branches/SHM-1.0-dev/source/Lib/TLibEncoder

Timestamp:

30 Jan 2013, 21:09:30 (12 years ago)

Author:

interdigital

Message:

 

Location:

branches/SHM-1.0-dev/source/Lib/TLibEncoder

Files:

• TEncCu.cpp (modified) (2 diffs)
• TEncSearch.cpp (modified) (3 diffs)

branches/SHM-1.0-dev/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
    }
 

branches/SHM-1.0-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3211 +3211 @@
   for( UInt uiMergeCand = 0; uiMergeCand < numValidMergeCand; ++uiMergeCand )
   {
+#if REF_IDX_ME_ZEROMV
+          Bool bZeroMVILR = pcCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
+          if(bZeroMVILR)
+          {
+#endif
       UInt uiCostCand = MAX_UINT;
       UInt uiBitsCand = 0;
@@ -3234 +3239 @@
         uiMergeIndex = uiMergeCand;
       }
+#if REF_IDX_ME_ZEROMV
+          }
+#endif
     }
 }
@@ -3420 +3428 @@
         if(pcCU->getSlice()->getMvdL1ZeroFlag() && iRefList==1 && biPDistTemp < bestBiPDist)
         {
+#if REF_IDX_ME_ZEROMV 
+                  Bool bZeroMVILR = pcCU->xCheckZeroMVILRMvdL1Zero(iRefList, iRefIdxTemp, aaiMvpIdx[iRefList][iRefIdxTemp]);
+                  if(bZeroMVILR)
+                  {
+#endif
           bestBiPDist = biPDistTemp;
           bestBiPMvpL1 = aaiMvpIdx[iRefList][iRefIdxTemp];
           bestBiPRefIdxL1 = iRefIdxTemp;
+#if REF_IDX_ME_ZEROMV
+                  }
+#endif
         }