diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-30 10:19:48 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-30 10:19:48 -0700 |
| commit | 51a73fbba22e5446de93bc8044d8c408bb3c2254 (patch) | |
| tree | 36748296426a28a79df5e937016d6febbee55f0b /vp9/decoder/vp9_decodframe.c | |
| parent | e8315aeea07e0389ce412b2bf4ebe0c88be1c7c6 (diff) | |
| parent | 5a5a1f25a8e8b9dc4ef189661e57ea83f004347d (diff) | |
| download | libvpx-51a73fbba22e5446de93bc8044d8c408bb3c2254.tar libvpx-51a73fbba22e5446de93bc8044d8c408bb3c2254.tar.gz libvpx-51a73fbba22e5446de93bc8044d8c408bb3c2254.tar.bz2 libvpx-51a73fbba22e5446de93bc8044d8c408bb3c2254.zip | |
Merge "Consistent names for quant-related functions and variables." into experimental
Diffstat (limited to 'vp9/decoder/vp9_decodframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 27eb4b10f..6f8de3b4c 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -163,22 +163,20 @@ static vp9_prob read_prob_diff_update(vp9_reader *r, int oldp) { return (vp9_prob)inv_remap_prob(delp, oldp); } -void vp9_init_de_quantizer(VP9D_COMP *pbi) { - int i; - int q; - VP9_COMMON *const pc = &pbi->common; +void vp9_init_dequantizer(VP9_COMMON *pc) { + int q, i; for (q = 0; q < QINDEX_RANGE; q++) { // DC value - pc->y_dequant[q][0] = (int16_t)vp9_dc_quant(q, pc->y_dc_delta_q); - pc->uv_dequant[q][0] = (int16_t)vp9_dc_uv_quant(q, pc->uv_dc_delta_q); + pc->y_dequant[q][0] = vp9_dc_quant(q, pc->y_dc_delta_q); + pc->uv_dequant[q][0] = vp9_dc_quant(q, pc->uv_dc_delta_q); // AC values for (i = 1; i < 16; i++) { const int rc = vp9_default_zig_zag1d_4x4[i]; - pc->y_dequant[q][rc] = (int16_t)vp9_ac_yquant(q); - pc->uv_dequant[q][rc] = (int16_t)vp9_ac_uv_quant(q, pc->uv_ac_delta_q); + pc->y_dequant[q][rc] = vp9_ac_quant(q, 0); + pc->uv_dequant[q][rc] = vp9_ac_quant(q, pc->uv_ac_delta_q); } } } @@ -1041,7 +1039,7 @@ static void setup_quantization(VP9D_COMP *pbi, vp9_reader *r) { if (get_delta_q(r, &pc->y_dc_delta_q) | get_delta_q(r, &pc->uv_dc_delta_q) | get_delta_q(r, &pc->uv_ac_delta_q)) - vp9_init_de_quantizer(pbi); + vp9_init_dequantizer(pc); mb_init_dequantizer(pc, &pbi->mb); // MB level dequantizer setup } |