Changeset 163 in 3DVCSoftware for branches/HTM-4.1-dev1-LG/source/Lib/TLibEncoder

Timestamp:

1 Nov 2012, 13:49:52 (12 years ago)

Author:

lg

Message:

Implemented the support of parallel merge in disparity vector derivation with macro: LGE_IVMP_PARALLEL_MERGE_B0136

Implemented the fix for the 'single merge candidate list for all PUs inside a 8x8 CU' with macro: FIX_CU_BASED_MRG_CAND_LIST_B0136. Without this fix, mismatch occurs when parallel merge is activated (LOG2_PARALLEL_MERGE_LEVEL_MINUS2>0).

File:

• branches/HTM-4.1-dev1-LG/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (2 diffs)

branches/HTM-4.1-dev1-LG/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2642 +2642 @@
  */
 #if CU_BASED_MRG_CAND_LIST
+#if LG_RESTRICTEDRESPRED_M24766
+Void TEncSearch::xMergeEstimation( TComDataCU* pcCU, TComYuv* pcYuvOrg, TComYuv* rpcResiPredYuv, Int iPUIdx, UInt& uiInterDir, TComMvField* pacMvField, UInt& uiMergeIndex, UInt& ruiCost, TComMvField* cMvFieldNeighbours, UChar* uhInterDirNeighbours, Int& numValidMergeCand )
+#else
 Void TEncSearch::xMergeEstimation( TComDataCU* pcCU, TComYuv* pcYuvOrg, Int iPUIdx, UInt& uiInterDir, TComMvField* pacMvField, UInt& uiMergeIndex, UInt& ruiCost, TComMvField* cMvFieldNeighbours, UChar* uhInterDirNeighbours, Int& numValidMergeCand )
+#endif
 #else
 #if LG_RESTRICTEDRESPRED_M24766
@@ -3539 +3543 @@
       UInt uiMRGCost = MAX_UINT;
 #if CU_BASED_MRG_CAND_LIST
+#if LG_RESTRICTEDRESPRED_M24766
+      xMergeEstimation( pcCU, pcOrgYuv, rpcResiPredYuv, iPartIdx, uiMRGInterDir, cMRGMvField, uiMRGIndex, uiMRGCost, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand);
+#else
       xMergeEstimation( pcCU, pcOrgYuv, iPartIdx, uiMRGInterDir, cMRGMvField, uiMRGIndex, uiMRGCost, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand);
+#endif
 #else
 #if LG_RESTRICTEDRESPRED_M24766