diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2011-01-14 07:26:01 -0800 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-01-14 07:26:01 -0800 |
| commit | 8f711db4e88abc27d8616e4dc37d8e64677c2238 (patch) | |
| tree | 1158186a29502bf9158e5e2f5adf1eba566453b2 /vp8 | |
| parent | 2c1b06e67213d5e7375d911f326810dbf086f9e6 (diff) | |
| parent | 72e22b0bb8d66c37d57bccb95c9c43660e080745 (diff) | |
| download | libvpx-8f711db4e88abc27d8616e4dc37d8e64677c2238.tar libvpx-8f711db4e88abc27d8616e4dc37d8e64677c2238.tar.gz libvpx-8f711db4e88abc27d8616e4dc37d8e64677c2238.tar.bz2 libvpx-8f711db4e88abc27d8616e4dc37d8e64677c2238.zip | |
Merge "Experimental change to help with ARNR problem."
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/rdopt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index bab7ca12d..8598fc6ea 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -1849,7 +1849,10 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int x->e_mbd.mode_info_context->mbmi.uv_mode = DC_PRED; x->e_mbd.mode_info_context->mbmi.ref_frame = vp8_ref_frame_order[mode_index]; - //Only consider ZEROMV/ALTREF_FRAME for alt ref frame. + // Only consider ZEROMV/ALTREF_FRAME for alt ref frame, + // unless ARNR filtering is enabled in which case we want + // an unfiltered alternative + //if (cpi->is_src_frame_alt_ref && (cpi->oxcf.arnr_max_frames > 0)) if (cpi->is_src_frame_alt_ref) { if (this_mode != ZEROMV || x->e_mbd.mode_info_context->mbmi.ref_frame != ALTREF_FRAME) |