Changeset 968 in 3DVCSoftware for branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

Timestamp:

5 Jul 2014, 09:11:50 (10 years ago)

Author:

tech

Message:

Cleanup part 2.

File:

• branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp (modified) (4 diffs)

branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -300 +300 @@
           pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand);
           pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours
-#if !ETRIKHU_CLEANUP_H0083
-            ,vspFlag
-#endif
             , inheritedVSPDisInfo
 #if H_3D_SPIVMP
-#if !ETRIKHU_CLEANUP_H0083_MISSING
-            , bSPIVMPFlag
-#endif
             , pcMvFieldSP, puhInterDirSP
 #endif
             , numValidMergeCand );
-
-#if ETRIKHU_CLEANUP_H0083
           pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
 #if H_3D_SPIVMP
@@ -318 +310 @@
 #endif
             , numValidMergeCand );
-#endif
           pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
 
@@ -352 +343 @@
         pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
         pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours
-#if !ETRIKHU_CLEANUP_H0083
-          , vspFlag
-#endif
           , inheritedVSPDisInfo
 #if H_3D_SPIVMP
-#if !ETRIKHU_CLEANUP_H0083_MISSING
-            , bSPIVMPFlag
-#endif
           , pcMvFieldSP, puhInterDirSP
 #endif
           ,numValidMergeCand, uiMergeIndex );
-
-#if ETRIKHU_CLEANUP_H0083
         pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
 #if H_3D_SPIVMP
@@ -370 +353 @@
 #endif
           ,numValidMergeCand );
-#endif
         pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
         if(vspFlag[uiMergeIndex])