diff options
| author | Yaowu Xu <yaowu@google.com> | 2016-01-13 17:27:17 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2016-01-13 17:27:17 -0800 |
| commit | 0dfe9618c304f4c49184e7a5fe72e37070f957c9 (patch) | |
| tree | b657c46e7b0536a566dd4f3859e825d1e39e2b28 | |
| parent | d803e8a20e252c47da6ced84a685cfc994dc9942 (diff) | |
| download | libvpx-0dfe9618c304f4c49184e7a5fe72e37070f957c9.tar libvpx-0dfe9618c304f4c49184e7a5fe72e37070f957c9.tar.gz libvpx-0dfe9618c304f4c49184e7a5fe72e37070f957c9.tar.bz2 libvpx-0dfe9618c304f4c49184e7a5fe72e37070f957c9.zip | |
Properly set segmentation for error-resilient mode
Change-Id: I0c85b637e51dc949a4e919f10a78870f23c2ca6a
| -rw-r--r-- | vp9/encoder/vp9_aq_complexity.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_aq_variance.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_aq_complexity.c b/vp9/encoder/vp9_aq_complexity.c index 30ec19112..e5973220e 100644 --- a/vp9/encoder/vp9_aq_complexity.c +++ b/vp9/encoder/vp9_aq_complexity.c @@ -51,7 +51,7 @@ void vp9_setup_in_frame_q_adj(VP9_COMP *cpi) { // Make SURE use of floating point in this function is safe. vpx_clear_system_state(); - if (cm->frame_type == KEY_FRAME || + if (frame_is_intra_only(cm) || cm->error_resilient_mode || cpi->refresh_alt_ref_frame || (cpi->refresh_golden_frame && !cpi->rc.is_src_frame_alt_ref)) { int segment; diff --git a/vp9/encoder/vp9_aq_variance.c b/vp9/encoder/vp9_aq_variance.c index 1c99105d1..d8f7d0721 100644 --- a/vp9/encoder/vp9_aq_variance.c +++ b/vp9/encoder/vp9_aq_variance.c @@ -48,7 +48,7 @@ void vp9_vaq_frame_setup(VP9_COMP *cpi) { struct segmentation *seg = &cm->seg; int i; - if (cm->frame_type == KEY_FRAME || + if (frame_is_intra_only(cm) || cm->error_resilient_mode || cpi->refresh_alt_ref_frame || (cpi->refresh_golden_frame && !cpi->rc.is_src_frame_alt_ref)) { vp9_enable_segmentation(seg); |