diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-04-09 10:25:59 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-09 10:25:59 -0700 |
| commit | a30ff3458dc2b7017ed9a5f1ce9132564ccc15dd (patch) | |
| tree | 4ef688cd65420abfa5c28337258db13413002aed /vp9 | |
| parent | ae6485663a34dae40ce907463bcd268494b51bfd (diff) | |
| parent | 5db5154029071b9c611432db246ade4d507d15b5 (diff) | |
| download | libvpx-a30ff3458dc2b7017ed9a5f1ce9132564ccc15dd.tar libvpx-a30ff3458dc2b7017ed9a5f1ce9132564ccc15dd.tar.gz libvpx-a30ff3458dc2b7017ed9a5f1ce9132564ccc15dd.tar.bz2 libvpx-a30ff3458dc2b7017ed9a5f1ce9132564ccc15dd.zip | |
Merge "Applying q_trans[] inside set_encoder_config()."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_svc_layercontext.c | 12 | ||||
| -rw-r--r-- | vp9/vp9_cx_iface.c | 6 |
3 files changed, 9 insertions, 13 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index f7ee56529..67df43515 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -828,10 +828,6 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9_CONFIG *oxcf) { break; } - cpi->oxcf.worst_allowed_q = q_trans[oxcf->worst_allowed_q]; - cpi->oxcf.best_allowed_q = q_trans[oxcf->best_allowed_q]; - cpi->oxcf.cq_level = q_trans[cpi->oxcf.cq_level]; - cpi->oxcf.lossless = oxcf->lossless; if (cpi->oxcf.lossless) { // In lossless mode, make sure right quantizer range and correct transform diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index caa0ec0e3..4cae75300 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -32,8 +32,8 @@ void vp9_init_layer_context(VP9_COMP *const cpi) { LAYER_CONTEXT *const lc = &svc->layer_context[layer]; RATE_CONTROL *const lrc = &lc->rc; lc->current_video_frame_in_layer = 0; - lrc->avg_frame_qindex[INTER_FRAME] = q_trans[oxcf->worst_allowed_q]; - lrc->ni_av_qi = q_trans[oxcf->worst_allowed_q]; + lrc->avg_frame_qindex[INTER_FRAME] = oxcf->worst_allowed_q; + lrc->ni_av_qi = oxcf->worst_allowed_q; lrc->total_actual_bits = 0; lrc->total_target_vs_actual = 0; lrc->ni_tot_qi = 0; @@ -47,12 +47,12 @@ void vp9_init_layer_context(VP9_COMP *const cpi) { if (svc->number_temporal_layers > 1) { lc->target_bandwidth = oxcf->ts_target_bitrate[layer] * 1000; - lrc->last_q[INTER_FRAME] = q_trans[oxcf->worst_allowed_q]; + lrc->last_q[INTER_FRAME] = oxcf->worst_allowed_q; } else { lc->target_bandwidth = oxcf->ss_target_bitrate[layer] * 1000; - lrc->last_q[0] = q_trans[oxcf->best_allowed_q]; - lrc->last_q[1] = q_trans[oxcf->best_allowed_q]; - lrc->last_q[2] = q_trans[oxcf->best_allowed_q]; + lrc->last_q[0] = oxcf->best_allowed_q; + lrc->last_q[1] = oxcf->best_allowed_q; + lrc->last_q[2] = oxcf->best_allowed_q; } lrc->buffer_level = vp9_rescale((int)(oxcf->starting_buffer_level), diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index 5b2645e99..152e1f46e 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -324,9 +324,9 @@ static vpx_codec_err_t set_encoder_config( oxcf->target_bandwidth = cfg->rc_target_bitrate; oxcf->rc_max_intra_bitrate_pct = extra_cfg->rc_max_intra_bitrate_pct; - oxcf->best_allowed_q = cfg->rc_min_quantizer; - oxcf->worst_allowed_q = cfg->rc_max_quantizer; - oxcf->cq_level = extra_cfg->cq_level; + oxcf->best_allowed_q = q_trans[cfg->rc_min_quantizer]; + oxcf->worst_allowed_q = q_trans[cfg->rc_max_quantizer]; + oxcf->cq_level = q_trans[extra_cfg->cq_level]; oxcf->fixed_q = -1; oxcf->under_shoot_pct = cfg->rc_undershoot_pct; |