Merge "Add extra resize trigger for frames above maximum allowed size."

This commit is contained in:
paulwilkins 2015-07-14 18:24:12 +00:00 committed by Gerrit Code Review
commit e11878c8e3

View File

@ -2628,9 +2628,10 @@ static int recode_loop_test(VP9_COMP *cpi,
const int frame_is_kfgfarf = frame_is_kf_gf_arf(cpi);
int force_recode = 0;
if ((cpi->sf.recode_loop == ALLOW_RECODE) ||
if ((rc->projected_frame_size >= rc->max_frame_bandwidth) ||
(cpi->sf.recode_loop == ALLOW_RECODE) ||
(frame_is_kfgfarf &&
(cpi->sf.recode_loop == ALLOW_RECODE_KFARFGF))) {
(cpi->sf.recode_loop == ALLOW_RECODE_KFARFGF))) {
if (frame_is_kfgfarf &&
(oxcf->resize_mode == RESIZE_DYNAMIC) &&
scale_down(cpi, q)) {