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

Timestamp:

22 Apr 2014, 15:17:54 (10 years ago)

Author:

tech

Message:

Merged 10.2-dev1-MediaTek@934.

File:

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

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

@@ -292 +292 @@
           pcSubCU->initAvailableFlags();
           pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand);
-          pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, inheritedVSPDisInfo
+          pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours
+#if !ETRIKHU_CLEANUP_H0083
+            ,vspFlag
+#endif
+            , inheritedVSPDisInfo
 #if H_3D_SPIVMP
-            , bSPIVMPFlag, pcMvFieldSP, puhInterDirSP
+            , pcMvFieldSP, puhInterDirSP
 #endif
             , numValidMergeCand );
+
+#if ETRIKHU_CLEANUP_H0083
+          pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
+#if H_3D_SPIVMP
+            , bSPIVMPFlag
+#endif
+            , numValidMergeCand );
+#endif
           pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
 
@@ -329 +341 @@
         pcSubCU->initAvailableFlags();
         pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
-        pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, inheritedVSPDisInfo
+        pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours
+#if !ETRIKHU_CLEANUP_H0083
+          , vspFlag
+#endif
+          , inheritedVSPDisInfo
 #if H_3D_SPIVMP
-          , bSPIVMPFlag, pcMvFieldSP, puhInterDirSP
+          , pcMvFieldSP, puhInterDirSP
 #endif
           ,numValidMergeCand, uiMergeIndex );
+
+#if ETRIKHU_CLEANUP_H0083
+        pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
+#if H_3D_SPIVMP
+          , bSPIVMPFlag
+#endif
+          ,numValidMergeCand );
+#endif
         pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
         if(vspFlag[uiMergeIndex])