Changeset 911 in 3DVCSoftware for branches/HTM-10.2-dev1-ETRI/source/Lib/TLibDecoder

Timestamp:

13 Apr 2014, 14:27:40 (11 years ago)

Author:

etri-htm

Message:

H0083 Bug-fix and clean ups on merge list construction

Location:

branches/HTM-10.2-dev1-ETRI/source/Lib/TLibDecoder

Files:

• TDecCu.cpp (modified) (1 diff)
• TDecEntropy.cpp (modified) (2 diffs)

branches/HTM-10.2-dev1-ETRI/source/Lib/TLibDecoder/TDecCu.cpp

@@ -431 +431 @@
     m_ppcCU[uiDepth]->initAvailableFlags();
     m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
-    m_ppcCU[uiDepth]->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, inheritedVSPDisInfo
+    m_ppcCU[uiDepth]->xGetInterMergeCandidates( 0, 0, 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
+    m_ppcCU[uiDepth]->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
+#if H_3D_SPIVMP
+      , bSPIVMPFlag
+#endif
+      , numValidMergeCand );
+#endif
     pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
 #else

branches/HTM-10.2-dev1-ETRI/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])