Changeset 33 in SHVCSoftware for trunk/source/Lib/TLibEncoder/TEncSearch.cpp

Timestamp:

8 Feb 2013, 00:06:35 (12 years ago)

Author:

seregin

Message:

Reintegrate SHM-1.0-dev

Location:

trunk/source

Files:

• . (modified) (1 prop)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (3 diffs)

trunk/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3187 +3187 @@
     uhInterDirNeighbours[uiMergeCand] = 0;
     cMvFieldNeighbours[0 + 2*uiMergeCand].setMvField(TComMv(), NOT_VALID);
-          cMvFieldNeighbours[1 + 2*uiMergeCand].setMvField(TComMv(), NOT_VALID);
+    cMvFieldNeighbours[1 + 2*uiMergeCand].setMvField(TComMv(), NOT_VALID);
   }
 #endif
@@ -3212 +3212 @@
   {
 #if REF_IDX_ME_ZEROMV
-          Bool bZeroMVILR = pcCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
-          if(bZeroMVILR)
-          {
+    Bool bZeroMVILR = pcCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
+    if(bZeroMVILR)
+    {
 #endif
       UInt uiCostCand = MAX_UINT;
@@ -3240 +3240 @@
       }
 #if REF_IDX_ME_ZEROMV
-          }
+    }
 #endif
     }