Changeset 1038 in 3DVCSoftware for branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.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/TLibCommon/TComDataCU.cpp (modified) (2 diffs)

branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3921 +3921 @@
 Void TComDataCU::getInterMergeCandidates( UInt uiAbsPartIdx, UInt uiPUIdx, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours
 #endif
-#if H_3D_VSP
+#if H_3D_VSP && !FIX_TICKET_79
       , InheritedVSPDisInfo*  inheritedVSPDisInfo
 #endif
@@ -3951 +3951 @@
   //////////////////////////////////
   DisInfo cDisInfo = getDvInfo(uiAbsPartIdx);
+#if !FIX_TICKET_79
   for(Int i = 0; i < MRG_MAX_NUM_CANDS_MEM; i++)
   {
     inheritedVSPDisInfo[i].m_acDvInfo = cDisInfo;   // To prevent run-time error, this code must be executed always for merging process.
   }
+#endif
   m_cDefaultDisInfo = cDisInfo;