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

Merge "aq-mode=3: Update to allow for refresh on modes other than zero-mv."

Browse Source
This commit is contained in:
Marco
2015-01-26 19:47:13 -08:00
committed by Gerrit Code Review
parent d231ce4fde 3f1af6e85e
commit 1c4a84c6e9
3 changed files with 38 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vp9/encoder/vp9_encodeframe.c
View File

@@ -770,8 +770,8 @@ static void update_state(VP9_COMP *cpi, ThreadData *td,
// Else for cyclic refresh mode update the segment map, set the segment id
// and then update the quantizer.
if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ) {
vp9_cyclic_refresh_update_segment(cpi, &xd->mi[0].src_mi->mbmi,
mi_row, mi_col, bsize, 1, ctx->rate);
vp9_cyclic_refresh_update_segment(cpi, &xd->mi[0].src_mi->mbmi, mi_row,
mi_col, bsize, ctx->rate, ctx->dist);
}
}
@@ -1458,9 +1458,9 @@ static void update_state_rt(VP9_COMP *cpi, ThreadData *td,
: cm->last_frame_seg_map;
mbmi->segment_id = vp9_get_segment_id(cm, map, bsize, mi_row, mi_col);
} else {
// Setting segmentation map for cyclic_refresh
vp9_cyclic_refresh_update_segment(cpi, mbmi, mi_row, mi_col, bsize, 1,
ctx->rate);
// Setting segmentation map for cyclic_refresh.
vp9_cyclic_refresh_update_segment(cpi, mbmi, mi_row, mi_col, bsize,
ctx->rate, ctx->dist);
}
vp9_init_plane_quantizers(cpi, x);
}