Changeset 333 in SHVCSoftware for branches/SHM-3.0-dev/source/Lib

Timestamp:

8 Aug 2013, 21:17:45 (11 years ago)

Author:

qualcomm

Message:

N0214: "dynamic range control of intermediate buffer in re-sampling process", from cjianle@…

Location:

branches/SHM-3.0-dev/source/Lib/TLibCommon

Files:

• TComUpsampleFilter.cpp (modified) (6 diffs)
• TypeDef.h (modified) (1 diff)

branches/SHM-3.0-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -204 +204 @@
 #endif
 
+#if  N0214_INTERMEDIATE_BUFFER_16BITS
+    Int shift1 = g_bitDepthY - 8;
+#endif
+
     //========== horizontal upsampling ===========
     for( i = 0; i < widthEL; i++ )
@@ -222 +226 @@
       for( j = 0; j < heightBL ; j++ )
       {
+#if  N0214_INTERMEDIATE_BUFFER_16BITS
+        *piDstY = sumLumaHor(piSrcY, coeff) >> shift1;
+#else
         *piDstY = sumLumaHor(piSrcY, coeff);
+#endif
         piSrcY += strideBL;
         piDstY += strideEL;
@@ -234 +242 @@
     pcTempPic->setHeight(heightEL);
 
+#if  N0214_INTERMEDIATE_BUFFER_16BITS
+    Int nShift = US_FILTER_PREC*2 - shift1;
+#else
     const Int nShift = US_FILTER_PREC*2;
+#endif
     Int iOffset = 1 << (nShift - 1); 
 
@@ -372 +384 @@
 #endif
 
+#if  N0214_INTERMEDIATE_BUFFER_16BITS
+    shift1 = g_bitDepthC - 8;
+#endif
+
     //========== horizontal upsampling ===========
     for( i = 0; i < widthEL; i++ )
@@ -392 +408 @@
       for( j = 0; j < heightBL ; j++ )
       {
+#if  N0214_INTERMEDIATE_BUFFER_16BITS
+        *piDstU = sumChromaHor(piSrcU, coeff) >> shift1;
+        *piDstV = sumChromaHor(piSrcV, coeff) >> shift1;
+#else
         *piDstU = sumChromaHor(piSrcU, coeff);
         *piDstV = sumChromaHor(piSrcV, coeff);
+#endif
 
         piSrcU += strideBL;
@@ -407 +428 @@
     pcTempPic->extendPicBorder   (); // extend the border.
     pcTempPic->setHeight(heightEL << 1);
+
+#if  N0214_INTERMEDIATE_BUFFER_16BITS
+    nShift = US_FILTER_PREC*2 - shift1;
+    iOffset = 1 << (nShift - 1); 
+#endif
 
 #if SCALED_REF_LAYER_OFFSETS

branches/SHM-3.0-dev/source/Lib/TLibCommon/TypeDef.h

@@ -81 +81 @@
 #define SVC_UPSAMPLING                   1      ///< upsampling filters
 #define ROUNDING_OFFSET                  1      ///< JCTVC-N0111: upsampling rounding offset using scalling factors
+#define N0214_INTERMEDIATE_BUFFER_16BITS 1      ///< N0214 support base layer input more than 8 bits
+
 
 #define SIMPLIFIED_MV_POS_SCALING        1      ///< M0133/M0449: inter-layer MV scaling and pixel mapping position calculation