Ticket #603: Bugfix_Ticket603.patch

source/Lib/TLibCommon/TypeDef.h

@@ -40 +40 @@
 
 //! \ingroup TLibCommon
 //! \{
+
+#define BUGFIX_TICKET603             1  ///< bugfix for #603
+
 #define  TEMPORAL_ID_RESTRICTION         1  ///< I0600: Semantics of temporal_id changed
 #define PREVREFPIC_DEFN                    1   ///< I0345: prevRefPic defined as previous reference picture that is at same or lower 
                                             ///< temporal layer.

source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2691 +2691 @@
 
               Int iDeltaChroma;
               READ_SVLC( iDeltaChroma, "delta_chroma_offset_lX" );  // se(v): delta_chroma_offset_l0[i][j]
+#if BUGFIX_TICKET603
+              Int Shift = ((1<<(g_uiBitDepth+g_uiBitIncrement-1)));
+              Int Pred = ( Shift - ( ( Shift*wp[j].iWeight)>>(wp[j].uiLog2WeightDenom) ) );
+              wp[j].iOffset = iDeltaChroma + Pred;
+#else
               wp[j].iOffset = iDeltaChroma - ( ( (g_uiIBDI_MAX>>1)*wp[j].iWeight)>>(wp[j].uiLog2WeightDenom) ) + (g_uiIBDI_MAX>>1);
+#endif
             }
           }
           else 

source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1719 +1719 @@
               Int iDeltaWeight = (wp[j].iWeight - (1<<wp[1].uiLog2WeightDenom));
               WRITE_SVLC( iDeltaWeight, "delta_chroma_weight_lX" );            // se(v): delta_chroma_weight_lX
 
+#if BUGFIX_TICKET603
+              Int Shift = ((1<<(g_uiBitDepth+g_uiBitIncrement-1)));
+              Int Pred = ( Shift - ( ( Shift*wp[j].iWeight)>>(wp[j].uiLog2WeightDenom) ) );
+              Int iDeltaChroma = (wp[j].iOffset - Pred);
+#else
               Int iDeltaChroma = (wp[j].iOffset + ( ( (g_uiIBDI_MAX>>1)*wp[j].iWeight)>>(wp[j].uiLog2WeightDenom) ) - (g_uiIBDI_MAX>>1));
+#endif
               WRITE_SVLC( iDeltaChroma, "delta_chroma_offset_lX" );            // se(v): delta_chroma_offset_lX
             }
           }