diff options
| author | Marco Paniconi <marpan@google.com> | 2014-02-03 12:28:32 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-03 12:28:32 -0800 |
| commit | 7ec838edc4d58142e931f383ae29ce421491b508 (patch) | |
| tree | 52275a5e3bc136b053935bb20f581b16d85f3b00 /vpx/src | |
| parent | 6be2b750b8968a0b19180a6474864c0b6a41db13 (diff) | |
| download | libvpx-7ec838edc4d58142e931f383ae29ce421491b508.tar libvpx-7ec838edc4d58142e931f383ae29ce421491b508.tar.gz libvpx-7ec838edc4d58142e931f383ae29ce421491b508.tar.bz2 libvpx-7ec838edc4d58142e931f383ae29ce421491b508.zip | |
Revert "Layer based rate control for CBR mode."
This reverts commit 6be2b750b8968a0b19180a6474864c0b6a41db13
Change-Id: Ic52acd98b37c3ba49d4999b463389eb564f49c4b
Diffstat (limited to 'vpx/src')
| -rw-r--r-- | vpx/src/svc_encodeframe.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vpx/src/svc_encodeframe.c b/vpx/src/svc_encodeframe.c index 12f7166c3..810e881c8 100644 --- a/vpx/src/svc_encodeframe.c +++ b/vpx/src/svc_encodeframe.c @@ -499,7 +499,6 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx, // modify encoder configuration enc_cfg->ss_number_layers = si->layers; - enc_cfg->ts_number_layers = 1; // Temporal layers not used in this encoder. enc_cfg->kf_mode = VPX_KF_DISABLED; enc_cfg->g_pass = VPX_RC_ONE_PASS; // Lag in frames not currently supported @@ -692,8 +691,7 @@ static void set_svc_parameters(SvcContext *svc_ctx, SvcInternal *const si = get_svc_internal(svc_ctx); memset(&svc_params, 0, sizeof(svc_params)); - svc_params.temporal_layer = 0; - svc_params.spatial_layer = si->layer; + svc_params.layer = si->layer; svc_params.flags = si->enc_frame_flags; layer = si->layer; |