diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-01-31 12:45:30 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-02-03 12:44:45 +0000 |
| commit | f0459549a60b1df09220f2abf6afefabb81b40a3 (patch) | |
| tree | 803f7f218a00894a202b81e9837f42aa72ea85a2 /vp8/encoder/onyx_if.c | |
| parent | 5d0b5a17d9a73b3f4588ae95fbd4b18e7af79f35 (diff) | |
| download | libvpx-f0459549a60b1df09220f2abf6afefabb81b40a3.tar libvpx-f0459549a60b1df09220f2abf6afefabb81b40a3.tar.gz libvpx-f0459549a60b1df09220f2abf6afefabb81b40a3.tar.bz2 libvpx-f0459549a60b1df09220f2abf6afefabb81b40a3.zip | |
Reference frame prediction:
Extended prediction and coding of reference frame where
a subset of options are flagged as available at the segment level.
Updated copyright notices.
Switch to SAD in mbgraph code as SATD problematic for the
foreground and background separation as it can ignore large DC shifts.
Change-Id: I661dbbb2f94f3ec0f96bb928c1655e5e415a7de1
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index b3b0790ff..2ea41ab35 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -474,7 +474,7 @@ static void init_seg_features(VP8_COMP *cpi) VP8_COMMON *cm = &cpi->common; MACROBLOCKD *xd = &cpi->mb.e_mbd; - int high_q = (int)(cpi->avg_q > 32.0); + int high_q = (int)(cpi->avg_q > 48.0); int qi_delta; // For now at least dont enable seg features alongside cyclic refresh. @@ -575,15 +575,10 @@ static void init_seg_features(VP8_COMP *cpi) set_segdata( xd, 1, SEG_LVL_ALT_LF, -2 ); enable_segfeature(xd, 1, SEG_LVL_ALT_LF); -#if CONFIG_COMPRED // Segment coding disabled for compred testing if ( high_q || (cpi->static_mb_pct == 100) ) - //if ( 0 ) -#else - if ( high_q || (cpi->static_mb_pct == 100) ) - //if ( 0 ) -#endif { + //set_segref(xd, 1, LAST_FRAME); set_segref(xd, 1, ALTREF_FRAME); enable_segfeature(xd, 1, SEG_LVL_REF_FRAME); @@ -618,14 +613,8 @@ static void init_seg_features(VP8_COMP *cpi) // Special case where we are coding over the top of a previous // alt ref frame -#if CONFIG_COMPRED // Segment coding disabled for compred testing else if ( cpi->is_src_frame_alt_ref ) - //else if ( 0 ) -#else - else if ( cpi->is_src_frame_alt_ref ) - //else if ( 0 ) -#endif { // Enable mode and ref frame features for segment 0 as well enable_segfeature(xd, 0, SEG_LVL_REF_FRAME); |