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

Timestamp:

7 Feb 2013, 22:28:07 (13 years ago)

Author:

qualcomm

Message:

Clean up: convert all "tabs" to "spaces", liweig@…

Location:

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

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncCu.cpp (modified) (2 diffs)
• TEncSearch.cpp (modified) (6 diffs)

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

@@ -603 +603 @@
   if( pcSPS->getLayerId() > 0 )
   {
-          assert(pcSPS->getMFMEnabledFlag());
-          WRITE_FLAG( pcSPS->getMFMEnabledFlag() ? 1 : 0,          "sps_enh_mfm_enable_flag" );
+    assert(pcSPS->getMFMEnabledFlag());
+    WRITE_FLAG( pcSPS->getMFMEnabledFlag() ? 1 : 0,          "sps_enh_mfm_enable_flag" );
   }
 #endif

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

@@ -1352 +1352 @@
     {
 #if REF_IDX_ME_ZEROMV
-                Bool bZeroMVILR = rpcTempCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
-                if(bZeroMVILR)
-                {
+    Bool bZeroMVILR = rpcTempCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
+    if(bZeroMVILR)
+    {
 #endif
         if(!(uiNoResidual==1 && mergeCandBuffer[uiMergeCand]==1))
@@ -1408 +1408 @@
     }
 #if REF_IDX_ME_ZEROMV 
-        }
+  }
 #endif
    }

branches/SHM-1.0-dev/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
     }
@@ -3429 +3429 @@
         {
 #if REF_IDX_ME_ZEROMV 
-                  Bool bZeroMVILR = pcCU->xCheckZeroMVILRMvdL1Zero(iRefList, iRefIdxTemp, aaiMvpIdx[iRefList][iRefIdxTemp]);
-                  if(bZeroMVILR)
-                  {
+      Bool bZeroMVILR = pcCU->xCheckZeroMVILRMvdL1Zero(iRefList, iRefIdxTemp, aaiMvpIdx[iRefList][iRefIdxTemp]);
+      if(bZeroMVILR)
+      {
 #endif
           bestBiPDist = biPDistTemp;
@@ -3437 +3437 @@
           bestBiPRefIdxL1 = iRefIdxTemp;
 #if REF_IDX_ME_ZEROMV
-                  }
+      }
 #endif
         }
@@ -3577 +3577 @@
     //  Bi-directional prediction
 #if REF_IDX_ME_ZEROMV
-        if ( (pcCU->getSlice()->isInterB()) && (pcCU->isBipredRestriction(iPartIdx) == false) && !(pcCU->getSlice()->getMvdL1ZeroFlag() && bestBiPDist == MAX_INT) )
+  if ( (pcCU->getSlice()->isInterB()) && (pcCU->isBipredRestriction(iPartIdx) == false) && !(pcCU->getSlice()->getMvdL1ZeroFlag() && bestBiPDist == MAX_INT) )
 #else
     if ( (pcCU->getSlice()->isInterB()) && (pcCU->isBipredRestriction(iPartIdx) == false) )