Revert "remove vp8 unused uvstride parm in simple loop filter"

This reverts commit 392a2c43c77242f05715bdac086f235e6cbbdf2e

Failing nexus build tests:
http://build.chromium.org/p/client.libvpx/builders/Nexus%207%20Builder/builds/224

Change-Id: I95ae2c894b70cef9c757334fcab7fdeca9003e9c

diff --git a/vp8/common/loopfilter.c b/vp8/common/loopfilter.c
index df01e6195b414fda726616637eb149dbfacd4642..da2275ee2377e090042cfccc9578aa27236def9a 100644 (file)
--- a/vp8/common/loopfilter.c
+++ b/vp8/common/loopfilter.c
@@ -254,7 +254,7 @@ void vp8_loop_filter_row_normal(VP8_COMMON *cm, MODE_INFO *mode_info_context,
 }
 
 void vp8_loop_filter_row_simple(VP8_COMMON *cm, MODE_INFO *mode_info_context,
-                         int mb_row, int post_ystride,
+                         int mb_row, int post_ystride, int post_uvstride,
                          unsigned char *y_ptr, unsigned char *u_ptr,
                          unsigned char *v_ptr)
 {

diff --git a/vp8/common/loopfilter.h b/vp8/common/loopfilter.h
index 38e013f88de6da944d8fdf38a67b418bee353eec..20a6bd375b600799fe887d60443f199319360777 100644 (file)
--- a/vp8/common/loopfilter.h
+++ b/vp8/common/loopfilter.h
@@ -103,7 +103,7 @@ void vp8_loop_filter_row_normal(struct VP8Common *cm,
 
 void vp8_loop_filter_row_simple(struct VP8Common *cm,
                                 struct modeinfo *mode_info_context,
-                                int mb_row, int post_ystride,
+                                int mb_row, int post_ystride, int post_uvstride,
                                 unsigned char *y_ptr, unsigned char *u_ptr,
                                 unsigned char *v_ptr);
 #ifdef __cplusplus

diff --git a/vp8/decoder/decodeframe.c b/vp8/decoder/decodeframe.c
index 84e62af235fee2c773980c53ca52ebd517502ba1..ab03c909d6d9c1b45e6112c6d7cf5616eef058ac 100644 (file)
--- a/vp8/decoder/decodeframe.c
+++ b/vp8/decoder/decodeframe.c
@@ -689,7 +689,7 @@ static void decode_mb_rows(VP8D_COMP *pbi)
                                                lf_dst[0], lf_dst[1], lf_dst[2]);
                 else
                     vp8_loop_filter_row_simple(pc, lf_mic, mb_row-1,
-                                               recon_y_stride,
+                                               recon_y_stride, recon_uv_stride,
                                                lf_dst[0], lf_dst[1], lf_dst[2]);
                 if(mb_row > 1)
                 {
@@ -734,7 +734,8 @@ static void decode_mb_rows(VP8D_COMP *pbi)
                                        lf_dst[2]);
         else
             vp8_loop_filter_row_simple(pc, lf_mic, mb_row-1, recon_y_stride,
-                                       lf_dst[0], lf_dst[1], lf_dst[2]);
+                                       recon_uv_stride, lf_dst[0], lf_dst[1],
+                                       lf_dst[2]);
 
         yv12_extend_frame_left_right_c(yv12_fb_new,
                                        eb_dst[0],