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

Timestamp:

1 Aug 2014, 10:01:00 (10 years ago)

Author:

sharpjp-htm

Message:

Fix tickets #75 Bi-pred restriction bug in VSP
Fix tickets #79 Unused VSP code

File:

• branches/HTM-11.2-dev0/source/Lib/TLibDecoder/TDecCu.cpp (modified) (3 diffs)

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

@@ -420 +420 @@
     Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
     memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
+#if !FIX_TICKET_79
     InheritedVSPDisInfo inheritedVSPDisInfo[MRG_MAX_NUM_CANDS_MEM];
+#endif
 #if H_3D_SPIVMP
     Bool bSPIVMPFlag[MRG_MAX_NUM_CANDS_MEM];
@@ -432 +434 @@
     m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
     m_ppcCU[uiDepth]->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours 
+#if !FIX_TICKET_79
       , inheritedVSPDisInfo
+#endif
 #if H_3D_SPIVMP
       , pcMvFieldSP, puhInterDirSP
@@ -453 +457 @@
 #endif
 #endif
-#if H_3D_VSP
+#if H_3D_VSP && !FIX_TICKET_79
     if(vspFlag[uiMergeIndex])
     {