Merge branch 'fix_ticket_210' into 'master'

Fix for Ticket #210: M0147 DMVR interpolation filter incorrect for bit depth != 10

See merge request jvet/VVCSoftware_VTM!343

source/Lib/CommonLib/InterpolationFilter.cpp

@@ -427,8 +427,16 @@ void InterpolationFilter::filter(const ClpRng& clpRng, Pel const *src, int srcSt
 #if JVET_M0147_DMVR
   if (biMCForDMVR)
   {
-    shift = IF_FILTER_PREC_BILINEAR - (IF_INTERNAL_PREC_BILINEAR - clpRng.bd);
-    offset = 1 << (shift - 1);
+    if( isFirst ) 
+    {
+      shift = IF_FILTER_PREC_BILINEAR - (IF_INTERNAL_PREC_BILINEAR - clpRng.bd);
+      offset = 1 << (shift - 1);
+    }
+    else 
+    {
+      shift = 4;
+      offset = 1 << (shift - 1);
+    }
   }
 #endif
   for (row = 0; row < height; row++)

source/Lib/CommonLib/x86/InterpolationFilterX86.h

@@ -1131,8 +1131,16 @@ static void simdFilter( const ClpRng& clpRng, Pel const *src, int srcStride, Pel
 #if JVET_M0147_DMVR
   if (biMCForDMVR)
   {
-    shift = IF_FILTER_PREC_BILINEAR - (IF_INTERNAL_PREC_BILINEAR - clpRng.bd);
-    offset = 1 << (shift - 1);
+    if( isFirst ) 
+    {
+      shift = IF_FILTER_PREC_BILINEAR - (IF_INTERNAL_PREC_BILINEAR - clpRng.bd);
+      offset = 1 << (shift - 1);
+    }
+    else 
+    {
+      shift = 4;
+      offset = 1 << (shift - 1);
+    }
   }
 #endif
   if( clpRng.bd <= 10 )