Changeset 1430 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

10 Aug 2015, 20:01:28 (10 years ago)

Author:

seregin

Message:

fix posScalingFactor invocation for CGS

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp (modified) (4 diffs)

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

@@ -125 +125 @@
       shift = bitDepthLuma - currSlice->getPPS()->getCGSOutputBitDepthY();
     }
+#endif
     assert( shift >= 0 );
-#endif
 
     for( i = 0; i < heightBL; i++ )
@@ -159 +159 @@
     if( currSlice->getPPS()->getCGSFlag() )
     {
-      shift = currSlice->getBitDepth(CHANNEL_TYPE_CHROMA) - currSlice->getPPS()->getCGSOutputBitDepthC();
+      shift = bitDepthChroma - currSlice->getPPS()->getCGSOutputBitDepthC();
     }
 #endif
+    assert( shift >= 0 );
 
     for( i = 0; i < heightBL; i++ )
@@ -220 +221 @@
     Int rlClipB = heightBL - 1 + (NTAPS_US_LUMA>>1);
 
-    // g_bitDepthY was set to EL bit-depth, but shift1 should be calculated using BL bit-depth
+    // shift1 should be calculated using BL bit-depth
     Int shift1 = refBitDepthLuma - 8;
 
@@ -320 +321 @@
     heightBL  = min<Int>( pcBasePic->getHeight(COMPONENT_Y) >> 1, heightEL );
 
-    // g_bitDepthC was set to EL bit-depth, but shift1 should be calculated using BL bit-depth
+    // shift1 should be calculated using BL bit-depth
     shift1 = refBitDepthChroma - 8;