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

Merge "vp9 aq-mode=3: Keep it on even at low bitrates."

Browse Source
This commit is contained in:
Marco Paniconi 2016-02-05 16:38:41 +00:00 committed by Gerrit Code Review
commit 85dccb6944
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vp9/encoder/vp9_aq_cyclicrefresh.c
View File

@ -60,8 +60,6 @@ void vp9_cyclic_refresh_free(CYCLIC_REFRESH *cr) {
} }
// Check if we should turn off cyclic refresh based on bitrate condition. // Check if we should turn off cyclic refresh based on bitrate condition.
// TODO(marpan): May be better in some cases to just reduce the amount/delta-qp
// instead of completely shutting off.
static int apply_cyclic_refresh_bitrate(const VP9_COMMON *cm, static int apply_cyclic_refresh_bitrate(const VP9_COMMON *cm,
const RATE_CONTROL *rc) { const RATE_CONTROL *rc) {
// Turn off cyclic refresh if bits available per frame is not sufficiently // Turn off cyclic refresh if bits available per frame is not sufficiently
@ -535,7 +533,10 @@ void vp9_cyclic_refresh_setup(VP9_COMP *const cpi) {
const RATE_CONTROL *const rc = &cpi->rc; const RATE_CONTROL *const rc = &cpi->rc;
CYCLIC_REFRESH *const cr = cpi->cyclic_refresh; CYCLIC_REFRESH *const cr = cpi->cyclic_refresh;
struct segmentation *const seg = &cm->seg; struct segmentation *const seg = &cm->seg;
const int apply_cyclic_refresh = apply_cyclic_refresh_bitrate(cm, rc); // TODO(marpan): Look into whether we should reduce the amount/delta-qp
// instead of completely shutting off at low bitrates. For now keep it on.
// const int apply_cyclic_refresh = apply_cyclic_refresh_bitrate(cm, rc);
const int apply_cyclic_refresh = 1;
if (cm->current_video_frame == 0) if (cm->current_video_frame == 0)
cr->low_content_avg = 0.0; cr->low_content_avg = 0.0;
// Don't apply refresh on key frame or temporal enhancement layer frames. // Don't apply refresh on key frame or temporal enhancement layer frames.