ref: 2c5dc477bf3abccd71642b612b6acddbd6636c20
parent: 3d94b9bf24cf2d43cf63a0d72314ef55e1019203
parent: 392a2c43c77242f05715bdac086f235e6cbbdf2e
author: Jim Bankoski <jimbankoski@google.com>
date: Sun Dec 21 11:49:45 EST 2014
Merge "remove vp8 unused uvstride parm in simple loop filter"
--- a/vp8/common/loopfilter.c
+++ b/vp8/common/loopfilter.c
@@ -254,7 +254,7 @@
}
void vp8_loop_filter_row_simple(VP8_COMMON *cm, MODE_INFO *mode_info_context,
- int mb_row, int post_ystride, int post_uvstride,
+ int mb_row, int post_ystride,
unsigned char *y_ptr, unsigned char *u_ptr,
unsigned char *v_ptr)
{--- a/vp8/common/loopfilter.h
+++ b/vp8/common/loopfilter.h
@@ -103,7 +103,7 @@
void vp8_loop_filter_row_simple(struct VP8Common *cm,
struct modeinfo *mode_info_context,
- int mb_row, int post_ystride, int post_uvstride,
+ int mb_row, int post_ystride,
unsigned char *y_ptr, unsigned char *u_ptr,
unsigned char *v_ptr);
#ifdef __cplusplus
--- a/vp8/decoder/decodeframe.c
+++ b/vp8/decoder/decodeframe.c
@@ -689,7 +689,7 @@
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_uv_stride,
+ recon_y_stride,
lf_dst[0], lf_dst[1], lf_dst[2]);
if(mb_row > 1)
{@@ -734,8 +734,7 @@
lf_dst[2]);
else
vp8_loop_filter_row_simple(pc, lf_mic, mb_row-1, recon_y_stride,
- recon_uv_stride, lf_dst[0], lf_dst[1],
- lf_dst[2]);
+ lf_dst[0], lf_dst[1], lf_dst[2]);
yv12_extend_frame_left_right_c(yv12_fb_new,
eb_dst[0],