Ticket #700: BugFix_ChromaOffsetR1.patch

source/Lib/TLibCommon/TypeDef.h

@@ -43 +43 @@
 //! \ingroup TLibCommon
 //! \{
 
+#define BUGFIX_CHROMA_OFFSET             1  ///< Bug fix of the predicted value of chroma offset in WP when the input bit depth is beyond 8bit.
 #define SAO_LUM_CHROMA_ONOFF_FLAGS       1  ///< J0087: slice-level independent luma/chroma SAO on/off flag 
 #define LTRP_IN_SPS                      1  ///< J0116: Include support for signalling LTRP LSBs in the SPS, and index them in the slice header.
 #define CHROMA_QP_EXTENSION              1  ///< J0342: Extend mapping table from luma QP to chroma QP, introduce slice-level chroma offsets, apply limits on offset values

source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1887 +1887 @@
 
               Int iDeltaChroma;
               READ_SVLC( iDeltaChroma, "delta_chroma_offset_lX" );  // se(v): delta_chroma_offset_l0[i][j]
+#if BUGFIX_CHROMA_OFFSET
               Int pred = ( 128 - ( ( 128*wp[j].iWeight)>>(wp[j].uiLog2WeightDenom) ) );
+#else
               Int shift = ((1<<(g_uiBitDepth+g_uiBitIncrement-1)));
               Int pred = ( shift - ( ( shift*wp[j].iWeight)>>(wp[j].uiLog2WeightDenom) ) );
+#endif
 #if WP_PARAM_RANGE_LIMIT
               wp[j].iOffset = Clip3(-128, 127, (iDeltaChroma + pred) );

source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1477 +1477 @@
             {
               Int iDeltaWeight = (wp[j].iWeight - (1<<wp[1].uiLog2WeightDenom));
               WRITE_SVLC( iDeltaWeight, "delta_chroma_weight_lX" );            // se(v): delta_chroma_weight_lX
-
+#if BUGFIX_CHROMA_OFFSET
               Int pred = ( 128 - ( ( 128*wp[j].iWeight)>>(wp[j].uiLog2WeightDenom) ) );
+#else
               Int shift = ((1<<(g_uiBitDepth+g_uiBitIncrement-1)));
               Int pred = ( shift - ( ( shift*wp[j].iWeight)>>(wp[j].uiLog2WeightDenom) ) );
+#endif
               Int iDeltaChroma = (wp[j].iOffset - pred);
               WRITE_SVLC( iDeltaChroma, "delta_chroma_offset_lX" );            // se(v): delta_chroma_offset_lX