diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-02-28 10:49:35 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-28 10:49:35 -0800 |
| commit | 0429c08823633049c4654a9d0407e59879305410 (patch) | |
| tree | 7fea24eb93ee94b4c3798e5297da0aa7e980bfc9 /vp9/encoder/vp9_rdopt.c | |
| parent | 9d0d6d1945d69af9d8376a6c3e65340a79a70052 (diff) | |
| parent | 9004091e8c44db3e7796fd3a5f0f3aaed02d7f42 (diff) | |
| download | libvpx-0429c08823633049c4654a9d0407e59879305410.tar libvpx-0429c08823633049c4654a9d0407e59879305410.tar.gz libvpx-0429c08823633049c4654a9d0407e59879305410.tar.bz2 libvpx-0429c08823633049c4654a9d0407e59879305410.zip | |
Merge "Removing unnecessary clamp() call."
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 7cf1bdf06..5d8ae59ff 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -273,18 +273,12 @@ static void set_block_thresholds(VP9_COMP *cpi) { void vp9_initialize_rd_consts(VP9_COMP *cpi) { VP9_COMMON *cm = &cpi->common; MACROBLOCK *x = &cpi->mb; - int qindex, i; + int i; vp9_clear_system_state(); - // Further tests required to see if optimum is different - // for key frames, golden frames and arf frames. - // if (cpi->common.refresh_golden_frame || - // cpi->common.refresh_alt_ref_frame) - qindex = clamp(cm->base_qindex + cm->y_dc_delta_q, 0, MAXQ); - cpi->RDDIV = RDDIV_BITS; // in bits (to multiply D by 128) - cpi->RDMULT = vp9_compute_rd_mult(cpi, qindex); + cpi->RDMULT = vp9_compute_rd_mult(cpi, cm->base_qindex + cm->y_dc_delta_q); x->errorperbit = cpi->RDMULT / RD_MULT_EPB_RATIO; x->errorperbit += (x->errorperbit == 0); |