diff options
| author | Marco <marpan@chromium.org> | 2015-06-02 10:23:03 -0700 |
|---|---|---|
| committer | Marco <marpan@chromium.org> | 2015-06-03 17:43:22 -0700 |
| commit | a8c5ab2ca63649271d16e990e3f8de9409a60c6c (patch) | |
| tree | 8cb87ed366ea620c53f6deabaabe95057a0beac6 /vp9/encoder | |
| parent | 5df6c0458555dd03fd5796e9d9342d1394ade446 (diff) | |
| download | libvpx-a8c5ab2ca63649271d16e990e3f8de9409a60c6c.tar libvpx-a8c5ab2ca63649271d16e990e3f8de9409a60c6c.tar.gz libvpx-a8c5ab2ca63649271d16e990e3f8de9409a60c6c.tar.bz2 libvpx-a8c5ab2ca63649271d16e990e3f8de9409a60c6c.zip | |
Remove ABI check for 1 pass CBR SVC.
Remove the ABI check for the controls needed for SVC 1 pass CBR mode.
Bump up the ABI version.
Change-Id: I35b79ee010e14af83c6d1e801d574deaaa2fc7eb
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 4355ec60e..49e888768 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -843,7 +843,9 @@ static int choose_partitioning(VP9_COMP *cpi, } } } - if (is_key_frame || (low_res && + // TODO(marpan): There is an issue with variance based on 4x4 average in + // svc mode, don't allow it for now. + if (is_key_frame || (low_res && !cpi->use_svc && vt.split[i].split[j].part_variances.none.variance > (thresholds[1] << 1))) { force_split[split_index] = 0; |