diff options
| author | Jerome Jiang <jianj@google.com> | 2019-06-20 17:20:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-20 17:20:54 +0000 |
| commit | c94dea71eda6f6f753444f67f9604d6dc778d3c8 (patch) | |
| tree | 5a613f28f5692c97f18e2275753dbe4fdd622555 | |
| parent | cbf0b1688a95508db4e468506065538af1a73801 (diff) | |
| parent | 2da0a7ecb1f439fc35f6fe24592be6fbf381376a (diff) | |
| download | libvpx-c94dea71eda6f6f753444f67f9604d6dc778d3c8.tar libvpx-c94dea71eda6f6f753444f67f9604d6dc778d3c8.tar.gz libvpx-c94dea71eda6f6f753444f67f9604d6dc778d3c8.tar.bz2 libvpx-c94dea71eda6f6f753444f67f9604d6dc778d3c8.zip | |
Merge "vp8: Allow higher resolution to get periodic keyframe."
| -rw-r--r-- | vpx/src/vpx_encoder.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vpx/src/vpx_encoder.c b/vpx/src/vpx_encoder.c index f38577de6..c227ee902 100644 --- a/vpx/src/vpx_encoder.c +++ b/vpx/src/vpx_encoder.c @@ -104,12 +104,6 @@ vpx_codec_err_t vpx_codec_enc_init_multi_ver( mr_cfg.mr_down_sampling_factor.num = dsf->num; mr_cfg.mr_down_sampling_factor.den = dsf->den; - /* Force Key-frame synchronization. Namely, encoder at higher - * resolution always use the same frame_type chosen by the - * lowest-resolution encoder. - */ - if (mr_cfg.mr_encoder_id) cfg->kf_mode = VPX_KF_DISABLED; - ctx->iface = iface; ctx->name = iface->name; ctx->priv = NULL; |