From 0dfe9618c304f4c49184e7a5fe72e37070f957c9 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Wed, 13 Jan 2016 17:27:17 -0800 Subject: [PATCH] Properly set segmentation for error-resilient mode Change-Id: I0c85b637e51dc949a4e919f10a78870f23c2ca6a --- vp9/encoder/vp9_aq_complexity.c | 2 +- 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 30ec191..e597322 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 1c99105..d8f7d07 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); -- 2.7.4