generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Properly set segmentation for error-resilient mode"

Browse Source
This commit is contained in:
Yaowu Xu 2016-01-22 16:52:41 +00:00 committed by Gerrit Code Review
commit 307c84c352
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/encoder/vp9_aq_complexity.c
View File

@ -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;

2
vp9/encoder/vp9_aq_variance.c
View File

@ -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);