diff options
| author | Yaowu Xu <yaowu@google.com> | 2016-01-12 09:47:07 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2016-01-13 09:51:05 -0800 |
| commit | d803e8a20e252c47da6ced84a685cfc994dc9942 (patch) | |
| tree | 068f6797ac5e9de9cf217b84236053218f478a30 /vp10/encoder/aq_complexity.c | |
| parent | a0900fd0db5408da029fd3c71ec1f9d49ff98b3f (diff) | |
| download | libvpx-d803e8a20e252c47da6ced84a685cfc994dc9942.tar libvpx-d803e8a20e252c47da6ced84a685cfc994dc9942.tar.gz libvpx-d803e8a20e252c47da6ced84a685cfc994dc9942.tar.bz2 libvpx-d803e8a20e252c47da6ced84a685cfc994dc9942.zip | |
Fix encoder crashes and enc/dec mismatches
This commit adds the logic for segmentation map initialization and
disable temporal update of segmentation map when error-resilient
mode is on. It fixes the enc/dec mistmates (release build) and
assertions(debug) when both aq-mode and error-resilient are on.
Change-Id: Id2155e8b28962cf1f64494f4df0c8d79499b6890
Diffstat (limited to 'vp10/encoder/aq_complexity.c')
| -rw-r--r-- | vp10/encoder/aq_complexity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp10/encoder/aq_complexity.c b/vp10/encoder/aq_complexity.c index 0de044cf9..2506a4e55 100644 --- a/vp10/encoder/aq_complexity.c +++ b/vp10/encoder/aq_complexity.c @@ -51,7 +51,7 @@ void vp10_setup_in_frame_q_adj(VP10_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; |