Changeset 968 in 3DVCSoftware for branches/HTM-11.1-dev0/source/Lib/TLibDecoder/TDecCu.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/TDecCu.cpp (modified) (2 diffs)

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

@@ -432 +432 @@
     m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
     m_ppcCU[uiDepth]->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, uiMergeIndex );
 
-#if ETRIKHU_CLEANUP_H0083
     m_ppcCU[uiDepth]->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
 #if H_3D_SPIVMP
@@ -450 +443 @@
 #endif
       , numValidMergeCand );
-#endif
     pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
 #else