Merge "SVC fix to set worst/best_quality per layer."

This commit is contained in:
Marco Paniconi 2015-09-15 22:06:13 +00:00 коммит произвёл Gerrit Code Review
Родитель eb53c69ece 15c43d9ac7
Коммит f6097ef243
1 изменённых файлов: 8 добавлений и 0 удалений

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

@ -554,6 +554,14 @@ int vp9_one_pass_cbr_svc_start_layer(VP9_COMP *const cpi) {
cpi->svc.number_temporal_layers + cpi->svc.number_temporal_layers +
cpi->svc.temporal_layer_id]; cpi->svc.temporal_layer_id];
// Setting the worst/best_quality via the encoder control: SET_SVC_PARAMETERS,
// only for non-BYPASS mode for now.
if (cpi->svc.temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_BYPASS) {
RATE_CONTROL *const lrc = &lc->rc;
lrc->worst_quality = vp9_quantizer_to_qindex(lc->max_q);
lrc->best_quality = vp9_quantizer_to_qindex(lc->min_q);
}
get_layer_resolution(cpi->oxcf.width, cpi->oxcf.height, get_layer_resolution(cpi->oxcf.width, cpi->oxcf.height,
lc->scaling_factor_num, lc->scaling_factor_den, lc->scaling_factor_num, lc->scaling_factor_den,
&width, &height); &width, &height);