Changeset 615 in 3DVCSoftware for branches/HTM-8.0-dev0/source/Lib/TLibDecoder/TDecCu.cpp

Timestamp:

6 Sep 2013, 00:42:44 (13 years ago)

Author:

tech

Message:

Cleanups and macro removals related to merge and vsp

• MTK_VSP_FIX_ALIGN_WD_E0172
• H_3D_FIX_BVSP
• QC_INRIA_MTK_MRG_E0126
• MTK_DVMCP_FIX_E0172

• TComDataCU::xAddVspCand
• TComDataCU::xAddIvMRGCand
• TComDataCU::getInterMergeCandidates

File:

• branches/HTM-8.0-dev0/source/Lib/TLibDecoder/TDecCu.cpp (modified) (1 diff)

branches/HTM-8.0-dev0/source/Lib/TLibDecoder/TDecCu.cpp

@@ -366 +366 @@
     Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
     memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
-#if MTK_VSP_FIX_ALIGN_WD_E0172
     InheritedVSPDisInfo inheritedVSPDisInfo[MRG_MAX_NUM_CANDS_MEM];
     m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, inheritedVSPDisInfo, numValidMergeCand, uiMergeIndex );
-#else
-#if MTK_VSP_FIX_E0172
-    Int vspDir[MRG_MAX_NUM_CANDS_MEM];
-    memset(vspDir, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
-    m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag,vspDir, numValidMergeCand, uiMergeIndex );
-    pcCU->setVSPDirSubParts( vspDir[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
-#else
-    m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, numValidMergeCand, uiMergeIndex );
-#endif
-#endif// end of MTK_VSP_FIX_ALIGN_WD_E0172
     pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
 #else
     m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
 #endif
-#if MTK_VSP_FIX_ALIGN_WD_E0172
+#if H_3D_VSP
     if(vspFlag[uiMergeIndex])
     {