Changeset 441 in 3DVCSoftware for branches/HTM-6.2-dev0-Fix/source/Lib/TLibEncoder

Timestamp:

25 May 2013, 08:50:52 (12 years ago)

Author:

mitsubishi-htm

Message:

-Harmonization fixed by MERL. MERL_General_Fix is enabled.

Location:

branches/HTM-6.2-dev0-Fix/source/Lib/TLibEncoder

Files:

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

branches/HTM-6.2-dev0-Fix/source/Lib/TLibEncoder/TEncCu.cpp

@@ -2054 +2054 @@
             rpcTempCU->setVSPIndexSubParts( iVSPIdx, 0, 0, uhDepth );
 #if MERL_VSP_NBDV_RefVId_Fix_D0166
-            rpcTempCU->setVSPDirSubParts( iVSPDirTrue[iVSPIdx-1], 0, 0, uhDepth ); // interprets depth relative to LCU level
+            rpcTempCU->setVSPDirSubParts(0, 0, 0, uhDepth ); // interprets depth relative to LCU level
 #endif
 #if QC_BVSP_CleanUP_D0191 && !LGE_VSP_INHERIT_D0092

branches/HTM-6.2-dev0-Fix/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3030 +3030 @@
         pcCU->setVSPIndexSubParts( iVSPIdx, uiAbsPartIdx, iPUIdx, pcCU->getDepth( uiAbsPartIdx ) );
 #if MERL_VSP_NBDV_RefVId_Fix_D0166
-        pcCU->setVSPDirSubParts( iVSPDirTrue[iVSPIdx-1], uiAbsPartIdx, iPUIdx, pcCU->getDepth( uiAbsPartIdx ) );
+        pcCU->setVSPDirSubParts(0, uiAbsPartIdx, iPUIdx, pcCU->getDepth( uiAbsPartIdx ) );
 #endif
 #if QC_BVSP_CleanUP_D0191 && !LGE_VSP_INHERIT_D0092
@@ -3794 +3794 @@
           pcCU->setVSPIndexSubParts( iVSPIdx, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
 #if MERL_VSP_NBDV_RefVId_Fix_D0166
-          pcCU->setVSPDirSubParts( iVSPDirTrue[iVSPIdx-1], uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
+          pcCU->setVSPDirSubParts( 0, uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
 #endif
 #if QC_BVSP_CleanUP_D0191 && !LGE_VSP_INHERIT_D0092