diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-04-14 10:29:22 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-14 10:29:22 -0700 |
| commit | 07dd7054980d5720e21a2bee9aa26fc3c058fef4 (patch) | |
| tree | bd0d9cfb00bd460975bf6a9295a30cae71e62c99 /vp9/encoder | |
| parent | e5930d5b77e5c4a78299454c5db66c9ca5729708 (diff) | |
| parent | 603500055e2e5b4858d6e8ccc8f609a9b68eda76 (diff) | |
| download | libvpx-07dd7054980d5720e21a2bee9aa26fc3c058fef4.tar libvpx-07dd7054980d5720e21a2bee9aa26fc3c058fef4.tar.gz libvpx-07dd7054980d5720e21a2bee9aa26fc3c058fef4.tar.bz2 libvpx-07dd7054980d5720e21a2bee9aa26fc3c058fef4.zip | |
Merge "Removing redundant checks from vp9_change_config()."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index dc9e4dadb..1d70538c6 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -815,10 +815,7 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9_CONFIG *oxcf) { cm->display_width = cpi->oxcf.width; cm->display_height = cpi->oxcf.height; - // VP8 sharpness level mapping 0-7 (vs 0-10 in general VPx dialogs) - cpi->oxcf.sharpness = MIN(7, cpi->oxcf.sharpness); - - cpi->common.lf.sharpness_level = cpi->oxcf.sharpness; + cm->lf.sharpness_level = cpi->oxcf.sharpness; if (cpi->initial_width) { // Increasing the size of the frame beyond the first seen frame, or some @@ -838,10 +835,6 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9_CONFIG *oxcf) { cpi->speed = abs(cpi->oxcf.cpu_used); - // Limit on lag buffers as these are not currently dynamically allocated. - if (cpi->oxcf.lag_in_frames > MAX_LAG_BUFFERS) - cpi->oxcf.lag_in_frames = MAX_LAG_BUFFERS; - #if CONFIG_MULTIPLE_ARF vp9_zero(cpi->alt_ref_source); #else |