Changeset 995 in 3DVCSoftware

Timestamp:

16 Jul 2014, 07:26:51 (10 years ago)

Author:

sharpjp-htm

Message:

Integration of JCT3V-I0104

Location:

branches/HTM-11.2-dev2-Sharp

Files:

• checklist/Qualcomm_JCT3V-I0051.doc (modified) (previous)
• checklist/Qualcomm_JCT3V-I0129.doc (modified) (previous)
• checklist/Sharp_JCT3V-I0104.doc (added)
• codingresults/JCT3V-I0051-I0129_vs_JCT3V-I0129_cc_by_Sharp.xls (added)
• codingresults/JCT3V-I0104_vs_I0051.xls (added)
• codingresults/JCT3V-I0129_vs_3D_11_2_cc_by_Sharp.xls (added)
• source/Lib/TLibCommon/TComPrediction.cpp (modified) (5 diffs)
• source/Lib/TLibCommon/TComYuv.cpp (modified) (2 diffs)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/HTM-11.2-dev2-Sharp/source/Lib/TLibCommon/TComPrediction.cpp

@@ -543 +543 @@
     pcCU->getSPAbsPartIdx(uiPartAddr, iSPWidth, iSPHeight, i, iNumSPInOneLine, uiSPAddr[i]);
   }
+#if SHARP_ARP_CHROMA_I0104
+  if( pcCU->getARPW( uiPartAddr ) != 0 )
+  {
+    return;
+  }
+#endif
   // horizontal sub-PU merge
   for (Int i=0; i<iNumSP; i++)
@@ -1322 +1328 @@
     TComMv cMVwithDisparity = cMv + cDistparity.m_acNBDV;
     pcCU->clipMv(cMVwithDisparity);
+#if SHARP_ARP_CHROMA_I0104
+    if (iWidth <= 8)
+    {
+      pYuvB0->clear(); pYuvB1->clear();
+    }
+#endif
 
     assert ( cDistparity.bDV );
@@ -1332 +1344 @@
 #if QC_I0129_ARP_FIX
     xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, true, true );
+#if SHARP_ARP_CHROMA_I0104
+    if (iWidth > 8)
+#endif
     xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, true, true );
 #else
@@ -1346 +1361 @@
 #if QC_I0129_ARP_FIX
     xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, true, true );
+#if SHARP_ARP_CHROMA_I0104
+    if (iWidth > 8)
+#endif
     xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, true, true );
 #else
@@ -1584 +1602 @@
     pcCU->clipMv(cBaseTMV);
     pcCU->clipMv(cTempMv);
+#if SHARP_ARP_CHROMA_I0104
+    if (iWidth <= 8)
+    {
+      pYuvCurrTRef->clear(); pYuvBaseTRef->clear();
+    }
+#endif
 #if QC_I0129_ARP_FIX
     xPredInterLumaBlk  ( pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, true,   true);
+#if SHARP_ARP_CHROMA_I0104
+    if (iWidth > 8)
+#endif
     xPredInterChromaBlk( pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, true,   true);
     xPredInterLumaBlk  ( pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv,  iWidth, iHeight, pYuvBaseTRef, true,   true); 
+#if SHARP_ARP_CHROMA_I0104
+    if (iWidth > 8)
+#endif
     xPredInterChromaBlk( pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv,  iWidth, iHeight, pYuvBaseTRef, true,   true); 
 #else

branches/HTM-11.2-dev2-Sharp/source/Lib/TLibCommon/TComYuv.cpp

@@ -761 +761 @@
 {
   subtractARPLuma  ( pcYuvSrc0, pcYuvSrc1,  uiAbsPartIdx, uiWidth    , uiHeight    );
+#if SHARP_ARP_CHROMA_I0104
+  if (uiWidth > 8)
+#endif
   subtractARPChroma( pcYuvSrc0, pcYuvSrc1,  uiAbsPartIdx, uiWidth>>1 , uiHeight>>1 );
 }
@@ -820 +823 @@
 {
   multiplyARPLuma( uiAbsPartIdx , uiWidth , uiHeight , dW );
+#if SHARP_ARP_CHROMA_I0104
+  if (uiWidth > 8)
+#endif
   multiplyARPChroma( uiAbsPartIdx , uiWidth >> 1 , uiHeight >> 1 , dW );
 }

branches/HTM-11.2-dev2-Sharp/source/Lib/TLibCommon/TypeDef.h

@@ -285 +285 @@
 #define QC_I0129_ARP_FIX                  1
 #define QC_I0051_ARP_SIMP                 1
+#define SHARP_ARP_CHROMA_I0104            1
 #endif