Merge "Initialize avg_frame_qindex to worst_allowed for 1 pass."

This commit is contained in:
Marco Paniconi 2013-12-20 10:28:09 -08:00 коммит произвёл Gerrit Code Review
Родитель 6afd37aa15 5ba4b16c2d
Коммит 68cdbfe50e
1 изменённых файлов: 12 добавлений и 6 удалений

Просмотреть файл

@ -1094,12 +1094,18 @@ static void init_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
// Initialize active best and worst q and average q values. // Initialize active best and worst q and average q values.
cpi->rc.active_worst_quality = cpi->oxcf.worst_allowed_q; cpi->rc.active_worst_quality = cpi->oxcf.worst_allowed_q;
cpi->rc.avg_frame_qindex[0] = (cpi->oxcf.worst_allowed_q + if (cpi->pass == 0 && cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER) {
cpi->oxcf.best_allowed_q) / 2; cpi->rc.avg_frame_qindex[0] = cpi->oxcf.worst_allowed_q;
cpi->rc.avg_frame_qindex[1] = (cpi->oxcf.worst_allowed_q + cpi->rc.avg_frame_qindex[1] = cpi->oxcf.worst_allowed_q;
cpi->oxcf.best_allowed_q) / 2; cpi->rc.avg_frame_qindex[2] = cpi->oxcf.worst_allowed_q;
cpi->rc.avg_frame_qindex[2] = (cpi->oxcf.worst_allowed_q + } else {
cpi->oxcf.best_allowed_q) / 2; cpi->rc.avg_frame_qindex[0] = (cpi->oxcf.worst_allowed_q +
cpi->oxcf.best_allowed_q) / 2;
cpi->rc.avg_frame_qindex[1] = (cpi->oxcf.worst_allowed_q +
cpi->oxcf.best_allowed_q) / 2;
cpi->rc.avg_frame_qindex[2] = (cpi->oxcf.worst_allowed_q +
cpi->oxcf.best_allowed_q) / 2;
}
cpi->rc.last_q[0] = cpi->oxcf.best_allowed_q; cpi->rc.last_q[0] = cpi->oxcf.best_allowed_q;
cpi->rc.last_q[1] = cpi->oxcf.best_allowed_q; cpi->rc.last_q[1] = cpi->oxcf.best_allowed_q;
cpi->rc.last_q[2] = cpi->oxcf.best_allowed_q; cpi->rc.last_q[2] = cpi->oxcf.best_allowed_q;