Changeset 563 in 3DVCSoftware for branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib

Timestamp:

12 Aug 2013, 06:32:43 (11 years ago)

Author:

mediatek-htm

Message:

Integration of JCT3V-E0168 for unifying clipping operations of uni-prediction and Bi-prediction of IC enabled PUs.
The MACRO is "MTK_CLIPPING_ALIGN_IC_E0168"

By Yi-Wen Chen (yiwen.chen@…)

Location:

branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib/TLibCommon

Files:

• TComPrediction.cpp (modified) (13 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib/TLibCommon/TComPrediction.cpp

@@ -953 +953 @@
   if ( yFrac == 0 )
   {
+#if MTK_CLIPPING_ALIGN_IC_E0168
+    m_if.filterHorLuma( ref, refStride, dst, dstStride, width, height, xFrac,       !bi || bICFlag
+#else
     m_if.filterHorLuma( ref, refStride, dst, dstStride, width, height, xFrac,       !bi 
+#endif
 #if H_3D_ARP
     , filterType
@@ -961 +965 @@
   else if ( xFrac == 0 )
   {
+#if MTK_CLIPPING_ALIGN_IC_E0168
+    m_if.filterVerLuma( ref, refStride, dst, dstStride, width, height, yFrac, true, !bi || bICFlag
+#else
     m_if.filterVerLuma( ref, refStride, dst, dstStride, width, height, yFrac, true, !bi 
+#endif
 #if H_3D_ARP
     , filterType
@@ -980 +988 @@
 #endif 
       );
+#if MTK_CLIPPING_ALIGN_IC_E0168
+    m_if.filterVerLuma(tmp + (halfFilterSize-1)*tmpStride, tmpStride, dst, dstStride, width, height,              yFrac, false, !bi || bICFlag
+#else
     m_if.filterVerLuma(tmp + (halfFilterSize-1)*tmpStride, tmpStride, dst, dstStride, width, height,              yFrac, false, !bi
+#endif
 #if H_3D_ARP
     , filterType
@@ -1006 +1018 @@
       for ( j = 0; j < width; j++ )
       {
+#if !MTK_CLIPPING_ALIGN_IC_E0168
         if( bi )
         {
@@ -1012 +1025 @@
         }
         else
+#endif
           dst[j] = Clip3( 0, ( 1 << g_bitDepthY ) - 1, ( ( a*dst[j] ) >> iShift ) + b );
       }
       dst += dstStride;
     }
+#if MTK_CLIPPING_ALIGN_IC_E0168
+    if(bi)
+    {
+      Pel *dst2      = dstPic->getLumaAddr( partAddr );
+      Int shift = IF_INTERNAL_PREC - g_bitDepthY;
+      for (i = 0; i < height; i++)
+      {
+        for (j = 0; j < width; j++)
+        {
+          Short val = dst2[j] << shift;
+          dst2[j] = val - (Short)IF_INTERNAL_OFFS;
+        }
+        dst2 += dstStride;
+      }
+    }
+#endif
   }
 #endif
@@ -1066 +1096 @@
   if ( yFrac == 0 )
   {
+#if MTK_CLIPPING_ALIGN_IC_E0168
+    m_if.filterHorChroma(refCb, refStride, dstCb,  dstStride, cxWidth, cxHeight, xFrac, !bi || bICFlag
+#else
     m_if.filterHorChroma(refCb, refStride, dstCb,  dstStride, cxWidth, cxHeight, xFrac, !bi
+#endif
 #if H_3D_ARP
     , filterType
 #endif
     );    
+#if MTK_CLIPPING_ALIGN_IC_E0168
+    m_if.filterHorChroma(refCr, refStride, dstCr,  dstStride, cxWidth, cxHeight, xFrac, !bi || bICFlag
+#else
     m_if.filterHorChroma(refCr, refStride, dstCr,  dstStride, cxWidth, cxHeight, xFrac, !bi
+#endif
 #if H_3D_ARP
     , filterType
@@ -1079 +1117 @@
   else if ( xFrac == 0 )
   {
+#if MTK_CLIPPING_ALIGN_IC_E0168
+    m_if.filterVerChroma(refCb, refStride, dstCb, dstStride, cxWidth, cxHeight, yFrac, true, !bi || bICFlag
+#else
     m_if.filterVerChroma(refCb, refStride, dstCb, dstStride, cxWidth, cxHeight, yFrac, true, !bi
+#endif
 #if H_3D_ARP
     , filterType
 #endif
     );
+#if MTK_CLIPPING_ALIGN_IC_E0168
+    m_if.filterVerChroma(refCr, refStride, dstCr, dstStride, cxWidth, cxHeight, yFrac, true, !bi || bICFlag
+#else
     m_if.filterVerChroma(refCr, refStride, dstCr, dstStride, cxWidth, cxHeight, yFrac, true, !bi
+#endif
 #if H_3D_ARP
     , filterType
@@ -1097 +1143 @@
 #endif  
       );
+#if MTK_CLIPPING_ALIGN_IC_E0168
+    m_if.filterVerChroma(extY  + (halfFilterSize-1)*extStride, extStride, dstCb, dstStride, cxWidth, cxHeight  , yFrac, false, !bi || bICFlag
+#else
     m_if.filterVerChroma(extY  + (halfFilterSize-1)*extStride, extStride, dstCb, dstStride, cxWidth, cxHeight  , yFrac, false, !bi
+#endif
 #if H_3D_ARP
     , filterType
@@ -1108 +1158 @@
 #endif 
       );
+#if MTK_CLIPPING_ALIGN_IC_E0168
+    m_if.filterVerChroma(extY  + (halfFilterSize-1)*extStride, extStride, dstCr, dstStride, cxWidth, cxHeight  , yFrac, false, !bi || bICFlag
+#else
     m_if.filterVerChroma(extY  + (halfFilterSize-1)*extStride, extStride, dstCr, dstStride, cxWidth, cxHeight  , yFrac, false, !bi
+#endif
 #if H_3D_ARP
     , filterType
@@ -1130 +1184 @@
       for ( j = 0; j < cxWidth; j++ )
       {
+#if !MTK_CLIPPING_ALIGN_IC_E0168
         if( bi )
         {
@@ -1136 +1191 @@
         }
         else
+#endif
           dstCb[j] = Clip3(  0, ( 1 << g_bitDepthC ) - 1, ( ( a*dstCb[j] ) >> iShift ) + b );
       }
@@ -1149 +1205 @@
       for ( j = 0; j < cxWidth; j++ )
       {
+#if !MTK_CLIPPING_ALIGN_IC_E0168
         if( bi )
         {
@@ -1155 +1212 @@
         }
         else
+#endif
           dstCr[j] = Clip3( 0, ( 1 << g_bitDepthC ) - 1, ( ( a*dstCr[j] ) >> iShift ) + b );
       }
       dstCr += dstStride;
     }
+#if MTK_CLIPPING_ALIGN_IC_E0168
+    if(bi)
+    {
+      Pel* dstCb2 = dstPic->getCbAddr( partAddr );
+      Pel* dstCr2 = dstPic->getCrAddr( partAddr );
+      Int shift = IF_INTERNAL_PREC - g_bitDepthC;
+      for (i = 0; i < cxHeight; i++)
+      {
+        for (j = 0; j < cxWidth; j++)
+        {
+          Short val = dstCb2[j] << shift;
+          dstCb2[j] = val - (Short)IF_INTERNAL_OFFS;
+
+          val = dstCr2[j] << shift;
+          dstCr2[j] = val - (Short)IF_INTERNAL_OFFS;
+        }
+        dstCb2 += dstStride;
+        dstCr2 += dstStride;
+      }
+    }
+#endif
   }
 #endif

branches/HTM-DEV-2.0-dev2-MediaTek/source/Lib/TLibCommon/TypeDef.h

@@ -98 +98 @@
 #define SHARP_ILLUCOMP_REFINE_E0046       1
 #define MTK_FAST_TEXTURE_ENCODING_E0173   1   // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173
+#define MTK_CLIPPING_ALIGN_IC_E0168       1   // To support simplify bi-prediction PU with identical motion checking, JCT3V-E0168
 
 #if H_3D_NBDV