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

branches/HTM-11.1-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3681 +3681 @@
       pcCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours
 #if H_3D_VSP
-#if !ETRIKHU_CLEANUP_H0083
-                                        , vspFlag
-#endif
                                         , inheritedVSPDisInfo
 #endif
 #if H_3D_SPIVMP
-#if !ETRIKHU_CLEANUP_H0083_MISSING
-        , pbSPIVMPFlag
-#endif
         , pcMvFieldSP, puhInterDirSP
 #endif
@@ -3695 +3689 @@
         );
 
-#if ETRIKHU_CLEANUP_H0083
       pcCU->buildMCL( cMvFieldNeighbours,uhInterDirNeighbours
 #if H_3D_VSP
@@ -3705 +3698 @@
                                         , numValidMergeCand
         );
-#endif
 #else
       pcCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, numValidMergeCand );
@@ -3719 +3711 @@
     pcCU->xGetInterMergeCandidates( uiAbsPartIdx, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours
 #if H_3D_VSP
-#if !ETRIKHU_CLEANUP_H0083
-                                      , vspFlag
-#endif
                                       , inheritedVSPDisInfo
 #endif
 #if H_3D_SPIVMP
-#if !ETRIKHU_CLEANUP_H0083_MISSING
-      , pbSPIVMPFlag 
-#endif
       , pcMvFieldSP, puhInterDirSP
 #endif
@@ -3733 +3719 @@
       );
 
-#if ETRIKHU_CLEANUP_H0083
     pcCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours
 #if H_3D_VSP
@@ -3743 +3728 @@
                                       , numValidMergeCand
       );
-#endif
 #else
     pcCU->getInterMergeCandidates( uiAbsPartIdx, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand