From 6c7b4ed3559c47dae3b50f90b2d329558c130e76 Mon Sep 17 00:00:00 2001 From: Zoe Liu Date: Fri, 6 Mar 2015 00:01:30 -0800 Subject: [PATCH] Fixed the build for newmvref-sub8x8 Change-Id: Ie042001e69d80b1fc52368f29617ad2e51a5e250 --- vp9/encoder/vp9_rdopt.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 21e728e01..c96c9f5db 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2782,7 +2782,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP9_COMP *cpi, MACROBLOCK *x, for (ref = 0; ref < 1 + has_second_rf; ++ref) { subpelmv |= mv_has_subpel(&mode_mv[this_mode][ref].as_mv); #if CONFIG_NEWMVREF_SUB8X8 - if (have_newmv_in_prediction(this_mode)) + if (have_newmv_in_inter_mode(this_mode)) have_ref &= ( (mode_mv[this_mode][ref].as_int == ref_bsi->rdstat[i][mode_idx].mvs[ref].as_int) && @@ -2799,15 +2799,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP9_COMP *cpi, MACROBLOCK *x, have_ref = 1; for (ref = 0; ref < 1 + has_second_rf; ++ref) #if CONFIG_NEWMVREF_SUB8X8 - if (this_mode == NEWMV -#if CONFIG_COMPOUND_MODES - || this_mode == NEW_NEWMV || - this_mode == NEAREST_NEWMV || - this_mode == NEW_NEARESTMV || - this_mode == NEAR_NEWMV || - this_mode == NEW_NEARMV -#endif // CONFIG_COMPOUND_MODES - ) + if (have_newmv_in_inter_mode) have_ref &= ( (mode_mv[this_mode][ref].as_int == ref_bsi->rdstat[i][mode_idx].mvs[ref].as_int) && -- 2.49.0