diff options
Diffstat (limited to 'third_party/aom/av1/encoder/av1_quantize.c')
| -rw-r--r-- | third_party/aom/av1/encoder/av1_quantize.c | 1657 |
1 files changed, 332 insertions, 1325 deletions
diff --git a/third_party/aom/av1/encoder/av1_quantize.c b/third_party/aom/av1/encoder/av1_quantize.c index 033b4ba1a..1c5bdeb25 100644 --- a/third_party/aom/av1/encoder/av1_quantize.c +++ b/third_party/aom/av1/encoder/av1_quantize.c @@ -10,7 +10,9 @@ */ #include <math.h> -#include "./aom_dsp_rtcd.h" + +#include "config/aom_dsp_rtcd.h" + #include "aom_dsp/quantize.h" #include "aom_mem/aom_mem.h" #include "aom_ports/mem.h" @@ -24,413 +26,6 @@ #include "av1/encoder/encoder.h" #include "av1/encoder/rd.h" -#if CONFIG_NEW_QUANT -static INLINE int quantize_coeff_nuq( - const tran_low_t coeffv, const int16_t quant, const int16_t quant_shift, - const int16_t dequant, const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr) { - const int coeff = coeffv; - const int coeff_sign = (coeff >> 31); - const int abs_coeff = (coeff ^ coeff_sign) - coeff_sign; - int i, q; - int tmp = clamp(abs_coeff, INT16_MIN, INT16_MAX); - for (i = 0; i < NUQ_KNOTS; i++) { - if (tmp < cuml_bins_ptr[i]) { - q = i; - break; - } - } - if (i == NUQ_KNOTS) { - tmp -= cuml_bins_ptr[NUQ_KNOTS - 1]; - q = NUQ_KNOTS + (((((tmp * quant) >> 16) + tmp) * quant_shift) >> 16); - } - if (q) { - *dqcoeff_ptr = av1_dequant_abscoeff_nuq(q, dequant, dequant_val); - *qcoeff_ptr = (q ^ coeff_sign) - coeff_sign; - *dqcoeff_ptr = *qcoeff_ptr < 0 ? -*dqcoeff_ptr : *dqcoeff_ptr; - } else { - *qcoeff_ptr = 0; - *dqcoeff_ptr = 0; - } - return (q != 0); -} - -static INLINE int quantize_coeff_bigtx_nuq( - const tran_low_t coeffv, const int16_t quant, const int16_t quant_shift, - const int16_t dequant, const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr, int logsizeby16) { - const int coeff = coeffv; - const int coeff_sign = (coeff >> 31); - const int abs_coeff = (coeff ^ coeff_sign) - coeff_sign; - int i, q; - int tmp = clamp(abs_coeff, INT16_MIN, INT16_MAX); - for (i = 0; i < NUQ_KNOTS; i++) { - if (tmp < ROUND_POWER_OF_TWO(cuml_bins_ptr[i], logsizeby16)) { - q = i; - break; - } - } - if (i == NUQ_KNOTS) { - tmp -= ROUND_POWER_OF_TWO(cuml_bins_ptr[NUQ_KNOTS - 1], logsizeby16); - q = NUQ_KNOTS + - (((((tmp * quant) >> 16) + tmp) * quant_shift) >> (16 - logsizeby16)); - } - if (q) { - *dqcoeff_ptr = ROUND_POWER_OF_TWO( - av1_dequant_abscoeff_nuq(q, dequant, dequant_val), logsizeby16); - // *dqcoeff_ptr = av1_dequant_abscoeff_nuq(q, dequant, dequant_val) >> - // (logsizeby16); - *qcoeff_ptr = (q ^ coeff_sign) - coeff_sign; - *dqcoeff_ptr = *qcoeff_ptr < 0 ? -*dqcoeff_ptr : *dqcoeff_ptr; - } else { - *qcoeff_ptr = 0; - *dqcoeff_ptr = 0; - } - return (q != 0); -} - -static INLINE int quantize_coeff_fp_nuq( - const tran_low_t coeffv, const int16_t quant, const int16_t dequant, - const tran_low_t *cuml_bins_ptr, const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr) { - const int coeff = coeffv; - const int coeff_sign = (coeff >> 31); - const int abs_coeff = (coeff ^ coeff_sign) - coeff_sign; - int i, q; - int tmp = clamp(abs_coeff, INT16_MIN, INT16_MAX); - for (i = 0; i < NUQ_KNOTS; i++) { - if (tmp < cuml_bins_ptr[i]) { - q = i; - break; - } - } - if (i == NUQ_KNOTS) { - q = NUQ_KNOTS + - ((((int64_t)tmp - cuml_bins_ptr[NUQ_KNOTS - 1]) * quant) >> 16); - } - if (q) { - *dqcoeff_ptr = av1_dequant_abscoeff_nuq(q, dequant, dequant_val); - *qcoeff_ptr = (q ^ coeff_sign) - coeff_sign; - *dqcoeff_ptr = *qcoeff_ptr < 0 ? -*dqcoeff_ptr : *dqcoeff_ptr; - } else { - *qcoeff_ptr = 0; - *dqcoeff_ptr = 0; - } - return (q != 0); -} - -static INLINE int quantize_coeff_bigtx_fp_nuq( - const tran_low_t coeffv, const int16_t quant, const int16_t dequant, - const tran_low_t *cuml_bins_ptr, const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, int logsizeby16) { - const int coeff = coeffv; - const int coeff_sign = (coeff >> 31); - const int abs_coeff = (coeff ^ coeff_sign) - coeff_sign; - int i, q; - int tmp = clamp(abs_coeff, INT16_MIN, INT16_MAX); - for (i = 0; i < NUQ_KNOTS; i++) { - if (tmp < ROUND_POWER_OF_TWO(cuml_bins_ptr[i], logsizeby16)) { - q = i; - break; - } - } - if (i == NUQ_KNOTS) { - q = NUQ_KNOTS + - ((((int64_t)tmp - - ROUND_POWER_OF_TWO(cuml_bins_ptr[NUQ_KNOTS - 1], logsizeby16)) * - quant) >> - (16 - logsizeby16)); - } - if (q) { - *dqcoeff_ptr = ROUND_POWER_OF_TWO( - av1_dequant_abscoeff_nuq(q, dequant, dequant_val), logsizeby16); - // *dqcoeff_ptr = av1_dequant_abscoeff_nuq(q, dequant, dequant_val) >> - // (logsizeby16); - *qcoeff_ptr = (q ^ coeff_sign) - coeff_sign; - *dqcoeff_ptr = *qcoeff_ptr < 0 ? -*dqcoeff_ptr : *dqcoeff_ptr; - } else { - *qcoeff_ptr = 0; - *dqcoeff_ptr = 0; - } - return (q != 0); -} - -void quantize_dc_nuq(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t quant, - const int16_t quant_shift, const int16_t dequant, - const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (quantize_coeff_nuq(coeff_ptr[rc], quant, quant_shift, dequant, - cuml_bins_ptr, dequant_val, qcoeff_ptr, dqcoeff_ptr)) - eob = 0; - } - *eob_ptr = eob + 1; -} - -void quantize_dc_fp_nuq(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t quant, - const int16_t dequant, const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (quantize_coeff_fp_nuq(coeff_ptr[rc], quant, dequant, cuml_bins_ptr, - dequant_val, qcoeff_ptr, dqcoeff_ptr)) - eob = 0; - } - *eob_ptr = eob + 1; -} - -void quantize_dc_32x32_nuq(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t quant, - const int16_t quant_shift, const int16_t dequant, - const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant, quant_shift, dequant, - cuml_bins_ptr, dequant_val, qcoeff_ptr, - dqcoeff_ptr, av1_get_tx_scale(TX_32X32))) - eob = 0; - } - *eob_ptr = eob + 1; -} - -void quantize_dc_32x32_fp_nuq(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t quant, - const int16_t dequant, - const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (quantize_coeff_bigtx_fp_nuq(coeff_ptr[rc], quant, dequant, - cuml_bins_ptr, dequant_val, qcoeff_ptr, - dqcoeff_ptr, av1_get_tx_scale(TX_32X32))) - eob = 0; - } - *eob_ptr = eob + 1; -} - -#if CONFIG_TX64X64 -void quantize_dc_64x64_nuq(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t quant, - const int16_t quant_shift, const int16_t dequant, - const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant, quant_shift, dequant, - cuml_bins_ptr, dequant_val, qcoeff_ptr, - dqcoeff_ptr, av1_get_tx_scale(TX_64X64))) - eob = 0; - } - *eob_ptr = eob + 1; -} - -void quantize_dc_64x64_fp_nuq(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t quant, - const int16_t dequant, - const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (quantize_coeff_bigtx_fp_nuq(coeff_ptr[rc], quant, dequant, - cuml_bins_ptr, dequant_val, qcoeff_ptr, - dqcoeff_ptr, av1_get_tx_scale(TX_64X64))) - eob = 0; - } - *eob_ptr = eob + 1; -} -#endif // CONFIG_TX64X64 - -void quantize_nuq_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t *quant_ptr, - const int16_t *quant_shift_ptr, const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr, const int16_t *scan, - const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (quantize_coeff_nuq(coeff_ptr[rc], quant_ptr[rc != 0], - quant_shift_ptr[rc != 0], dequant_ptr[rc != 0], - cuml_bins_ptr[band[i]], dequant_val[band[i]], - &qcoeff_ptr[rc], &dqcoeff_ptr[rc])) - eob = i; - } - } - *eob_ptr = eob + 1; -} - -void quantize_fp_nuq_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t *quant_ptr, - const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr, const int16_t *scan, - const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (quantize_coeff_fp_nuq(coeff_ptr[rc], quant_ptr[rc != 0], - dequant_ptr[rc != 0], cuml_bins_ptr[band[i]], - dequant_val[band[i]], &qcoeff_ptr[rc], - &dqcoeff_ptr[rc])) - eob = i; - } - } - *eob_ptr = eob + 1; -} - -void quantize_32x32_nuq_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t *quant_ptr, - const int16_t *quant_shift_ptr, - const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr, const int16_t *scan, - const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (quantize_coeff_bigtx_nuq( - coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0], - dequant_ptr[rc != 0], cuml_bins_ptr[band[i]], - dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc], - av1_get_tx_scale(TX_32X32))) - eob = i; - } - } - *eob_ptr = eob + 1; -} - -void quantize_32x32_fp_nuq_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t *quant_ptr, - const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr, const int16_t *scan, - const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (quantize_coeff_bigtx_fp_nuq( - coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0], - cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc], - &dqcoeff_ptr[rc], av1_get_tx_scale(TX_32X32))) - eob = i; - } - } - *eob_ptr = eob + 1; -} - -#if CONFIG_TX64X64 -void quantize_64x64_nuq_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t *quant_ptr, - const int16_t *quant_shift_ptr, - const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr, const int16_t *scan, - const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (quantize_coeff_bigtx_nuq( - coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0], - dequant_ptr[rc != 0], cuml_bins_ptr[band[i]], - dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc], - av1_get_tx_scale(TX_64X64))) - eob = i; - } - } - *eob_ptr = eob + 1; -} - -void quantize_64x64_fp_nuq_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t *quant_ptr, - const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr, const int16_t *scan, - const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (quantize_coeff_bigtx_fp_nuq( - coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0], - cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc], - &dqcoeff_ptr[rc], av1_get_tx_scale(TX_64X64))) - eob = i; - } - } - *eob_ptr = eob + 1; -} -#endif // CONFIG_TX64X64 -#endif // CONFIG_NEW_QUANT - void av1_quantize_skip(intptr_t n_coeffs, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr) { memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); @@ -439,8 +34,8 @@ void av1_quantize_skip(intptr_t n_coeffs, tran_low_t *qcoeff_ptr, } static void quantize_fp_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 tran_low_t *coeff_ptr, intptr_t n_coeffs, 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, @@ -450,12 +45,45 @@ static void quantize_fp_helper_c( // quantization process is completed. (void)zbin_ptr; (void)quant_shift_ptr; - (void)iscan; memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { + if (qm_ptr == NULL && iqm_ptr == NULL) { + const int rounding0 = ROUND_POWER_OF_TWO(round_ptr[0], log_scale); + { // rc == 0 + const int coeff = coeff_ptr[0]; + const int coeff_sign = (coeff >> 31); + int64_t abs_coeff = (coeff ^ coeff_sign) - coeff_sign; + if ((abs_coeff << (1 + log_scale)) >= (int32_t)(dequant_ptr[0])) { + abs_coeff = clamp64(abs_coeff + rounding0, INT16_MIN, INT16_MAX); + const int tmp32 = (int)((abs_coeff * quant_ptr[0]) >> (16 - log_scale)); + if (tmp32) { + qcoeff_ptr[0] = (tmp32 ^ coeff_sign) - coeff_sign; + const tran_low_t abs_dqcoeff = (tmp32 * dequant_ptr[0]) >> log_scale; + dqcoeff_ptr[0] = (abs_dqcoeff ^ coeff_sign) - coeff_sign; + eob = 0; + } + } + } + const int rounding1 = ROUND_POWER_OF_TWO(round_ptr[1], log_scale); + const int32_t thresh1 = (int32_t)(dequant_ptr[1]); + for (i = 1; i < n_coeffs; i++) { + const int coeff = coeff_ptr[i]; + const int coeff_sign = (coeff >> 31); + int64_t abs_coeff = (coeff ^ coeff_sign) - coeff_sign; + if ((abs_coeff << (1 + log_scale)) >= thresh1) { + abs_coeff = clamp64(abs_coeff + rounding1, INT16_MIN, INT16_MAX); + const int tmp32 = (int)((abs_coeff * quant_ptr[1]) >> (16 - log_scale)); + if (tmp32) { + qcoeff_ptr[i] = (tmp32 ^ coeff_sign) - coeff_sign; + const tran_low_t abs_dqcoeff = (tmp32 * dequant_ptr[1]) >> log_scale; + dqcoeff_ptr[i] = (abs_dqcoeff ^ coeff_sign) - coeff_sign; + eob = AOMMAX(iscan[i], eob); + } + } + } + } else { // Quantization pass: All coefficients with index >= zero_flag are // skippable. Note: zero_flag can be zero. for (i = 0; i < n_coeffs; i++) { @@ -476,7 +104,8 @@ static void quantize_fp_helper_c( tmp32 = (int)((abs_coeff * wt * quant_ptr[rc != 0]) >> (16 - log_scale + AOM_QM_BITS)); qcoeff_ptr[rc] = (tmp32 ^ coeff_sign) - coeff_sign; - dqcoeff_ptr[rc] = qcoeff_ptr[rc] * dequant / (1 << log_scale); + const tran_low_t abs_dqcoeff = (tmp32 * dequant) >> log_scale; + dqcoeff_ptr[rc] = (abs_dqcoeff ^ coeff_sign) - coeff_sign; } if (tmp32) eob = i; @@ -486,15 +115,14 @@ static void quantize_fp_helper_c( } static void highbd_quantize_fp_helper_c( - const tran_low_t *coeff_ptr, intptr_t count, int skip_block, - const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, + const tran_low_t *coeff_ptr, intptr_t count, 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, int log_scale) { int i; int eob = -1; - const int scale = 1 << log_scale; const int shift = 16 - log_scale; // TODO(jingning) Decide the need of these arguments after the // quantization process is completed. @@ -502,10 +130,7 @@ static void highbd_quantize_fp_helper_c( (void)quant_shift_ptr; (void)iscan; - memset(qcoeff_ptr, 0, count * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, count * sizeof(*dqcoeff_ptr)); - - if (!skip_block) { + if (qm_ptr || iqm_ptr) { // Quantization pass: All coefficients with index >= zero_flag are // skippable. Note: zero_flag can be zero. for (i = 0; i < count; i++) { @@ -517,150 +142,170 @@ static void highbd_quantize_fp_helper_c( (dequant_ptr[rc != 0] * iwt + (1 << (AOM_QM_BITS - 1))) >> AOM_QM_BITS; const int coeff_sign = (coeff >> 31); + const int64_t abs_coeff = (coeff ^ coeff_sign) - coeff_sign; + int abs_qcoeff = 0; + if (abs_coeff * wt >= + (dequant_ptr[rc != 0] << (AOM_QM_BITS - (1 + log_scale)))) { + const int64_t tmp = + abs_coeff + ROUND_POWER_OF_TWO(round_ptr[rc != 0], log_scale); + abs_qcoeff = + (int)((tmp * quant_ptr[rc != 0] * wt) >> (shift + AOM_QM_BITS)); + qcoeff_ptr[rc] = (tran_low_t)((abs_qcoeff ^ coeff_sign) - coeff_sign); + const tran_low_t abs_dqcoeff = (abs_qcoeff * dequant) >> log_scale; + dqcoeff_ptr[rc] = (tran_low_t)((abs_dqcoeff ^ coeff_sign) - coeff_sign); + if (abs_qcoeff) eob = i; + } else { + qcoeff_ptr[rc] = 0; + dqcoeff_ptr[rc] = 0; + } + } + } else { + const int log_scaled_round_arr[2] = { + ROUND_POWER_OF_TWO(round_ptr[0], log_scale), + ROUND_POWER_OF_TWO(round_ptr[1], log_scale), + }; + for (i = 0; i < count; i++) { + const int rc = scan[i]; + const int coeff = coeff_ptr[rc]; + const int rc01 = (rc != 0); + const int coeff_sign = (coeff >> 31); const int abs_coeff = (coeff ^ coeff_sign) - coeff_sign; - const int64_t tmp = abs_coeff + (round_ptr[rc != 0] >> log_scale); - const int abs_qcoeff = - (int)((tmp * quant_ptr[rc != 0] * wt) >> (shift + AOM_QM_BITS)); - qcoeff_ptr[rc] = (tran_low_t)((abs_qcoeff ^ coeff_sign) - coeff_sign); - dqcoeff_ptr[rc] = qcoeff_ptr[rc] * dequant / scale; - if (abs_qcoeff) eob = i; + const int log_scaled_round = log_scaled_round_arr[rc01]; + if ((abs_coeff << (1 + log_scale)) >= dequant_ptr[rc01]) { + const int quant = quant_ptr[rc01]; + const int dequant = dequant_ptr[rc01]; + const int64_t tmp = (int64_t)abs_coeff + log_scaled_round; + const int abs_qcoeff = (int)((tmp * quant) >> shift); + qcoeff_ptr[rc] = (tran_low_t)((abs_qcoeff ^ coeff_sign) - coeff_sign); + const tran_low_t abs_dqcoeff = (abs_qcoeff * dequant) >> log_scale; + if (abs_qcoeff) eob = i; + dqcoeff_ptr[rc] = (tran_low_t)((abs_dqcoeff ^ coeff_sign) - coeff_sign); + } else { + qcoeff_ptr[rc] = 0; + dqcoeff_ptr[rc] = 0; + } } } *eob_ptr = eob + 1; } void av1_quantize_fp_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) { - quantize_fp_helper_c(coeff_ptr, n_coeffs, skip_block, zbin_ptr, round_ptr, - quant_ptr, quant_shift_ptr, qcoeff_ptr, dqcoeff_ptr, - dequant_ptr, eob_ptr, scan, iscan, NULL, NULL, 0); + 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) { + quantize_fp_helper_c(coeff_ptr, n_coeffs, zbin_ptr, round_ptr, quant_ptr, + quant_shift_ptr, qcoeff_ptr, dqcoeff_ptr, dequant_ptr, + eob_ptr, scan, iscan, NULL, NULL, 0); } void av1_quantize_fp_32x32_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 *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) { - quantize_fp_helper_c(coeff_ptr, n_coeffs, skip_block, zbin_ptr, round_ptr, - quant_ptr, quant_shift_ptr, qcoeff_ptr, dqcoeff_ptr, - dequant_ptr, eob_ptr, scan, iscan, NULL, NULL, 1); + quantize_fp_helper_c(coeff_ptr, n_coeffs, zbin_ptr, round_ptr, quant_ptr, + quant_shift_ptr, qcoeff_ptr, dqcoeff_ptr, dequant_ptr, + eob_ptr, scan, iscan, NULL, NULL, 1); } -#if CONFIG_TX64X64 void av1_quantize_fp_64x64_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 *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) { - quantize_fp_helper_c(coeff_ptr, n_coeffs, skip_block, zbin_ptr, round_ptr, - quant_ptr, quant_shift_ptr, qcoeff_ptr, dqcoeff_ptr, - dequant_ptr, eob_ptr, scan, iscan, NULL, NULL, 2); + quantize_fp_helper_c(coeff_ptr, n_coeffs, zbin_ptr, round_ptr, quant_ptr, + quant_shift_ptr, qcoeff_ptr, dqcoeff_ptr, dequant_ptr, + eob_ptr, scan, iscan, NULL, NULL, 2); } -#endif // CONFIG_TX64X64 void av1_quantize_fp_facade(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const MACROBLOCK_PLANE *p, tran_low_t *qcoeff_ptr, - const MACROBLOCKD_PLANE *pd, tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, const SCAN_ORDER *sc, const QUANT_PARAM *qparam) { - // obsolete skip_block - const int skip_block = 0; -#if CONFIG_AOM_QM const qm_val_t *qm_ptr = qparam->qmatrix; const qm_val_t *iqm_ptr = qparam->iqmatrix; if (qm_ptr != NULL && iqm_ptr != NULL) { - quantize_fp_helper_c(coeff_ptr, n_coeffs, skip_block, p->zbin, p->round_fp, - p->quant_fp, p->quant_shift, qcoeff_ptr, dqcoeff_ptr, - pd->dequant, eob_ptr, sc->scan, sc->iscan, qm_ptr, - iqm_ptr, qparam->log_scale); + quantize_fp_helper_c(coeff_ptr, n_coeffs, p->zbin_QTX, p->round_fp_QTX, + p->quant_fp_QTX, p->quant_shift_QTX, qcoeff_ptr, + dqcoeff_ptr, p->dequant_QTX, eob_ptr, sc->scan, + sc->iscan, qm_ptr, iqm_ptr, qparam->log_scale); } else { -#endif switch (qparam->log_scale) { case 0: if (n_coeffs < 16) { // TODO(jingning): Need SIMD implementation for smaller block size // quantization. quantize_fp_helper_c( - coeff_ptr, n_coeffs, skip_block, p->zbin, p->round_fp, - p->quant_fp, p->quant_shift, qcoeff_ptr, dqcoeff_ptr, pd->dequant, - eob_ptr, sc->scan, sc->iscan, NULL, NULL, qparam->log_scale); + coeff_ptr, n_coeffs, p->zbin_QTX, p->round_fp_QTX, + p->quant_fp_QTX, p->quant_shift_QTX, qcoeff_ptr, dqcoeff_ptr, + p->dequant_QTX, eob_ptr, sc->scan, sc->iscan, NULL, NULL, 0); } else { - av1_quantize_fp(coeff_ptr, n_coeffs, skip_block, p->zbin, p->round_fp, - p->quant_fp, p->quant_shift, qcoeff_ptr, dqcoeff_ptr, - pd->dequant, eob_ptr, sc->scan, sc->iscan); + av1_quantize_fp(coeff_ptr, n_coeffs, p->zbin_QTX, p->round_fp_QTX, + p->quant_fp_QTX, p->quant_shift_QTX, qcoeff_ptr, + dqcoeff_ptr, p->dequant_QTX, eob_ptr, sc->scan, + sc->iscan); } break; case 1: - av1_quantize_fp_32x32(coeff_ptr, n_coeffs, skip_block, p->zbin, - p->round_fp, p->quant_fp, p->quant_shift, - qcoeff_ptr, dqcoeff_ptr, pd->dequant, eob_ptr, - sc->scan, sc->iscan); + av1_quantize_fp_32x32(coeff_ptr, n_coeffs, p->zbin_QTX, p->round_fp_QTX, + p->quant_fp_QTX, p->quant_shift_QTX, qcoeff_ptr, + dqcoeff_ptr, p->dequant_QTX, eob_ptr, sc->scan, + sc->iscan); break; -#if CONFIG_TX64X64 case 2: - av1_quantize_fp_64x64(coeff_ptr, n_coeffs, skip_block, p->zbin, - p->round_fp, p->quant_fp, p->quant_shift, - qcoeff_ptr, dqcoeff_ptr, pd->dequant, eob_ptr, - sc->scan, sc->iscan); + av1_quantize_fp_64x64(coeff_ptr, n_coeffs, p->zbin_QTX, p->round_fp_QTX, + p->quant_fp_QTX, p->quant_shift_QTX, qcoeff_ptr, + dqcoeff_ptr, p->dequant_QTX, eob_ptr, sc->scan, + sc->iscan); break; -#endif // CONFIG_TX64X64 default: assert(0); } -#if CONFIG_AOM_QM } -#endif } void av1_quantize_b_facade(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const MACROBLOCK_PLANE *p, tran_low_t *qcoeff_ptr, - const MACROBLOCKD_PLANE *pd, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr, const SCAN_ORDER *sc, - const QUANT_PARAM *qparam) { + tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, + const SCAN_ORDER *sc, const QUANT_PARAM *qparam) { // obsolete skip_block const int skip_block = 0; -#if CONFIG_AOM_QM const qm_val_t *qm_ptr = qparam->qmatrix; const qm_val_t *iqm_ptr = qparam->iqmatrix; if (qm_ptr != NULL && iqm_ptr != NULL) { - quantize_b_helper_c(coeff_ptr, n_coeffs, skip_block, p->zbin, p->round, - p->quant, p->quant_shift, qcoeff_ptr, dqcoeff_ptr, - pd->dequant, eob_ptr, sc->scan, sc->iscan, qm_ptr, - iqm_ptr, qparam->log_scale); + quantize_b_helper_c(coeff_ptr, n_coeffs, skip_block, p->zbin_QTX, + p->round_QTX, p->quant_QTX, p->quant_shift_QTX, + qcoeff_ptr, dqcoeff_ptr, p->dequant_QTX, eob_ptr, + sc->scan, sc->iscan, qm_ptr, iqm_ptr, + qparam->log_scale); } else { -#endif // CONFIG_AOM_QM - switch (qparam->log_scale) { case 0: - aom_quantize_b(coeff_ptr, n_coeffs, skip_block, p->zbin, p->round, - p->quant, p->quant_shift, qcoeff_ptr, dqcoeff_ptr, - pd->dequant, eob_ptr, sc->scan, sc->iscan); + aom_quantize_b(coeff_ptr, n_coeffs, skip_block, p->zbin_QTX, + p->round_QTX, p->quant_QTX, p->quant_shift_QTX, + qcoeff_ptr, dqcoeff_ptr, p->dequant_QTX, eob_ptr, + sc->scan, sc->iscan); break; case 1: - aom_quantize_b_32x32(coeff_ptr, n_coeffs, skip_block, p->zbin, p->round, - p->quant, p->quant_shift, qcoeff_ptr, dqcoeff_ptr, - pd->dequant, eob_ptr, sc->scan, sc->iscan); + aom_quantize_b_32x32(coeff_ptr, n_coeffs, skip_block, p->zbin_QTX, + p->round_QTX, p->quant_QTX, p->quant_shift_QTX, + qcoeff_ptr, dqcoeff_ptr, p->dequant_QTX, eob_ptr, + sc->scan, sc->iscan); break; -#if CONFIG_TX64X64 case 2: - aom_quantize_b_64x64(coeff_ptr, n_coeffs, skip_block, p->zbin, p->round, - p->quant, p->quant_shift, qcoeff_ptr, dqcoeff_ptr, - pd->dequant, eob_ptr, sc->scan, sc->iscan); + aom_quantize_b_64x64(coeff_ptr, n_coeffs, skip_block, p->zbin_QTX, + p->round_QTX, p->quant_QTX, p->quant_shift_QTX, + qcoeff_ptr, dqcoeff_ptr, p->dequant_QTX, eob_ptr, + sc->scan, sc->iscan); break; -#endif // CONFIG_TX64X64 default: assert(0); } -#if CONFIG_AOM_QM } -#endif } static void quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, @@ -689,7 +334,8 @@ static void quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, tmp32 = (int32_t)((tmp * wt * quant) >> (16 - log_scale + AOM_QM_BITS)); qcoeff_ptr[rc] = (tmp32 ^ coeff_sign) - coeff_sign; dequant = (dequant_ptr * iwt + (1 << (AOM_QM_BITS - 1))) >> AOM_QM_BITS; - dqcoeff_ptr[rc] = (qcoeff_ptr[rc] * dequant) / (1 << log_scale); + const tran_low_t abs_dqcoeff = (tmp32 * dequant) >> log_scale; + dqcoeff_ptr[rc] = (tran_low_t)((abs_dqcoeff ^ coeff_sign) - coeff_sign); if (tmp32) eob = 0; } *eob_ptr = eob + 1; @@ -697,237 +343,97 @@ static void quantize_dc(const tran_low_t *coeff_ptr, int n_coeffs, void av1_quantize_dc_facade(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const MACROBLOCK_PLANE *p, tran_low_t *qcoeff_ptr, - const MACROBLOCKD_PLANE *pd, tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, const SCAN_ORDER *sc, const QUANT_PARAM *qparam) { // obsolete skip_block const int skip_block = 0; (void)sc; - assert(qparam->log_scale >= 0 && qparam->log_scale < (2 + CONFIG_TX64X64)); -#if CONFIG_AOM_QM + assert(qparam->log_scale >= 0 && qparam->log_scale < (3)); const qm_val_t *qm_ptr = qparam->qmatrix; const qm_val_t *iqm_ptr = qparam->iqmatrix; -#else - const qm_val_t *qm_ptr = NULL; - const qm_val_t *iqm_ptr = NULL; -#endif - quantize_dc(coeff_ptr, (int)n_coeffs, skip_block, p->round, p->quant_fp[0], - qcoeff_ptr, dqcoeff_ptr, pd->dequant[0], eob_ptr, qm_ptr, iqm_ptr, - qparam->log_scale); -} - -#if CONFIG_NEW_QUANT -void av1_quantize_b_nuq_facade(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - const MACROBLOCK_PLANE *p, - tran_low_t *qcoeff_ptr, - const MACROBLOCKD_PLANE *pd, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, - const SCAN_ORDER *sc, - const QUANT_PARAM *qparam) { - // obsolete skip_block - const int skip_block = 0; - const uint8_t *band = get_band_translate(qparam->tx_size); - int dq = qparam->dq; - - switch (qparam->log_scale) { - case 0: - quantize_nuq(coeff_ptr, n_coeffs, skip_block, p->quant, p->quant_shift, - pd->dequant, - (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], - qcoeff_ptr, dqcoeff_ptr, eob_ptr, sc->scan, band); - break; - case 1: - quantize_32x32_nuq(coeff_ptr, n_coeffs, skip_block, p->quant, - p->quant_shift, pd->dequant, - (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], - qcoeff_ptr, dqcoeff_ptr, eob_ptr, sc->scan, band); - break; -#if CONFIG_TX64X64 - case 2: - quantize_64x64_nuq(coeff_ptr, n_coeffs, skip_block, p->quant, - p->quant_shift, pd->dequant, - (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], - qcoeff_ptr, dqcoeff_ptr, eob_ptr, sc->scan, band); - break; -#endif // CONFIG_TX64X64 - default: assert(0); - } -} - -void av1_quantize_fp_nuq_facade(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - const MACROBLOCK_PLANE *p, - tran_low_t *qcoeff_ptr, - const MACROBLOCKD_PLANE *pd, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, - const SCAN_ORDER *sc, - const QUANT_PARAM *qparam) { - // obsolete skip_block - const int skip_block = 0; - const uint8_t *band = get_band_translate(qparam->tx_size); - int dq = qparam->dq; - - switch (qparam->log_scale) { - case 0: - quantize_fp_nuq(coeff_ptr, n_coeffs, skip_block, p->quant_fp, pd->dequant, - (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], - qcoeff_ptr, dqcoeff_ptr, eob_ptr, sc->scan, band); - break; - case 1: - quantize_32x32_fp_nuq( - coeff_ptr, n_coeffs, skip_block, p->quant_fp, pd->dequant, - (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], qcoeff_ptr, - dqcoeff_ptr, eob_ptr, sc->scan, band); - break; -#if CONFIG_TX64X64 - case 2: - quantize_64x64_fp_nuq( - coeff_ptr, n_coeffs, skip_block, p->quant_fp, pd->dequant, - (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], qcoeff_ptr, - dqcoeff_ptr, eob_ptr, sc->scan, band); - break; -#endif // CONFIG_TX64X64 - default: assert(0); - } + quantize_dc(coeff_ptr, (int)n_coeffs, skip_block, p->round_QTX, + p->quant_fp_QTX[0], qcoeff_ptr, dqcoeff_ptr, p->dequant_QTX[0], + eob_ptr, qm_ptr, iqm_ptr, qparam->log_scale); } -void av1_quantize_dc_nuq_facade(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - const MACROBLOCK_PLANE *p, - tran_low_t *qcoeff_ptr, - const MACROBLOCKD_PLANE *pd, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, - const SCAN_ORDER *sc, - const QUANT_PARAM *qparam) { - // obsolete skip_block - const int skip_block = 0; - int dq = qparam->dq; - (void)sc; - - switch (qparam->log_scale) { - case 0: - quantize_dc_fp_nuq(coeff_ptr, n_coeffs, skip_block, p->quant_fp[0], - pd->dequant[0], p->cuml_bins_nuq[dq][0], - pd->dequant_val_nuq[dq][0], qcoeff_ptr, dqcoeff_ptr, - eob_ptr); - break; - case 1: - quantize_dc_32x32_fp_nuq(coeff_ptr, n_coeffs, skip_block, p->quant_fp[0], - pd->dequant[0], p->cuml_bins_nuq[dq][0], - pd->dequant_val_nuq[dq][0], qcoeff_ptr, - dqcoeff_ptr, eob_ptr); - break; -#if CONFIG_TX64X64 - case 2: - quantize_dc_64x64_fp_nuq(coeff_ptr, n_coeffs, skip_block, p->quant_fp[0], - pd->dequant[0], p->cuml_bins_nuq[dq][0], - pd->dequant_val_nuq[dq][0], qcoeff_ptr, - dqcoeff_ptr, eob_ptr); - break; -#endif // CONFIG_TX64X64 - default: assert(0); - } -} -#endif // CONFIG_NEW_QUANT - void av1_highbd_quantize_fp_facade(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const MACROBLOCK_PLANE *p, tran_low_t *qcoeff_ptr, - const MACROBLOCKD_PLANE *pd, tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, const SCAN_ORDER *sc, const QUANT_PARAM *qparam) { - // obsolete skip_block - const int skip_block = 0; -#if CONFIG_AOM_QM const qm_val_t *qm_ptr = qparam->qmatrix; const qm_val_t *iqm_ptr = qparam->iqmatrix; if (qm_ptr != NULL && iqm_ptr != NULL) { highbd_quantize_fp_helper_c( - coeff_ptr, n_coeffs, skip_block, p->zbin, p->round_fp, p->quant_fp, - p->quant_shift, qcoeff_ptr, dqcoeff_ptr, pd->dequant, eob_ptr, sc->scan, - sc->iscan, qm_ptr, iqm_ptr, qparam->log_scale); + coeff_ptr, n_coeffs, p->zbin_QTX, p->round_fp_QTX, p->quant_fp_QTX, + p->quant_shift_QTX, qcoeff_ptr, dqcoeff_ptr, p->dequant_QTX, eob_ptr, + sc->scan, sc->iscan, qm_ptr, iqm_ptr, qparam->log_scale); } else { -#endif // CONFIG_AOM_QM - if (n_coeffs < 16) { // TODO(jingning): Need SIMD implementation for smaller block size // quantization. - av1_highbd_quantize_fp_c(coeff_ptr, n_coeffs, skip_block, p->zbin, - p->round_fp, p->quant_fp, p->quant_shift, - qcoeff_ptr, dqcoeff_ptr, pd->dequant, eob_ptr, - sc->scan, sc->iscan, qparam->log_scale); + av1_highbd_quantize_fp_c( + coeff_ptr, n_coeffs, p->zbin_QTX, p->round_fp_QTX, p->quant_fp_QTX, + p->quant_shift_QTX, qcoeff_ptr, dqcoeff_ptr, p->dequant_QTX, eob_ptr, + sc->scan, sc->iscan, qparam->log_scale); return; } - - av1_highbd_quantize_fp(coeff_ptr, n_coeffs, skip_block, p->zbin, - p->round_fp, p->quant_fp, p->quant_shift, qcoeff_ptr, - dqcoeff_ptr, pd->dequant, eob_ptr, sc->scan, + av1_highbd_quantize_fp(coeff_ptr, n_coeffs, p->zbin_QTX, p->round_fp_QTX, + p->quant_fp_QTX, p->quant_shift_QTX, qcoeff_ptr, + dqcoeff_ptr, p->dequant_QTX, eob_ptr, sc->scan, sc->iscan, qparam->log_scale); -#if CONFIG_AOM_QM } -#endif } void av1_highbd_quantize_b_facade(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const MACROBLOCK_PLANE *p, tran_low_t *qcoeff_ptr, - const MACROBLOCKD_PLANE *pd, tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, const SCAN_ORDER *sc, const QUANT_PARAM *qparam) { // obsolete skip_block const int skip_block = 0; -#if CONFIG_AOM_QM const qm_val_t *qm_ptr = qparam->qmatrix; const qm_val_t *iqm_ptr = qparam->iqmatrix; if (qm_ptr != NULL && iqm_ptr != NULL) { - highbd_quantize_b_helper_c(coeff_ptr, n_coeffs, skip_block, p->zbin, - p->round, p->quant, p->quant_shift, qcoeff_ptr, - dqcoeff_ptr, pd->dequant, eob_ptr, sc->scan, - sc->iscan, qm_ptr, iqm_ptr, qparam->log_scale); + highbd_quantize_b_helper_c(coeff_ptr, n_coeffs, skip_block, p->zbin_QTX, + p->round_QTX, p->quant_QTX, p->quant_shift_QTX, + qcoeff_ptr, dqcoeff_ptr, p->dequant_QTX, eob_ptr, + sc->scan, sc->iscan, qm_ptr, iqm_ptr, + qparam->log_scale); } else { -#endif // CONFIG_AOM_QM - switch (qparam->log_scale) { case 0: if (LIKELY(n_coeffs >= 8)) { - aom_highbd_quantize_b(coeff_ptr, n_coeffs, skip_block, p->zbin, - p->round, p->quant, p->quant_shift, qcoeff_ptr, - dqcoeff_ptr, pd->dequant, eob_ptr, sc->scan, - sc->iscan); + aom_highbd_quantize_b(coeff_ptr, n_coeffs, skip_block, p->zbin_QTX, + p->round_QTX, p->quant_QTX, p->quant_shift_QTX, + qcoeff_ptr, dqcoeff_ptr, p->dequant_QTX, + eob_ptr, sc->scan, sc->iscan); } else { // TODO(luoyi): Need SIMD (e.g. sse2) for smaller block size // quantization - aom_highbd_quantize_b_c(coeff_ptr, n_coeffs, skip_block, p->zbin, - p->round, p->quant, p->quant_shift, - qcoeff_ptr, dqcoeff_ptr, pd->dequant, eob_ptr, - sc->scan, sc->iscan); + aom_highbd_quantize_b_c(coeff_ptr, n_coeffs, skip_block, p->zbin_QTX, + p->round_QTX, p->quant_QTX, + p->quant_shift_QTX, qcoeff_ptr, dqcoeff_ptr, + p->dequant_QTX, eob_ptr, sc->scan, sc->iscan); } break; case 1: - aom_highbd_quantize_b_32x32(coeff_ptr, n_coeffs, skip_block, p->zbin, - p->round, p->quant, p->quant_shift, - qcoeff_ptr, dqcoeff_ptr, pd->dequant, - eob_ptr, sc->scan, sc->iscan); + aom_highbd_quantize_b_32x32( + coeff_ptr, n_coeffs, skip_block, p->zbin_QTX, p->round_QTX, + p->quant_QTX, p->quant_shift_QTX, qcoeff_ptr, dqcoeff_ptr, + p->dequant_QTX, eob_ptr, sc->scan, sc->iscan); break; -#if CONFIG_TX64X64 case 2: - aom_highbd_quantize_b_64x64(coeff_ptr, n_coeffs, skip_block, p->zbin, - p->round, p->quant, p->quant_shift, - qcoeff_ptr, dqcoeff_ptr, pd->dequant, - eob_ptr, sc->scan, sc->iscan); + aom_highbd_quantize_b_64x64( + coeff_ptr, n_coeffs, skip_block, p->zbin_QTX, p->round_QTX, + p->quant_QTX, p->quant_shift_QTX, qcoeff_ptr, dqcoeff_ptr, + p->dequant_QTX, eob_ptr, sc->scan, sc->iscan); break; -#endif // CONFIG_TX64X64 default: assert(0); } -#if CONFIG_AOM_QM } -#endif } static INLINE void highbd_quantize_dc( @@ -954,7 +460,8 @@ static INLINE void highbd_quantize_dc( const int dequant = (dequant_ptr * iwt + (1 << (AOM_QM_BITS - 1))) >> AOM_QM_BITS; - dqcoeff_ptr[0] = (qcoeff_ptr[0] * dequant) / (1 << log_scale); + const tran_low_t abs_dqcoeff = (abs_qcoeff * dequant) >> log_scale; + dqcoeff_ptr[0] = (tran_low_t)((abs_dqcoeff ^ coeff_sign) - coeff_sign); if (abs_qcoeff) eob = 0; } *eob_ptr = eob + 1; @@ -963,550 +470,33 @@ static INLINE void highbd_quantize_dc( void av1_highbd_quantize_dc_facade(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const MACROBLOCK_PLANE *p, tran_low_t *qcoeff_ptr, - const MACROBLOCKD_PLANE *pd, tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, const SCAN_ORDER *sc, const QUANT_PARAM *qparam) { // obsolete skip_block const int skip_block = 0; -#if CONFIG_AOM_QM const qm_val_t *qm_ptr = qparam->qmatrix; const qm_val_t *iqm_ptr = qparam->iqmatrix; -#else - const qm_val_t *qm_ptr = NULL; - const qm_val_t *iqm_ptr = NULL; -#endif // CONFIG_AOM_QM - (void)sc; - highbd_quantize_dc(coeff_ptr, (int)n_coeffs, skip_block, p->round, - p->quant_fp[0], qcoeff_ptr, dqcoeff_ptr, pd->dequant[0], - eob_ptr, qm_ptr, iqm_ptr, qparam->log_scale); -} - -#if CONFIG_NEW_QUANT -static INLINE int highbd_quantize_coeff_nuq( - const tran_low_t coeffv, const int16_t quant, const int16_t quant_shift, - const int16_t dequant, const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr) { - const int coeff = coeffv; - const int coeff_sign = (coeff >> 31); - const int abs_coeff = (coeff ^ coeff_sign) - coeff_sign; - int i, q; - int64_t tmp = clamp(abs_coeff, INT32_MIN, INT32_MAX); - for (i = 0; i < NUQ_KNOTS; i++) { - if (tmp < cuml_bins_ptr[i]) { - q = i; - break; - } - } - if (i == NUQ_KNOTS) { - tmp -= cuml_bins_ptr[NUQ_KNOTS - 1]; - q = NUQ_KNOTS + (int)(((((tmp * quant) >> 16) + tmp) * quant_shift) >> 16); - } - if (q) { - *dqcoeff_ptr = av1_dequant_abscoeff_nuq(q, dequant, dequant_val); - *qcoeff_ptr = (q ^ coeff_sign) - coeff_sign; - *dqcoeff_ptr = *qcoeff_ptr < 0 ? -*dqcoeff_ptr : *dqcoeff_ptr; - } else { - *qcoeff_ptr = 0; - *dqcoeff_ptr = 0; - } - return (q != 0); -} - -static INLINE int highbd_quantize_coeff_fp_nuq( - const tran_low_t coeffv, const int16_t quant, const int16_t dequant, - const tran_low_t *cuml_bins_ptr, const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr) { - const int coeff = coeffv; - const int coeff_sign = (coeff >> 31); - const int abs_coeff = (coeff ^ coeff_sign) - coeff_sign; - int i, q; - int64_t tmp = clamp(abs_coeff, INT32_MIN, INT32_MAX); - for (i = 0; i < NUQ_KNOTS; i++) { - if (tmp < cuml_bins_ptr[i]) { - q = i; - break; - } - } - if (i == NUQ_KNOTS) { - q = NUQ_KNOTS + (int)(((tmp - cuml_bins_ptr[NUQ_KNOTS - 1]) * quant) >> 16); - } - if (q) { - *dqcoeff_ptr = av1_dequant_abscoeff_nuq(q, dequant, dequant_val); - *qcoeff_ptr = (q ^ coeff_sign) - coeff_sign; - *dqcoeff_ptr = *qcoeff_ptr < 0 ? -*dqcoeff_ptr : *dqcoeff_ptr; - } else { - *qcoeff_ptr = 0; - *dqcoeff_ptr = 0; - } - return (q != 0); -} - -static INLINE int highbd_quantize_coeff_bigtx_fp_nuq( - const tran_low_t coeffv, const int16_t quant, const int16_t dequant, - const tran_low_t *cuml_bins_ptr, const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, int logsizeby16) { - const int coeff = coeffv; - const int coeff_sign = (coeff >> 31); - const int abs_coeff = (coeff ^ coeff_sign) - coeff_sign; - int i, q; - int64_t tmp = clamp(abs_coeff, INT32_MIN, INT32_MAX); - for (i = 0; i < NUQ_KNOTS; i++) { - if (tmp < ROUND_POWER_OF_TWO(cuml_bins_ptr[i], logsizeby16)) { - q = i; - break; - } - } - if (i == NUQ_KNOTS) { - q = NUQ_KNOTS + - (int)(((tmp - - ROUND_POWER_OF_TWO(cuml_bins_ptr[NUQ_KNOTS - 1], logsizeby16)) * - quant) >> - (16 - logsizeby16)); - } - if (q) { - *dqcoeff_ptr = ROUND_POWER_OF_TWO( - av1_dequant_abscoeff_nuq(q, dequant, dequant_val), logsizeby16); - *qcoeff_ptr = (q ^ coeff_sign) - coeff_sign; - *dqcoeff_ptr = *qcoeff_ptr < 0 ? -*dqcoeff_ptr : *dqcoeff_ptr; - } else { - *qcoeff_ptr = 0; - *dqcoeff_ptr = 0; - } - return (q != 0); -} - -static INLINE int highbd_quantize_coeff_bigtx_nuq( - const tran_low_t coeffv, const int16_t quant, const int16_t quant_shift, - const int16_t dequant, const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr, int logsizeby16) { - const int coeff = coeffv; - const int coeff_sign = (coeff >> 31); - const int abs_coeff = (coeff ^ coeff_sign) - coeff_sign; - int i, q; - int64_t tmp = clamp(abs_coeff, INT32_MIN, INT32_MAX); - for (i = 0; i < NUQ_KNOTS; i++) { - if (tmp < ROUND_POWER_OF_TWO(cuml_bins_ptr[i], logsizeby16)) { - q = i; - break; - } - } - if (i == NUQ_KNOTS) { - tmp -= ROUND_POWER_OF_TWO(cuml_bins_ptr[NUQ_KNOTS - 1], logsizeby16); - q = NUQ_KNOTS + (int)(((((tmp * quant) >> 16) + tmp) * quant_shift) >> - (16 - logsizeby16)); - } - if (q) { - *dqcoeff_ptr = ROUND_POWER_OF_TWO( - av1_dequant_abscoeff_nuq(q, dequant, dequant_val), logsizeby16); - *qcoeff_ptr = (q ^ coeff_sign) - coeff_sign; - *dqcoeff_ptr = *qcoeff_ptr < 0 ? -*dqcoeff_ptr : *dqcoeff_ptr; - } else { - *qcoeff_ptr = 0; - *dqcoeff_ptr = 0; - } - return (q != 0); -} - -void highbd_quantize_dc_nuq(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t quant, - const int16_t quant_shift, const int16_t dequant, - const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (highbd_quantize_coeff_nuq(coeff_ptr[rc], quant, quant_shift, dequant, - cuml_bins_ptr, dequant_val, qcoeff_ptr, - dqcoeff_ptr)) - eob = 0; - } - *eob_ptr = eob + 1; -} - -void highbd_quantize_dc_fp_nuq(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t quant, - const int16_t dequant, - const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (highbd_quantize_coeff_fp_nuq(coeff_ptr[rc], quant, dequant, - cuml_bins_ptr, dequant_val, qcoeff_ptr, - dqcoeff_ptr)) - eob = 0; - } - *eob_ptr = eob + 1; -} - -void highbd_quantize_nuq_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t *quant_ptr, - const int16_t *quant_shift_ptr, - const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, - uint16_t *eob_ptr, const int16_t *scan, - const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (highbd_quantize_coeff_nuq( - coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0], - dequant_ptr[rc != 0], cuml_bins_ptr[band[i]], - dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc])) - eob = i; - } - } - *eob_ptr = eob + 1; -} - -void highbd_quantize_32x32_nuq_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t *quant_ptr, - const int16_t *quant_shift_ptr, - const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, - tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, - const int16_t *scan, const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (highbd_quantize_coeff_bigtx_nuq( - coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0], - dequant_ptr[rc != 0], cuml_bins_ptr[band[i]], - dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc], - av1_get_tx_scale(TX_32X32))) - eob = i; - } - } - *eob_ptr = eob + 1; -} - -void highbd_quantize_32x32_fp_nuq_c(const tran_low_t *coeff_ptr, - intptr_t n_coeffs, int skip_block, - const int16_t *quant_ptr, - const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, - tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, - const int16_t *scan, const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (highbd_quantize_coeff_bigtx_fp_nuq( - coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0], - cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc], - &dqcoeff_ptr[rc], av1_get_tx_scale(TX_32X32))) - eob = i; - } - } - *eob_ptr = eob + 1; -} - -#if CONFIG_TX64X64 -void highbd_quantize_64x64_nuq_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t *quant_ptr, - const int16_t *quant_shift_ptr, - const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, - tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, - const int16_t *scan, const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (highbd_quantize_coeff_bigtx_nuq( - coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0], - dequant_ptr[rc != 0], cuml_bins_ptr[band[i]], - dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc], - av1_get_tx_scale(TX_64X64))) - eob = i; - } - } - *eob_ptr = eob + 1; + highbd_quantize_dc(coeff_ptr, (int)n_coeffs, skip_block, p->round_QTX, + p->quant_fp_QTX[0], qcoeff_ptr, dqcoeff_ptr, + p->dequant_QTX[0], eob_ptr, qm_ptr, iqm_ptr, + qparam->log_scale); } -void highbd_quantize_64x64_fp_nuq_c(const tran_low_t *coeff_ptr, - intptr_t n_coeffs, int skip_block, - const int16_t *quant_ptr, - const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, - tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, - const int16_t *scan, const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (highbd_quantize_coeff_bigtx_fp_nuq( - coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0], - cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc], - &dqcoeff_ptr[rc], av1_get_tx_scale(TX_64X64))) - eob = i; - } - } - *eob_ptr = eob + 1; -} -#endif // CONFIG_TX64X64 - -void highbd_quantize_fp_nuq_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, - int skip_block, const int16_t *quant_ptr, - const int16_t *dequant_ptr, - const cuml_bins_type_nuq *cuml_bins_ptr, - const dequant_val_type_nuq *dequant_val, +void av1_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t count, + 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, - uint16_t *eob_ptr, const int16_t *scan, - const uint8_t *band) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - int i; - for (i = 0; i < n_coeffs; i++) { - const int rc = scan[i]; - if (highbd_quantize_coeff_fp_nuq( - coeff_ptr[rc], quant_ptr[rc != 0], dequant_ptr[rc != 0], - cuml_bins_ptr[band[i]], dequant_val[band[i]], &qcoeff_ptr[rc], - &dqcoeff_ptr[rc])) - eob = i; - } - } - *eob_ptr = eob + 1; -} - -void highbd_quantize_dc_32x32_nuq( - const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, - const int16_t quant, const int16_t quant_shift, const int16_t dequant, - const tran_low_t *cuml_bins_ptr, const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (highbd_quantize_coeff_bigtx_nuq( - coeff_ptr[rc], quant, quant_shift, dequant, cuml_bins_ptr, - dequant_val, qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_32X32))) - eob = 0; - } - *eob_ptr = eob + 1; -} - -void highbd_quantize_dc_32x32_fp_nuq( - const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, - const int16_t quant, const int16_t dequant, const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (highbd_quantize_coeff_bigtx_fp_nuq( - coeff_ptr[rc], quant, dequant, cuml_bins_ptr, dequant_val, - qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_32X32))) - eob = 0; - } - *eob_ptr = eob + 1; -} - -#if CONFIG_TX64X64 -void highbd_quantize_dc_64x64_nuq( - const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, - const int16_t quant, const int16_t quant_shift, const int16_t dequant, - const tran_low_t *cuml_bins_ptr, const tran_low_t *dequant_val, - tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (highbd_quantize_coeff_bigtx_nuq( - coeff_ptr[rc], quant, quant_shift, dequant, cuml_bins_ptr, - dequant_val, qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_64X64))) - eob = 0; - } - *eob_ptr = eob + 1; -} - -void highbd_quantize_dc_64x64_fp_nuq( - const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, - const int16_t quant, const int16_t dequant, const tran_low_t *cuml_bins_ptr, - const tran_low_t *dequant_val, tran_low_t *qcoeff_ptr, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr) { - int eob = -1; - memset(qcoeff_ptr, 0, n_coeffs * sizeof(*qcoeff_ptr)); - memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr)); - if (!skip_block) { - const int rc = 0; - if (highbd_quantize_coeff_bigtx_fp_nuq( - coeff_ptr[rc], quant, dequant, cuml_bins_ptr, dequant_val, - qcoeff_ptr, dqcoeff_ptr, av1_get_tx_scale(TX_64X64))) - eob = 0; - } - *eob_ptr = eob + 1; -} -#endif // CONFIG_TX64X64 - -void av1_highbd_quantize_b_nuq_facade( - const tran_low_t *coeff_ptr, intptr_t n_coeffs, const MACROBLOCK_PLANE *p, - tran_low_t *qcoeff_ptr, const MACROBLOCKD_PLANE *pd, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, const SCAN_ORDER *sc, - const QUANT_PARAM *qparam) { - // obsolete skip_block - const int skip_block = 0; - const uint8_t *band = get_band_translate(qparam->tx_size); - const int dq = qparam->dq; - - switch (qparam->log_scale) { - case 0: - highbd_quantize_nuq(coeff_ptr, n_coeffs, skip_block, p->quant, - p->quant_shift, pd->dequant, - (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], - qcoeff_ptr, dqcoeff_ptr, eob_ptr, sc->scan, band); - break; - case 1: - highbd_quantize_32x32_nuq( - coeff_ptr, n_coeffs, skip_block, p->quant, p->quant_shift, - pd->dequant, (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], qcoeff_ptr, - dqcoeff_ptr, eob_ptr, sc->scan, band); - break; -#if CONFIG_TX64X64 - case 2: - highbd_quantize_64x64_nuq( - coeff_ptr, n_coeffs, skip_block, p->quant, p->quant_shift, - pd->dequant, (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], qcoeff_ptr, - dqcoeff_ptr, eob_ptr, sc->scan, band); - break; -#endif // CONFIG_TX64X64 - default: assert(0); - } -} - -void av1_highbd_quantize_fp_nuq_facade( - const tran_low_t *coeff_ptr, intptr_t n_coeffs, const MACROBLOCK_PLANE *p, - tran_low_t *qcoeff_ptr, const MACROBLOCKD_PLANE *pd, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, const SCAN_ORDER *sc, - const QUANT_PARAM *qparam) { - // obsolete skip_block - const int skip_block = 0; - const uint8_t *band = get_band_translate(qparam->tx_size); - const int dq = qparam->dq; - - switch (qparam->log_scale) { - case 0: - highbd_quantize_fp_nuq( - coeff_ptr, n_coeffs, skip_block, p->quant_fp, pd->dequant, - (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], qcoeff_ptr, - dqcoeff_ptr, eob_ptr, sc->scan, band); - break; - case 1: - highbd_quantize_32x32_fp_nuq( - coeff_ptr, n_coeffs, skip_block, p->quant_fp, pd->dequant, - (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], qcoeff_ptr, - dqcoeff_ptr, eob_ptr, sc->scan, band); - break; -#if CONFIG_TX64X64 - case 2: - highbd_quantize_64x64_fp_nuq( - coeff_ptr, n_coeffs, skip_block, p->quant_fp, pd->dequant, - (const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq], - (const dequant_val_type_nuq *)pd->dequant_val_nuq[dq], qcoeff_ptr, - dqcoeff_ptr, eob_ptr, sc->scan, band); - break; -#endif // CONFIG_TX64X64 - default: assert(0); - } -} - -void av1_highbd_quantize_dc_nuq_facade( - const tran_low_t *coeff_ptr, intptr_t n_coeffs, const MACROBLOCK_PLANE *p, - tran_low_t *qcoeff_ptr, const MACROBLOCKD_PLANE *pd, - tran_low_t *dqcoeff_ptr, uint16_t *eob_ptr, const SCAN_ORDER *sc, - const QUANT_PARAM *qparam) { - // obsolete skip_block - const int skip_block = 0; - const int dq = qparam->dq; - (void)sc; - - switch (qparam->log_scale) { - case 0: - highbd_quantize_dc_fp_nuq(coeff_ptr, n_coeffs, skip_block, p->quant_fp[0], - pd->dequant[0], p->cuml_bins_nuq[dq][0], - pd->dequant_val_nuq[dq][0], qcoeff_ptr, - dqcoeff_ptr, eob_ptr); - break; - case 1: - highbd_quantize_dc_32x32_fp_nuq( - coeff_ptr, n_coeffs, skip_block, p->quant_fp[0], pd->dequant[0], - p->cuml_bins_nuq[dq][0], pd->dequant_val_nuq[dq][0], qcoeff_ptr, - dqcoeff_ptr, eob_ptr); - break; -#if CONFIG_TX64X64 - case 2: - highbd_quantize_dc_64x64_fp_nuq( - coeff_ptr, n_coeffs, skip_block, p->quant_fp[0], pd->dequant[0], - p->cuml_bins_nuq[dq][0], pd->dequant_val_nuq[dq][0], qcoeff_ptr, - dqcoeff_ptr, eob_ptr); - break; -#endif // CONFIG_TX64X64 - default: assert(0); - } -} -#endif // CONFIG_NEW_QUANT - -void av1_highbd_quantize_fp_c( - const tran_low_t *coeff_ptr, intptr_t count, 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, int log_scale) { - highbd_quantize_fp_helper_c(coeff_ptr, count, skip_block, zbin_ptr, round_ptr, - quant_ptr, quant_shift_ptr, qcoeff_ptr, - dqcoeff_ptr, dequant_ptr, eob_ptr, scan, iscan, - NULL, NULL, log_scale); + const int16_t *dequant_ptr, uint16_t *eob_ptr, + const int16_t *scan, const int16_t *iscan, + int log_scale) { + highbd_quantize_fp_helper_c(coeff_ptr, count, zbin_ptr, round_ptr, quant_ptr, + quant_shift_ptr, qcoeff_ptr, dqcoeff_ptr, + dequant_ptr, eob_ptr, scan, iscan, NULL, NULL, + log_scale); } static void invert_quant(int16_t *quant, int16_t *shift, int d) { @@ -1520,8 +510,7 @@ static void invert_quant(int16_t *quant, int16_t *shift, int d) { } static int get_qzbin_factor(int q, aom_bit_depth_t bit_depth) { - const int quant = av1_dc_quant(q, 0, bit_depth); -#if CONFIG_HIGHBITDEPTH + const int quant = av1_dc_quant_Q3(q, 0, bit_depth); switch (bit_depth) { case AOM_BITS_8: return q == 0 ? 64 : (quant < 148 ? 84 : 80); case AOM_BITS_10: return q == 0 ? 64 : (quant < 592 ? 84 : 80); @@ -1530,16 +519,13 @@ static int get_qzbin_factor(int q, aom_bit_depth_t bit_depth) { assert(0 && "bit_depth should be AOM_BITS_8, AOM_BITS_10 or AOM_BITS_12"); return -1; } -#else - (void)bit_depth; - return q == 0 ? 64 : (quant < 148 ? 84 : 80); -#endif } void av1_build_quantizer(aom_bit_depth_t bit_depth, int y_dc_delta_q, - int uv_dc_delta_q, int uv_ac_delta_q, - QUANTS *const quants, Dequants *const deq) { - int i, q, quant; + int u_dc_delta_q, int u_ac_delta_q, int v_dc_delta_q, + int v_ac_delta_q, QUANTS *const quants, + Dequants *const deq) { + int i, q, quant_Q3, quant_QTX; for (q = 0; q < QINDEX_RANGE; q++) { const int qzbin_factor = get_qzbin_factor(q, bit_depth); @@ -1547,41 +533,51 @@ void av1_build_quantizer(aom_bit_depth_t bit_depth, int y_dc_delta_q, for (i = 0; i < 2; ++i) { int qrounding_factor_fp = 64; - // y - quant = i == 0 ? av1_dc_quant(q, y_dc_delta_q, bit_depth) - : av1_ac_quant(q, 0, bit_depth); - invert_quant(&quants->y_quant[q][i], &quants->y_quant_shift[q][i], quant); - quants->y_quant_fp[q][i] = (1 << 16) / quant; - quants->y_round_fp[q][i] = (qrounding_factor_fp * quant) >> 7; - quants->y_zbin[q][i] = ROUND_POWER_OF_TWO(qzbin_factor * quant, 7); - quants->y_round[q][i] = (qrounding_factor * quant) >> 7; - deq->y_dequant[q][i] = quant; - - // uv - quant = i == 0 ? av1_dc_quant(q, uv_dc_delta_q, bit_depth) - : av1_ac_quant(q, uv_ac_delta_q, bit_depth); - invert_quant(&quants->uv_quant[q][i], &quants->uv_quant_shift[q][i], - quant); - quants->uv_quant_fp[q][i] = (1 << 16) / quant; - quants->uv_round_fp[q][i] = (qrounding_factor_fp * quant) >> 7; - quants->uv_zbin[q][i] = ROUND_POWER_OF_TWO(qzbin_factor * quant, 7); - quants->uv_round[q][i] = (qrounding_factor * quant) >> 7; - deq->uv_dequant[q][i] = quant; - } - -#if CONFIG_NEW_QUANT - int dq; - for (dq = 0; dq < QUANT_PROFILES; dq++) { - for (i = 0; i < COEF_BANDS; i++) { - const int y_quant = deq->y_dequant[q][i != 0]; - const int uvquant = deq->uv_dequant[q][i != 0]; - av1_get_dequant_val_nuq(y_quant, i, deq->y_dequant_val_nuq[dq][q][i], - quants->y_cuml_bins_nuq[dq][q][i], dq); - av1_get_dequant_val_nuq(uvquant, i, deq->uv_dequant_val_nuq[dq][q][i], - quants->uv_cuml_bins_nuq[dq][q][i], dq); - } + // y quantizer setup with original coeff shift of Q3 + quant_Q3 = i == 0 ? av1_dc_quant_Q3(q, y_dc_delta_q, bit_depth) + : av1_ac_quant_Q3(q, 0, bit_depth); + // y quantizer with TX scale + quant_QTX = i == 0 ? av1_dc_quant_QTX(q, y_dc_delta_q, bit_depth) + : av1_ac_quant_QTX(q, 0, bit_depth); + invert_quant(&quants->y_quant[q][i], &quants->y_quant_shift[q][i], + quant_QTX); + quants->y_quant_fp[q][i] = (1 << 16) / quant_QTX; + quants->y_round_fp[q][i] = (qrounding_factor_fp * quant_QTX) >> 7; + quants->y_zbin[q][i] = ROUND_POWER_OF_TWO(qzbin_factor * quant_QTX, 7); + quants->y_round[q][i] = (qrounding_factor * quant_QTX) >> 7; + deq->y_dequant_QTX[q][i] = quant_QTX; + deq->y_dequant_Q3[q][i] = quant_Q3; + + // u quantizer setup with original coeff shift of Q3 + quant_Q3 = i == 0 ? av1_dc_quant_Q3(q, u_dc_delta_q, bit_depth) + : av1_ac_quant_Q3(q, u_ac_delta_q, bit_depth); + // u quantizer with TX scale + quant_QTX = i == 0 ? av1_dc_quant_QTX(q, u_dc_delta_q, bit_depth) + : av1_ac_quant_QTX(q, u_ac_delta_q, bit_depth); + invert_quant(&quants->u_quant[q][i], &quants->u_quant_shift[q][i], + quant_QTX); + quants->u_quant_fp[q][i] = (1 << 16) / quant_QTX; + quants->u_round_fp[q][i] = (qrounding_factor_fp * quant_QTX) >> 7; + quants->u_zbin[q][i] = ROUND_POWER_OF_TWO(qzbin_factor * quant_QTX, 7); + quants->u_round[q][i] = (qrounding_factor * quant_QTX) >> 7; + deq->u_dequant_QTX[q][i] = quant_QTX; + deq->u_dequant_Q3[q][i] = quant_Q3; + + // v quantizer setup with original coeff shift of Q3 + quant_Q3 = i == 0 ? av1_dc_quant_Q3(q, v_dc_delta_q, bit_depth) + : av1_ac_quant_Q3(q, v_ac_delta_q, bit_depth); + // v quantizer with TX scale + quant_QTX = i == 0 ? av1_dc_quant_QTX(q, v_dc_delta_q, bit_depth) + : av1_ac_quant_QTX(q, v_ac_delta_q, bit_depth); + invert_quant(&quants->v_quant[q][i], &quants->v_quant_shift[q][i], + quant_QTX); + quants->v_quant_fp[q][i] = (1 << 16) / quant_QTX; + quants->v_round_fp[q][i] = (qrounding_factor_fp * quant_QTX) >> 7; + quants->v_zbin[q][i] = ROUND_POWER_OF_TWO(qzbin_factor * quant_QTX, 7); + quants->v_round[q][i] = (qrounding_factor * quant_QTX) >> 7; + deq->v_dequant_QTX[q][i] = quant_QTX; + deq->v_dequant_Q3[q][i] = quant_Q3; } -#endif // CONFIG_NEW_QUANT for (i = 2; i < 8; i++) { // 8: SIMD width quants->y_quant[q][i] = quants->y_quant[q][1]; @@ -1590,15 +586,25 @@ void av1_build_quantizer(aom_bit_depth_t bit_depth, int y_dc_delta_q, quants->y_quant_shift[q][i] = quants->y_quant_shift[q][1]; quants->y_zbin[q][i] = quants->y_zbin[q][1]; quants->y_round[q][i] = quants->y_round[q][1]; - deq->y_dequant[q][i] = deq->y_dequant[q][1]; - - quants->uv_quant[q][i] = quants->uv_quant[q][1]; - quants->uv_quant_fp[q][i] = quants->uv_quant_fp[q][1]; - quants->uv_round_fp[q][i] = quants->uv_round_fp[q][1]; - quants->uv_quant_shift[q][i] = quants->uv_quant_shift[q][1]; - quants->uv_zbin[q][i] = quants->uv_zbin[q][1]; - quants->uv_round[q][i] = quants->uv_round[q][1]; - deq->uv_dequant[q][i] = deq->uv_dequant[q][1]; + deq->y_dequant_QTX[q][i] = deq->y_dequant_QTX[q][1]; + deq->y_dequant_Q3[q][i] = deq->y_dequant_Q3[q][1]; + + quants->u_quant[q][i] = quants->u_quant[q][1]; + quants->u_quant_fp[q][i] = quants->u_quant_fp[q][1]; + quants->u_round_fp[q][i] = quants->u_round_fp[q][1]; + quants->u_quant_shift[q][i] = quants->u_quant_shift[q][1]; + quants->u_zbin[q][i] = quants->u_zbin[q][1]; + quants->u_round[q][i] = quants->u_round[q][1]; + deq->u_dequant_QTX[q][i] = deq->u_dequant_QTX[q][1]; + deq->u_dequant_Q3[q][i] = deq->u_dequant_Q3[q][1]; + quants->v_quant[q][i] = quants->u_quant[q][1]; + quants->v_quant_fp[q][i] = quants->v_quant_fp[q][1]; + quants->v_round_fp[q][i] = quants->v_round_fp[q][1]; + quants->v_quant_shift[q][i] = quants->v_quant_shift[q][1]; + quants->v_zbin[q][i] = quants->v_zbin[q][1]; + quants->v_round[q][i] = quants->v_round[q][1]; + deq->v_dequant_QTX[q][i] = deq->v_dequant_QTX[q][1]; + deq->v_dequant_Q3[q][i] = deq->v_dequant_Q3[q][1]; } } } @@ -1607,8 +613,9 @@ void av1_init_quantizer(AV1_COMP *cpi) { AV1_COMMON *const cm = &cpi->common; QUANTS *const quants = &cpi->quants; Dequants *const dequants = &cpi->dequants; - av1_build_quantizer(cm->bit_depth, cm->y_dc_delta_q, cm->uv_dc_delta_q, - cm->uv_ac_delta_q, quants, dequants); + av1_build_quantizer(cm->bit_depth, cm->y_dc_delta_q, cm->u_dc_delta_q, + cm->u_ac_delta_q, cm->v_dc_delta_q, cm->v_ac_delta_q, + quants, dequants); } void av1_init_plane_quantizers(const AV1_COMP *cpi, MACROBLOCK *x, @@ -1617,79 +624,68 @@ void av1_init_plane_quantizers(const AV1_COMP *cpi, MACROBLOCK *x, MACROBLOCKD *const xd = &x->e_mbd; const QUANTS *const quants = &cpi->quants; -#if CONFIG_EXT_DELTA_Q - int current_q_index = - AOMMAX(0, AOMMIN(QINDEX_RANGE - 1, - cpi->oxcf.deltaq_mode != NO_DELTA_Q - ? cm->base_qindex + xd->delta_qindex - : cm->base_qindex)); -#else - int current_q_index = AOMMAX( - 0, AOMMIN(QINDEX_RANGE - 1, - cm->delta_q_present_flag ? cm->base_qindex + xd->delta_qindex - : cm->base_qindex)); -#endif - const int qindex = av1_get_qindex(&cm->seg, segment_id, current_q_index); + int current_qindex = AOMMAX( + 0, AOMMIN(QINDEX_RANGE - 1, cpi->oxcf.deltaq_mode != NO_DELTA_Q + ? cm->base_qindex + xd->delta_qindex + : cm->base_qindex)); + const int qindex = av1_get_qindex(&cm->seg, segment_id, current_qindex); const int rdmult = av1_compute_rd_mult(cpi, qindex + cm->y_dc_delta_q); - int i; -#if CONFIG_AOM_QM - int minqm = cm->min_qmlevel; - int maxqm = cm->max_qmlevel; - // Quant matrix only depends on the base QP so there is only one set per frame int qmlevel = (xd->lossless[segment_id] || cm->using_qmatrix == 0) ? NUM_QM_LEVELS - 1 - : aom_get_qmlevel(cm->base_qindex, minqm, maxqm); -#endif -#if CONFIG_NEW_QUANT - int dq; -#endif + : cm->qm_y; // Y - x->plane[0].quant = quants->y_quant[qindex]; - x->plane[0].quant_fp = quants->y_quant_fp[qindex]; - x->plane[0].round_fp = quants->y_round_fp[qindex]; - x->plane[0].quant_shift = quants->y_quant_shift[qindex]; - x->plane[0].zbin = quants->y_zbin[qindex]; - x->plane[0].round = quants->y_round[qindex]; -#if CONFIG_AOM_QM + x->plane[0].quant_QTX = quants->y_quant[qindex]; + x->plane[0].quant_fp_QTX = quants->y_quant_fp[qindex]; + x->plane[0].round_fp_QTX = quants->y_round_fp[qindex]; + x->plane[0].quant_shift_QTX = quants->y_quant_shift[qindex]; + x->plane[0].zbin_QTX = quants->y_zbin[qindex]; + x->plane[0].round_QTX = quants->y_round[qindex]; + x->plane[0].dequant_QTX = cpi->dequants.y_dequant_QTX[qindex]; memcpy(&xd->plane[0].seg_qmatrix[segment_id], cm->gqmatrix[qmlevel][0], sizeof(cm->gqmatrix[qmlevel][0])); memcpy(&xd->plane[0].seg_iqmatrix[segment_id], cm->giqmatrix[qmlevel][0], sizeof(cm->giqmatrix[qmlevel][0])); -#endif - xd->plane[0].dequant = cpi->dequants.y_dequant[qindex]; -#if CONFIG_NEW_QUANT - for (dq = 0; dq < QUANT_PROFILES; dq++) { - x->plane[0].cuml_bins_nuq[dq] = quants->y_cuml_bins_nuq[dq][qindex]; - xd->plane[0].dequant_val_nuq[dq] = - cpi->dequants.y_dequant_val_nuq[dq][qindex]; - } -#endif // CONFIG_NEW_QUANT - - // UV - for (i = 1; i < 3; i++) { - x->plane[i].quant = quants->uv_quant[qindex]; - x->plane[i].quant_fp = quants->uv_quant_fp[qindex]; - x->plane[i].round_fp = quants->uv_round_fp[qindex]; - x->plane[i].quant_shift = quants->uv_quant_shift[qindex]; - x->plane[i].zbin = quants->uv_zbin[qindex]; - x->plane[i].round = quants->uv_round[qindex]; -#if CONFIG_AOM_QM - memcpy(&xd->plane[i].seg_qmatrix[segment_id], cm->gqmatrix[qmlevel][1], + xd->plane[0].dequant_Q3 = cpi->dequants.y_dequant_Q3[qindex]; + + // U + qmlevel = (xd->lossless[segment_id] || cm->using_qmatrix == 0) + ? NUM_QM_LEVELS - 1 + : cm->qm_u; + { + x->plane[1].quant_QTX = quants->u_quant[qindex]; + x->plane[1].quant_fp_QTX = quants->u_quant_fp[qindex]; + x->plane[1].round_fp_QTX = quants->u_round_fp[qindex]; + x->plane[1].quant_shift_QTX = quants->u_quant_shift[qindex]; + x->plane[1].zbin_QTX = quants->u_zbin[qindex]; + x->plane[1].round_QTX = quants->u_round[qindex]; + x->plane[1].dequant_QTX = cpi->dequants.u_dequant_QTX[qindex]; + memcpy(&xd->plane[1].seg_qmatrix[segment_id], cm->gqmatrix[qmlevel][1], sizeof(cm->gqmatrix[qmlevel][1])); - memcpy(&xd->plane[i].seg_iqmatrix[segment_id], cm->giqmatrix[qmlevel][1], + memcpy(&xd->plane[1].seg_iqmatrix[segment_id], cm->giqmatrix[qmlevel][1], sizeof(cm->giqmatrix[qmlevel][1])); -#endif - xd->plane[i].dequant = cpi->dequants.uv_dequant[qindex]; -#if CONFIG_NEW_QUANT - for (dq = 0; dq < QUANT_PROFILES; dq++) { - x->plane[i].cuml_bins_nuq[dq] = quants->uv_cuml_bins_nuq[dq][qindex]; - xd->plane[i].dequant_val_nuq[dq] = - cpi->dequants.uv_dequant_val_nuq[dq][qindex]; - } -#endif // CONFIG_NEW_QUANT + x->plane[1].dequant_QTX = cpi->dequants.u_dequant_QTX[qindex]; + xd->plane[1].dequant_Q3 = cpi->dequants.u_dequant_Q3[qindex]; + } + // V + qmlevel = (xd->lossless[segment_id] || cm->using_qmatrix == 0) + ? NUM_QM_LEVELS - 1 + : cm->qm_v; + { + x->plane[2].quant_QTX = quants->v_quant[qindex]; + x->plane[2].quant_fp_QTX = quants->v_quant_fp[qindex]; + x->plane[2].round_fp_QTX = quants->v_round_fp[qindex]; + x->plane[2].quant_shift_QTX = quants->v_quant_shift[qindex]; + x->plane[2].zbin_QTX = quants->v_zbin[qindex]; + x->plane[2].round_QTX = quants->v_round[qindex]; + x->plane[2].dequant_QTX = cpi->dequants.v_dequant_QTX[qindex]; + memcpy(&xd->plane[2].seg_qmatrix[segment_id], cm->gqmatrix[qmlevel][2], + sizeof(cm->gqmatrix[qmlevel][2])); + memcpy(&xd->plane[2].seg_iqmatrix[segment_id], cm->giqmatrix[qmlevel][2], + sizeof(cm->giqmatrix[qmlevel][2])); + x->plane[2].dequant_QTX = cpi->dequants.v_dequant_QTX[qindex]; + xd->plane[2].dequant_Q3 = cpi->dequants.v_dequant_Q3[qindex]; } - x->skip_block = segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP); x->qindex = qindex; @@ -1701,16 +697,27 @@ void av1_init_plane_quantizers(const AV1_COMP *cpi, MACROBLOCK *x, void av1_frame_init_quantizer(AV1_COMP *cpi) { MACROBLOCK *const x = &cpi->td.mb; MACROBLOCKD *const xd = &x->e_mbd; - av1_init_plane_quantizers(cpi, x, xd->mi[0]->mbmi.segment_id); + av1_init_plane_quantizers(cpi, x, xd->mi[0]->segment_id); } void av1_set_quantizer(AV1_COMMON *cm, int q) { // quantizer has to be reinitialized with av1_init_quantizer() if any // delta_q changes. - cm->base_qindex = q; + cm->base_qindex = AOMMAX(cm->delta_q_present_flag, q); cm->y_dc_delta_q = 0; - cm->uv_dc_delta_q = 0; - cm->uv_ac_delta_q = 0; + cm->u_dc_delta_q = 0; + cm->u_ac_delta_q = 0; + cm->v_dc_delta_q = 0; + cm->v_ac_delta_q = 0; + cm->qm_y = aom_get_qmlevel(cm->base_qindex, cm->min_qmlevel, cm->max_qmlevel); + cm->qm_u = aom_get_qmlevel(cm->base_qindex + cm->u_ac_delta_q, + cm->min_qmlevel, cm->max_qmlevel); + + if (!cm->separate_uv_delta_q) + cm->qm_v = cm->qm_u; + else + cm->qm_v = aom_get_qmlevel(cm->base_qindex + cm->v_ac_delta_q, + cm->min_qmlevel, cm->max_qmlevel); } // Table that converts 0-63 Q-range values passed in outside to the Qindex |