Commit 2ce97079 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review

Merge "Resolve build issue --enable-aom-qm" into nextgenv2

parents ae81f8b2 a5924740
......@@ -16,11 +16,6 @@
#include "av1/common/seg_common.h"
#include "av1/common/blockd.h"
#if CONFIG_AOM_QM
static void make_qmatrices(qm_val_t *wmatrix[NUM_QM_LEVELS][2][2][TX_SIZES],
qm_val_t *iwmatrix[NUM_QM_LEVELS][2][2][TX_SIZES]);
#endif
#if CONFIG_NEW_QUANT
// Bin widths expressed as a fraction over 128 of the quant stepsize,
// for the quantization bins 0-4.
......
......@@ -51,7 +51,8 @@ static INLINE int read_coeff(const aom_prob *probs, int n, aom_reader *r) {
static int decode_coefs(MACROBLOCKD *xd, PLANE_TYPE type, tran_low_t *dqcoeff,
TX_SIZE tx_size, TX_TYPE tx_type, const int16_t *dq,
int ctx, const int16_t *scan, const int16_t *nb,
aom_reader *r, const qm_val_t *iqm[2][TX_SIZES])
int16_t *max_scan_line, aom_reader *r,
const qm_val_t *iqm[2][TX_SIZES])
#else
static int decode_coefs(MACROBLOCKD *xd, PLANE_TYPE type, tran_low_t *dqcoeff,
TX_SIZE tx_size, TX_TYPE tx_type, const int16_t *dq,
......@@ -343,7 +344,7 @@ int av1_decode_block_tokens(MACROBLOCKD *const xd, int plane,
#if CONFIG_AOM_QM
const int eob = decode_coefs(xd, pd->plane_type, pd->dqcoeff, tx_size,
tx_type, dequant, ctx, sc->scan, sc->neighbors,
&sc->max_scan_line, r, pd->seg_iqmatrix[seg_id]);
max_scan_line, r, pd->seg_iqmatrix[seg_id]);
#else
const int eob =
decode_coefs(xd, pd->plane_type, pd->dqcoeff, tx_size, tx_type, dequant,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment