Make copy_dering_16bit_to_16bit parameters consistent with od_dering

This commit fixes a residual parameter set conflicts in function
copy_dering_16bit_to_16bit(), due to the change of cb4x4 support
approach in cdef to better respect od_dering.c as a codec
independent file.

Change-Id: I7e2295cf6a083729077374b13836909bb611d573

av1/common/od_dering.c

@@ -213,10 +213,10 @@ void copy_4x4_16bit_to_16bit_c(uint16_t *dst, int dstride, const uint16_t *src,
 
 void copy_dering_16bit_to_16bit(uint16_t *dst, int dstride, uint16_t *src,
                                 dering_list *dlist, int dering_count,
-                                BLOCK_SIZE bsize) {
+                                int bsize) {
   int bi, bx, by;
 
-  if (bsize == BLOCK_8X8) {
+  if (bsize == 3) {
     for (bi = 0; bi < dering_count; bi++) {
       by = dlist[bi].by;
       bx = dlist[bi].bx;
@@ -342,7 +342,7 @@ void od_dering(uint8_t *dst, int dstride, uint16_t *y, uint16_t *in, int xdec,
   if (clpf_strength) {
     if (threshold && !skip_dering)
       copy_dering_16bit_to_16bit(in, OD_FILT_BSTRIDE, y, dlist, dering_count,
-                                 xdec ? BLOCK_4X4 : BLOCK_8X8);
+                                 bsize);
     for (bi = 0; bi < dering_count; bi++) {
       by = dlist[bi].by;
       bx = dlist[bi].bx;
@@ -370,7 +370,7 @@ void od_dering(uint8_t *dst, int dstride, uint16_t *y, uint16_t *in, int xdec,
     // No clpf, so copy instead
     if (hbd) {
       copy_dering_16bit_to_16bit((uint16_t *)dst, dstride, y, dlist,
-                                 dering_count, 3 - xdec);
+                                 dering_count, bsize);
     } else {
       copy_dering_16bit_to_8bit(dst, dstride, y, dlist, dering_count, bsize);
     }

av1/common/od_dering.h

@@ -44,7 +44,7 @@ typedef void (*od_filter_dering_direction_func)(uint16_t *y, int ystride,
                                                 int threshold, int dir);
 void copy_dering_16bit_to_16bit(uint16_t *dst, int dstride, uint16_t *src,
                                 dering_list *dlist, int dering_count,
-                                BLOCK_SIZE bsize);
+                                int bsize);
 
 void od_dering(uint8_t *dst, int dstride, uint16_t *y, uint16_t *in, int xdec,
                int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS], int *dirinit,