Changeset 976 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

7 Jul 2014, 17:27:51 (12 years ago)

Author:

tech

Message:

• Merged 11.1-dev0@975. (Clean ups)
• Added coding results.
• Changed version number.

File:

• trunk/source/Lib/TLibEncoder/TEncCu.cpp (modified) (5 diffs)

trunk/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1815 +1815 @@
     rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
     rpcTempCU->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
@@ -1828 +1822 @@
       );
 
-#if ETRIKHU_CLEANUP_H0083
     rpcTempCU->buildMCL( cMvFieldNeighbours,uhInterDirNeighbours, vspFlag
 #if H_3D_SPIVMP
@@ -1835 +1828 @@
       , numValidMergeCand 
       );
-#endif
 
 #else
@@ -2400 +2392 @@
     pDBBPTmpData->auhMergeIndex[uiSegment] = rpcTempCU->getMergeIndex(0);
     
-#if RWTH_DBBP_NO_SPU_H0057
     AOF( rpcTempCU->getSPIVMPFlag(0) == false );
     AOF( rpcTempCU->getVSPFlag(0) == 0 );
-#else
-    pDBBPTmpData->ahVSPFlag[uiSegment] = rpcTempCU->getVSPFlag(0);
-    pDBBPTmpData->acDvInfo[uiSegment] = rpcTempCU->getDvInfo(0);
-#endif
     
     for ( UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx++ )
@@ -2437 +2424 @@
     rpcTempCU->setMergeFlagSubParts(pDBBPTmpData->abMergeFlag[uiSegment], uiPartAddr, uiSegment, uhDepth);
     rpcTempCU->setMergeIndexSubParts(pDBBPTmpData->auhMergeIndex[uiSegment], uiPartAddr, uiSegment, uhDepth);
-    
-#if !RWTH_DBBP_NO_SPU_H0057
-    rpcTempCU->setVSPFlagSubParts(pDBBPTmpData->ahVSPFlag[uiSegment], uiPartAddr, uiSegment, uhDepth);
-    rpcTempCU->setDvInfoSubParts(pDBBPTmpData->acDvInfo[uiSegment], uiPartAddr, uiSegment, uhDepth);
-#endif
-    
+        
     for ( UInt uiRefListIdx = 0; uiRefListIdx < 2; uiRefListIdx++ )
     {