generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed the build for newmvref-sub8x8

Browse Source 
Change-Id: Ie042001e69d80b1fc52368f29617ad2e51a5e250
This commit is contained in:
Zoe Liu 2015-03-06 00:01:30 -08:00
parent 1192f99976
commit 6c7b4ed355
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vp9/encoder/vp9_rdopt.c
View File

@ -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) { for (ref = 0; ref < 1 + has_second_rf; ++ref) {
subpelmv |= mv_has_subpel(&mode_mv[this_mode][ref].as_mv); subpelmv |= mv_has_subpel(&mode_mv[this_mode][ref].as_mv);
#if CONFIG_NEWMVREF_SUB8X8 #if CONFIG_NEWMVREF_SUB8X8
if (have_newmv_in_prediction(this_mode)) if (have_newmv_in_inter_mode(this_mode))
have_ref &= ( have_ref &= (
(mode_mv[this_mode][ref].as_int == (mode_mv[this_mode][ref].as_int ==
ref_bsi->rdstat[i][mode_idx].mvs[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; have_ref = 1;
for (ref = 0; ref < 1 + has_second_rf; ++ref) for (ref = 0; ref < 1 + has_second_rf; ++ref)
#if CONFIG_NEWMVREF_SUB8X8 #if CONFIG_NEWMVREF_SUB8X8
if (this_mode == NEWMV if (have_newmv_in_inter_mode)
#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
)
have_ref &= ( have_ref &= (
(mode_mv[this_mode][ref].as_int == (mode_mv[this_mode][ref].as_int ==
ref_bsi->rdstat[i][mode_idx].mvs[ref].as_int) && ref_bsi->rdstat[i][mode_idx].mvs[ref].as_int) &&