Commit e580092b authored by Yushin Cho's avatar Yushin Cho Committed by Urvang Joshi

Fix the build error when pvq and pallete are both enabled

Fix the build error when pvq and pallete experiments are both enabled.

Change-Id: I80839b0660456b81aad00ad8dd9c34b7541f7727
parent 1b5bd29d
......@@ -12,16 +12,17 @@
#if !CONFIG_PVQ
#include "aom_mem/aom_mem.h"
#include "aom_ports/mem.h"
#endif
#if !CONFIG_PVQ
#endif // !CONFIG_PVQ
#if CONFIG_ANS
#include "aom_dsp/ans.h"
#endif // CONFIG_ANS
#include "av1/common/blockd.h"
#if !CONFIG_PVQ
#include "av1/common/common.h"
#include "av1/common/entropy.h"
#include "av1/common/idct.h"
#include "av1/decoder/detokenize.h"
#define ACCT_STR __func__
......@@ -440,6 +441,7 @@ static int decode_coefs(MACROBLOCKD *xd, PLANE_TYPE type, tran_low_t *dqcoeff,
return c;
}
#endif // !CONFIG_PVQ
#if CONFIG_PALETTE
void av1_decode_palette_tokens(MACROBLOCKD *const xd, int plane,
......@@ -481,6 +483,7 @@ void av1_decode_palette_tokens(MACROBLOCKD *const xd, int plane,
}
#endif // CONFIG_PALETTE
#if !CONFIG_PVQ
int av1_decode_block_tokens(MACROBLOCKD *const xd, int plane,
const SCAN_ORDER *sc, int x, int y, TX_SIZE tx_size,
TX_TYPE tx_type, int16_t *max_scan_line,
......@@ -513,4 +516,4 @@ int av1_decode_block_tokens(MACROBLOCKD *const xd, int plane,
av1_set_contexts(xd, pd, plane, tx_size, eob > 0, x, y);
return eob;
}
#endif
#endif // !CONFIG_PVQ
......@@ -397,6 +397,7 @@ static INLINE int get_tx_eob(const struct segmentation *seg, int segment_id,
return segfeature_active(seg, segment_id, SEG_LVL_SKIP) ? 0 : eob_max;
}
#endif
#endif // !CONFIG_PVQ
#if CONFIG_PALETTE
void av1_tokenize_palette_sb(const AV1_COMP *cpi,
......@@ -439,6 +440,7 @@ void av1_tokenize_palette_sb(const AV1_COMP *cpi,
}
#endif // CONFIG_PALETTE
#if !CONFIG_PVQ
static void tokenize_b(int plane, int block, int blk_row, int blk_col,
BLOCK_SIZE plane_bsize, TX_SIZE tx_size, void *arg) {
struct tokenize_b_args *const args = arg;
......@@ -597,7 +599,7 @@ static void tokenize_b(int plane, int block, int blk_row, int blk_col,
av1_set_contexts(xd, pd, plane, tx_size, c > 0, blk_col, blk_row);
}
#endif
#endif // !CONFIG_PVQ
struct is_skippable_args {
uint16_t *eobs;
......@@ -679,7 +681,7 @@ static void tokenize_pvq(int plane, int block, int blk_row, int blk_col,
pvq_info = &x->pvq[block][plane];
add_pvq_block((AV1_COMMON * const)cm, x, pvq_info);
}
#endif
#endif // CONFIG_PVQ
#if CONFIG_VAR_TX
void tokenize_vartx(ThreadData *td, TOKENEXTRA **t, RUN_TYPE dry_run,
TX_SIZE tx_size, BLOCK_SIZE plane_bsize, int blk_row,
......
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