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

Merge "Move overlay frame speed feature setting out of mode search loop"

Browse Source
This commit is contained in:
Jingning Han 2014-09-11 11:14:37 -07:00 committed by Gerrit Code Review
commit 3556ab56f6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vp9/encoder/vp9_rdopt.c
View File

@ -2677,6 +2677,14 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
} }
} }
if (cpi->rc.is_src_frame_alt_ref) {
if (cpi->sf.alt_ref_search_fp) {
mode_skip_mask[ALTREF_FRAME] = 0;
ref_frame_skip_mask[0] = ~(1 << ALTREF_FRAME);
ref_frame_skip_mask[1] = SECOND_REF_FRAME_MASK;
}
}
for (mode_index = 0; mode_index < MAX_MODES; ++mode_index) { for (mode_index = 0; mode_index < MAX_MODES; ++mode_index) {
int mode_excluded = 0; int mode_excluded = 0;
int64_t this_rd = INT64_MAX; int64_t this_rd = INT64_MAX;
@ -2721,15 +2729,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
} }
} }
if (cpi->rc.is_src_frame_alt_ref) {
if (cpi->sf.alt_ref_search_fp) {
mode_skip_mask[ALTREF_FRAME] = 0;
if (!(ref_frame == ALTREF_FRAME && second_ref_frame == NONE))
continue;
}
}
if (bsize > cpi->sf.max_intra_bsize) if (bsize > cpi->sf.max_intra_bsize)
if (ref_frame == INTRA_FRAME) if (ref_frame == INTRA_FRAME)
continue; continue;