Changeset 240 in 3DVCSoftware for branches

Timestamp:

30 Jan 2013, 16:29:21 (12 years ago)

Author:

hisilicon-htm

Message:

JCT3V-C0154

Location:

branches/HTM-5.1-dev1-Hisilicon/source/Lib

Files:

• TLibCommon/TComPrediction.cpp (modified) (2 diffs)
• TLibDecoder/TDecCu.cpp (modified) (2 diffs)
• TLibEncoder/TEncSearch.cpp (modified) (2 diffs)

branches/HTM-5.1-dev1-Hisilicon/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1919 +1919 @@
   UInt  uiWedgeStride   = pcWedgelet->getStride();
 
+#if HS_REFERENCE_SUBSAMPLE
+  Int subSamplePix;
+  if ( pcWedgelet->getWidth() == 32 )
+  {
+    subSamplePix = 2;
+  }
+  else
+  {
+    subSamplePix = 1;
+  }
+#endif
+
   if( bAbove )
   {
+#if HS_REFERENCE_SUBSAMPLE
+    for( Int k = 0; k < pcWedgelet->getWidth(); k+=subSamplePix )
+#else
     for( Int k = 0; k < pcWedgelet->getWidth(); k++ )
+#endif
     {
       if( true == pabWedgePattern[k] )
@@ -1937 +1953 @@
   if( bLeft )
   {
+#if HS_REFERENCE_SUBSAMPLE
+    for( Int k = 0; k < pcWedgelet->getHeight(); k+=subSamplePix )
+#else
     for( Int k = 0; k < pcWedgelet->getHeight(); k++ )
+#endif
     {
       if( true == pabWedgePattern[k*uiWedgeStride] )

branches/HTM-5.1-dev1-Hisilicon/source/Lib/TLibDecoder/TDecCu.cpp

@@ -1375 +1375 @@
   Int iSumPix[2];
   memset(iSumPix, 0, sizeof(Int)*2);
-  
+#if HS_REFERENCE_SUBSAMPLE
+  Int subSamplePix;
+  if ( uiSize == 64 || uiSize == 32 )
+  {
+    subSamplePix = 2;
+  }
+  else
+  {
+    subSamplePix = 1;
+  }
+  for (Int y=0; y<uiSize; y+=subSamplePix)
+  {
+    for (Int x=0; x<uiSize; x+=subSamplePix)
+    {
+      UChar ucSegment = pMask?(UChar)pMask[x]:0;
+      assert( ucSegment < uiNumSegments );
+
+      iSumDepth[ucSegment] += pOrig[x];
+      iSumPix[ucSegment]   += 1;
+    }
+    pOrig  += uiStride*subSamplePix;
+    pMask  += uiMaskStride*subSamplePix;
+  }
+#else
   for (Int y=0; y<uiSize; y++)
   {
@@ -1390 +1413 @@
     pMask  += uiMaskStride;
   }
-  
+#endif
   // compute mean for each segment
   for( UChar ucSeg = 0; ucSeg < uiNumSegments; ucSeg++ )

branches/HTM-5.1-dev1-Hisilicon/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -8311 +8311 @@
   Int iSumPix[2];
   memset(iSumPix, 0, sizeof(Int)*2);
-  
+#if HS_REFERENCE_SUBSAMPLE
+  Int subSamplePix;
+  if ( uiSize == 64 || uiSize == 32 )
+  {
+    subSamplePix = 2;
+  }
+  else
+  {
+    subSamplePix = 1;
+  }
+  for (Int y=0; y<uiSize; y+=subSamplePix)
+  {
+    for (Int x=0; x<uiSize; x+=subSamplePix)
+    {
+      UChar ucSegment = pMask?(UChar)pMask[x]:0;
+      assert( ucSegment < uiNumSegments );
+
+      iSumDepth[ucSegment] += pOrig[x];
+      iSumPix[ucSegment]   += 1;
+    }
+
+    pOrig  += uiStride*subSamplePix;
+    pMask  += uiMaskStride*subSamplePix;
+  }
+#else
   for (Int y=0; y<uiSize; y++)
   {
@@ -8326 +8350 @@
     pMask  += uiMaskStride;
   }
-  
+#endif
   // compute mean for each segment
   for( UChar ucSeg = 0; ucSeg < uiNumSegments; ucSeg++ )