From 10cdeab42a54930fffe0b6d6eb93ba5d52d4da19 Mon Sep 17 00:00:00 2001 From: Yue Chen Date: Fri, 4 Mar 2016 15:37:45 -0800 Subject: [PATCH] Fix a bug in obmc prediction For left side obmc, the input of the mask function is corrected as the column coordinate. Also, minor fixes for a compiler warning. Change-Id: Ia981ef443d5b0285a93d73e5c7ab83f8c3a23464 --- vp10/common/reconinter.c | 2 +- vp10/decoder/decodeframe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vp10/common/reconinter.c b/vp10/common/reconinter.c index 97046bb8b..72e6ae0a7 100644 --- a/vp10/common/reconinter.c +++ b/vp10/common/reconinter.c @@ -792,7 +792,7 @@ void vp10_build_obmc_inter_prediction(VP10_COMMON *cm, for (row = 0; row < bh; ++row) { for (col = 0; col < bw; ++col) - dst16[col] = (mask[0][row] * dst16[col] + mask[1][row] * tmp16[col] + dst16[col] = (mask[0][col] * dst16[col] + mask[1][col] * tmp16[col] + 32) >> 6; dst16 += dst_stride; tmp16 += tmp_stride; diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c index 2c2dc485b..5c5c31caf 100644 --- a/vp10/decoder/decodeframe.c +++ b/vp10/decoder/decodeframe.c @@ -811,7 +811,9 @@ static void dec_build_inter_predictors(VP10Decoder *const pbi, MACROBLOCKD *xd, subpel_y, sf, w, h, ref, interp_filter, xs, ys); #endif // CONFIG_VP9_HIGHBITDEPTH } +#endif // (CONFIG_SUPERTX || CONFIG_OBMC) +#if CONFIG_SUPERTX static void dec_build_inter_predictors_sb(VP10Decoder *const pbi, MACROBLOCKD *xd, int mi_row, int mi_col) { @@ -881,9 +883,7 @@ static void dec_build_inter_predictors_sb(VP10Decoder *const pbi, sb_type); #endif // CONFIG_EXT_INTER } -#endif // (CONFIG_SUPERTX || CONFIG_OBMC) -#if CONFIG_SUPERTX static void dec_build_inter_predictors_sb_sub8x8(VP10Decoder *const pbi, MACROBLOCKD *xd, int mi_row, int mi_col, -- 2.40.0