Replacing SVC oxcf->mode check with oxcf->pass check.
oxcf->pass is used in all other places in similar contexts. Change-Id: I9de3a5f24311838d5a6dc3dd470d258cb189ff59
This commit is contained in:
Родитель
43a83a2734
Коммит
17a26eb443
|
@ -525,10 +525,8 @@ static void init_config(struct VP9_COMP *cpi, VP9EncoderConfig *oxcf) {
|
||||||
// Temporal scalability.
|
// Temporal scalability.
|
||||||
cpi->svc.number_temporal_layers = oxcf->ts_number_layers;
|
cpi->svc.number_temporal_layers = oxcf->ts_number_layers;
|
||||||
|
|
||||||
if ((cpi->svc.number_temporal_layers > 1 &&
|
if ((cpi->svc.number_temporal_layers > 1 && cpi->oxcf.rc_mode == VPX_CBR) ||
|
||||||
cpi->oxcf.rc_mode == VPX_CBR) ||
|
(cpi->svc.number_spatial_layers > 1 && cpi->oxcf.pass == 2)) {
|
||||||
(cpi->svc.number_spatial_layers > 1 &&
|
|
||||||
cpi->oxcf.mode == TWO_PASS_SECOND_BEST)) {
|
|
||||||
vp9_init_layer_context(cpi);
|
vp9_init_layer_context(cpi);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче