diff options
author | Marco Paniconi <marpan@google.com> | 2017-05-10 23:51:44 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-10 23:51:44 +0000 |
commit | f7e767d8ee584aabc2074e425186b219d564cce3 (patch) | |
tree | 5e947e8e645231a008870e145181d0ee3d20e9f2 | |
parent | 8477a66fc886b2e00a65f8eb3edaf649ceb5caba (diff) | |
parent | eaa6715b02b3ec63fc3a24e62ac2e36e93298c4b (diff) | |
download | libvpx-f7e767d8ee584aabc2074e425186b219d564cce3.tar libvpx-f7e767d8ee584aabc2074e425186b219d564cce3.tar.gz libvpx-f7e767d8ee584aabc2074e425186b219d564cce3.tar.bz2 libvpx-f7e767d8ee584aabc2074e425186b219d564cce3.zip |
Merge "vp9: SVC: Fix setting in sample encoder."
-rw-r--r-- | vpx/src/svc_encodeframe.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vpx/src/svc_encodeframe.c b/vpx/src/svc_encodeframe.c index c2f80d885..c774abb34 100644 --- a/vpx/src/svc_encodeframe.c +++ b/vpx/src/svc_encodeframe.c @@ -436,6 +436,10 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx, si->svc_params.scaling_factor_num[sl] = DEFAULT_SCALE_FACTORS_NUM_2x[sl2]; si->svc_params.scaling_factor_den[sl] = DEFAULT_SCALE_FACTORS_DEN_2x[sl2]; } + if (svc_ctx->spatial_layers == 1) { + si->svc_params.scaling_factor_num[0] = 1; + si->svc_params.scaling_factor_den[0] = 1; + } } for (tl = 0; tl < svc_ctx->temporal_layers; ++tl) { for (sl = 0; sl < svc_ctx->spatial_layers; ++sl) { |