diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2012-09-24 07:53:26 -0700 |
|---|---|---|
| committer | Jim Bankoski <jimbankoski@google.com> | 2012-09-24 07:53:26 -0700 |
| commit | 22141d9d7999be8acef90e3aa3aef2db5efd8711 (patch) | |
| tree | 038ecb65bd845a6950921f9c59ba6841a8d5d804 | |
| parent | e278673c8eae8993eaec30d50e0dd5b25cbacd4a (diff) | |
| download | libvpx-22141d9d7999be8acef90e3aa3aef2db5efd8711.tar libvpx-22141d9d7999be8acef90e3aa3aef2db5efd8711.tar.gz libvpx-22141d9d7999be8acef90e3aa3aef2db5efd8711.tar.bz2 libvpx-22141d9d7999be8acef90e3aa3aef2db5efd8711.zip | |
disable segmentation on enhancement layers
This should avoid problems with blocks gettings high quality
improvement despite having recently moved:
Change-Id: Ic0af0de2d6577807fa3c553f47b55d547ef36359
| -rw-r--r-- | vp8/encoder/onyx_if.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 488558791..9171d0752 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -3777,8 +3777,13 @@ static void encode_frame_to_data_rate /* Setup background Q adjustment for error resilient mode. * For multi-layer encodes only enable this for the base layer. */ - if (cpi->cyclic_refresh_mode_enabled && (cpi->current_layer==0)) + if (cpi->cyclic_refresh_mode_enabled) + { + if (cpi->current_layer==0) cyclic_background_refresh(cpi, Q, 0); + else + disable_segmentation(cpi); + } vp8_compute_frame_size_bounds(cpi, &frame_under_shoot_limit, &frame_over_shoot_limit); @@ -3933,8 +3938,13 @@ static void encode_frame_to_data_rate * and background refresh. */ Q = vp8_regulate_q(cpi, cpi->this_frame_target); - if (cpi->cyclic_refresh_mode_enabled && (cpi->current_layer==0)) - cyclic_background_refresh(cpi, Q, 0); + if (cpi->cyclic_refresh_mode_enabled) + { + if (cpi->current_layer==0) + cyclic_background_refresh(cpi, Q, 0); + else + disable_segmentation(cpi); + } vp8_set_quantizer(cpi, Q); } |