Changeset 348 in 3DVCSoftware for branches/HTM-6.2-dev1-Samsung/source/Lib/TLibCommon

Timestamp:

30 Apr 2013, 03:53:05 (12 years ago)

Author:

samsung-htm

Message:

D0122 Integration (Reupload)

Location:

branches/HTM-6.2-dev1-Samsung/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-6.2-dev1-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5322 +5322 @@
  */
 #if H3D_IVMP
+#if SEC_TWO_CANDIDATES_FOR_AMVP_D0122
 Void TComDataCU::fillMvpCand ( UInt uiPartIdx, UInt uiPartAddr, RefPicList eRefPicList, Int iRefIdx, AMVPInfo* pInfo, Int iMVPIdx)
 {
+    fillMvpCandBase(uiPartIdx, uiPartAddr, eRefPicList, iRefIdx, pInfo);
+}
+#else
+Void TComDataCU::fillMvpCand ( UInt uiPartIdx, UInt uiPartAddr, RefPicList eRefPicList, Int iRefIdx, AMVPInfo* pInfo, Int iMVPIdx)
+{
+
   if (!m_pcSlice->getSPS()->getViewId() || !m_pcSlice->getSPS()->getMultiviewMvPredMode())
   {
@@ -5402 +5409 @@
   }
 }
+#endif
 
 

branches/HTM-6.2-dev1-Samsung/source/Lib/TLibCommon/TypeDef.h

@@ -84 +84 @@
                                               // QC_C0051_FIXED_BY_MTK             1   // Bug fix for C0051 implementation
                                               // QC_AMVP_MRG_UNIFY_IVCAN_C0051     1
+#define SEC_TWO_CANDIDATES_FOR_AMVP_D0122 1   // SEC_TWO_CANDIDATES_FOR_AMVP_D0122, fixing # of AMVP candidates 3 to 2