diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2014-12-21 17:57:26 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-21 21:35:07 -0800 |
| commit | f4eab151c57fe7e3b608249ce0be53675e271143 (patch) | |
| tree | 981049e1b7570ae9e2f3b034895307850ce5bf0e | |
| parent | 9152537f3e58c1d03839f20d65173ec541831f9f (diff) | |
| download | libvpx-f4eab151c57fe7e3b608249ce0be53675e271143.tar libvpx-f4eab151c57fe7e3b608249ce0be53675e271143.tar.gz libvpx-f4eab151c57fe7e3b608249ce0be53675e271143.tar.bz2 libvpx-f4eab151c57fe7e3b608249ce0be53675e271143.zip | |
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
| -rw-r--r-- | vp8/common/loopfilter.c | 2 | ||||
| -rw-r--r-- | vp8/common/loopfilter.h | 2 | ||||
| -rw-r--r-- | 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 df01e6195..da2275ee2 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 38e013f88..20a6bd375 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 84e62af23..ab03c909d 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], |