Changeset 1150 in 3DVCSoftware

Timestamp:

27 Feb 2015, 01:48:58 (10 years ago)

Author:

qualcomm

Message:

JCT3V-K0053 integration: bug fix for tmvp scaling.

Location:

branches/HTM-13.1-dev1-Qualcomm

Files:

• checklist/Qualcomm_K0053.doc (added)
• checklist/SEC_K0033_K0036_K0035.doc (deleted)
• checklist/SEC_K0033_K0036_K0035_cxQualcomm.doc (added)
• codingresults/Qualcomm_K0053_vs_K0035.xls (added)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (3 diffs)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/HTM-13.1-dev1-Qualcomm/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5754 +5754 @@
   }
 
-  if ( bIsCurrRefLongTerm || bIsColRefLongTerm )
+  if ( bIsCurrRefLongTerm || bIsColRefLongTerm ) // CY: this condition equals to both bIsCurrRefLongTerm and bIsColRefLongTerm being 1
   {
 #if H_3D_TMVP
@@ -5761 +5761 @@
     Int iColViewId     = pColCU->getSlice()->getViewIndex(); 
     Int iColRefViewId  = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewIndex(); 
+#if H_3D_TMVP_SCALING_FIX_K0053
+    iScale = 4096;
+    if ( iCurrRefViewId != iCurrViewId && iColViewId != iColRefViewId )
+#endif
     iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iColViewId, iColRefViewId );
 
@@ -5775 +5779 @@
 #endif
   }
-  else
+  else // CY: both bIsCurrRefLongTerm and bIsColRefLongTerm are 0
   {
     iScale = xGetDistScaleFactor(iCurrPOC, iCurrRefPOC, iColPOC, iColRefPOC);

branches/HTM-13.1-dev1-Qualcomm/source/Lib/TLibCommon/TypeDef.h

@@ -194 +194 @@
 #define H_3D_TMVP                         1   // QC_TMVP_C0047 
                                               // Sony_M23639
+#if H_3D_TMVP
+#define H_3D_TMVP_SCALING_FIX_K0053       1   // QC/CY for K0053
+#endif
 
 #define H_3D_DIM                          1   // DIM, Depth intra modes, includes: