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

Merge "Speed-up recode loop for extreme bitrate diffs"

Browse Source
This commit is contained in:
Debargha Mukherjee 2016-11-03 17:04:17 +00:00 committed by Gerrit Code Review
commit f93305aa07
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vp9/encoder/vp9_encoder.c
View File

@ -3218,6 +3218,13 @@ static void encode_without_recode_loop(VP9_COMP *cpi, size_t *size,
vpx_clear_system_state(); vpx_clear_system_state();
} }
#define MAX_QSTEP_ADJ 4
static int get_qstep_adj(int rate_excess, int rate_limit) {
int qstep =
rate_limit ? ((rate_excess + rate_limit / 2) / rate_limit) : INT_MAX;
return VPXMIN(qstep, MAX_QSTEP_ADJ);
}
static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size, static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size,
uint8_t *dest) { uint8_t *dest) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
@ -3391,6 +3398,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size,
// to attempt to recode. // to attempt to recode.
int last_q = q; int last_q = q;
int retries = 0; int retries = 0;
int qstep;
if (cpi->resize_pending == 1) { if (cpi->resize_pending == 1) {
// Change in frame size so go back around the recode loop. // Change in frame size so go back around the recode loop.
@ -3416,7 +3424,10 @@ static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size,
q_high = rc->worst_quality; q_high = rc->worst_quality;
// Raise Qlow as to at least the current value // Raise Qlow as to at least the current value
q_low = q < q_high ? q + 1 : q_high; qstep =
get_qstep_adj(rc->projected_frame_size, rc->this_frame_target);
q_low = VPXMIN(q + qstep, q_high);
// q_low = q < q_high ? q + 1 : q_high;
if (undershoot_seen || loop_at_this_size > 1) { if (undershoot_seen || loop_at_this_size > 1) {
// Update rate_correction_factor unless // Update rate_correction_factor unless
@ -3441,7 +3452,10 @@ static void encode_with_recode_loop(VP9_COMP *cpi, size_t *size,
overshoot_seen = 1; overshoot_seen = 1;
} else { } else {
// Frame is too small // Frame is too small
q_high = q > q_low ? q - 1 : q_low; qstep =
get_qstep_adj(rc->this_frame_target, rc->projected_frame_size);
q_high = VPXMAX(q - qstep, q_low);
// q_high = q > q_low ? q - 1 : q_low;
if (overshoot_seen || loop_at_this_size > 1) { if (overshoot_seen || loop_at_this_size > 1) {
vp9_rc_update_rate_correction_factors(cpi); vp9_rc_update_rate_correction_factors(cpi);