Ticket #595: 14-bit_offset_issue_WP_IF.patch

source/Lib/TLibCommon/TComInterpolationFilter.cpp

@@ -124 +124 @@
   else
   {
     Int shift = IF_INTERNAL_PREC - ( g_uiBitDepth + g_uiBitIncrement );
-    Short offset = IF_INTERNAL_OFFS + (1 << (shift - 1));
+    Short offset = IF_INTERNAL_OFFS;
+    offset += shift?(1 << (shift - 1)):0;
     Short maxVal = g_uiIBDI_MAX;
     Short minVal = 0;
     for (row = 0; row < height; row++)

source/Lib/TLibCommon/TComWeightPrediction.cpp

@@ -79 +79 @@
   Int offset  = wp0[0].offset;
   Int shiftNum = IF_INTERNAL_PREC - ( g_uiBitDepth + g_uiBitIncrement );
   Int shift   = wp0[0].shift + shiftNum;
-  Int round   = (1<<(shift-1)) * bRound;
+  Int round   = shift?(1<<(shift-1)) * bRound:0;
   Int w1      = wp1[0].w;
 
   UInt  iSrc0Stride = pcYuvSrc0->getStride();
@@ -105 +105 @@
   w0      = wp0[1].w;
   offset  = wp0[1].offset;
   shift   = wp0[1].shift + shiftNum;
-  round   = (1<<(shift-1));
+  round   = shift?(1<<(shift-1)):0;
   w1      = wp1[1].w;
 
   iSrc0Stride = pcYuvSrc0->getCStride();
@@ -132 +132 @@
   w0      = wp0[2].w;
   offset  = wp0[2].offset;
   shift   = wp0[2].shift + shiftNum;
-  round   = (1<<(shift-1));
+  round   = shift?(1<<(shift-1)):0;
   w1      = wp1[2].w;
 
   for ( y = iHeight-1; y >= 0; y-- )
@@ -175 +175 @@
   Int offset  = wp0[0].offset;
   Int shiftNum = IF_INTERNAL_PREC - ( g_uiBitDepth + g_uiBitIncrement );
   Int shift   = wp0[0].shift + shiftNum;
-  Int round   = (1<<(shift-1));
+  Int round   = shift?(1<<(shift-1)):0;
   UInt  iSrc0Stride = pcYuvSrc0->getStride();
   UInt  iDstStride  = rpcYuvDst->getStride();
   
@@ -197 +197 @@
   w0      = wp0[1].w;
   offset  = wp0[1].offset;
   shift   = wp0[1].shift + shiftNum;
-  round   = (1<<(shift-1));
+  round   = shift?(1<<(shift-1)):0;
 
   iSrc0Stride = pcYuvSrc0->getCStride();
   iDstStride  = rpcYuvDst->getCStride();
@@ -221 +221 @@
   w0      = wp0[2].w;
   offset  = wp0[2].offset;
   shift   = wp0[2].shift + shiftNum;
-  round   = (1<<(shift-1));
+  round   = shift?(1<<(shift-1)):0;
 
   for ( y = iHeight-1; y >= 0; y-- )
   {