diff options
| author | Thomas Davies <thdavies@cisco.com> | 2017-08-09 14:26:53 +0100 |
|---|---|---|
| committer | Thomas Davies <thdavies@cisco.com> | 2017-08-15 08:32:09 +0000 |
| commit | 181fc08f068e193070dac0125d1ce05025bd4a5f (patch) | |
| tree | d4380b8f4f6b815a114282b53b6ee98762c685be /aom_dsp/quantize.h | |
| parent | 2cb52baf22d2eb89ec96af366150d251d57c506e (diff) | |
AOM_QM: enable by default
No change to metrics, as quantization matrices are not used
unless --enable-qm=1 is set on the command line.
Fix no highbitdepth compilation, and fix compile errors and
warnings for PVQ and NEW_QUANT experiments.
Change-Id: I49aceb5acf6ca6790c81e760e5b208788f87086d
Diffstat (limited to 'aom_dsp/quantize.h')
| -rw-r--r-- | aom_dsp/quantize.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/aom_dsp/quantize.h b/aom_dsp/quantize.h index e4bbfb94e..03609e8b4 100644 --- a/aom_dsp/quantize.h +++ b/aom_dsp/quantize.h @@ -36,6 +36,14 @@ void aom_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); +void highbd_quantize_b_helper_c( + const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, + const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, + tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan, const qm_val_t *qm_ptr, + const qm_val_t *iqm_ptr, const int log_scale); + #if CONFIG_HIGHBITDEPTH void aom_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, @@ -44,14 +52,6 @@ void aom_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); - -void highbd_quantize_b_helper_c( - const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, - const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, - const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, - const int16_t *scan, const int16_t *iscan, const qm_val_t *qm_ptr, - const qm_val_t *iqm_ptr, const int log_scale); #endif void aom_quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, int skip_block, |