From f4eab151c57fe7e3b608249ce0be53675e271143 Mon Sep 17 00:00:00 2001 From: Jim Bankoski Date: Sun, 21 Dec 2014 17:57:26 -0800 Subject: [PATCH] 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 --- vp8/common/loopfilter.c | 2 +- vp8/common/loopfilter.h | 2 +- vp8/decoder/decodeframe.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vp8/common/loopfilter.c b/vp8/common/loopfilter.c index df01e61..da2275e 100644 --- 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 38e013f..20a6bd3 100644 --- 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 84e62af..ab03c90 100644 --- 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], -- 2.7.4