diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-06-03 16:46:22 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-03 16:46:22 -0700 |
| commit | 3a1625614d5081fe587d8a0afabbdb35891a2044 (patch) | |
| tree | b3714a7dd1e1fc8f3cbaef346f656b7bd59bae80 /vp9/vp9_cx_iface.c | |
| parent | a808dfe3f2473032fd26eb3d9e1dc4d69970add4 (diff) | |
| parent | bd0bb363bd19113bdfe9d39d1209b7c77b251599 (diff) | |
| download | libvpx-3a1625614d5081fe587d8a0afabbdb35891a2044.tar libvpx-3a1625614d5081fe587d8a0afabbdb35891a2044.tar.gz libvpx-3a1625614d5081fe587d8a0afabbdb35891a2044.tar.bz2 libvpx-3a1625614d5081fe587d8a0afabbdb35891a2044.zip | |
Merge "Removing lossless field from VP9EncoderConfig."
Diffstat (limited to 'vp9/vp9_cx_iface.c')
| -rw-r--r-- | vp9/vp9_cx_iface.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index 96bdc3c93..72768e11e 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -331,8 +331,10 @@ static vpx_codec_err_t set_encoder_config( oxcf->target_bandwidth = 1000 * cfg->rc_target_bitrate; oxcf->rc_max_intra_bitrate_pct = extra_cfg->rc_max_intra_bitrate_pct; - oxcf->best_allowed_q = vp9_quantizer_to_qindex(cfg->rc_min_quantizer); - oxcf->worst_allowed_q = vp9_quantizer_to_qindex(cfg->rc_max_quantizer); + oxcf->best_allowed_q = + extra_cfg->lossless ? 0 : vp9_quantizer_to_qindex(cfg->rc_min_quantizer); + oxcf->worst_allowed_q = + extra_cfg->lossless ? 0 : vp9_quantizer_to_qindex(cfg->rc_max_quantizer); oxcf->cq_level = vp9_quantizer_to_qindex(extra_cfg->cq_level); oxcf->fixed_q = -1; @@ -376,8 +378,6 @@ static vpx_codec_err_t set_encoder_config( oxcf->tile_columns = extra_cfg->tile_columns; oxcf->tile_rows = extra_cfg->tile_rows; - oxcf->lossless = extra_cfg->lossless; - oxcf->error_resilient_mode = cfg->g_error_resilient; oxcf->frame_parallel_decoding_mode = extra_cfg->frame_parallel_decoding_mode; |