diff options
| author | Marco Paniconi <marpan@google.com> | 2015-09-15 22:06:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-15 22:06:13 +0000 |
| commit | f6097ef2432221e916b8e37a20b8508f9b7cb018 (patch) | |
| tree | 062d4fb8ef92946e10b59b9ac39b0a5c4fd23051 | |
| parent | eb53c69ece6b97f65afed81fd4c2ef9624501ea7 (diff) | |
| parent | 15c43d9ac78785036f84ef35c6418b3db93ed4a0 (diff) | |
| download | libvpx-f6097ef2432221e916b8e37a20b8508f9b7cb018.tar libvpx-f6097ef2432221e916b8e37a20b8508f9b7cb018.tar.gz libvpx-f6097ef2432221e916b8e37a20b8508f9b7cb018.tar.bz2 libvpx-f6097ef2432221e916b8e37a20b8508f9b7cb018.zip | |
Merge "SVC fix to set worst/best_quality per layer."
| -rw-r--r-- | vp9/encoder/vp9_svc_layercontext.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index 89e313373..58d273f5c 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -554,6 +554,14 @@ int vp9_one_pass_cbr_svc_start_layer(VP9_COMP *const cpi) { cpi->svc.number_temporal_layers + 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, lc->scaling_factor_num, lc->scaling_factor_den, &width, &height); |