Commit e715483c authored by Thomas Davies's avatar Thomas Davies
Browse files

Fix compile error with NEW_MULTISYMBOL and RECT_TX_EXT.

No need to read any of the compressed header.

BUG=aomedia:846

Change-Id: I1e7c2fc3d22621075cf9420b799ddc8c778c1564
parent a97394f7
...@@ -176,7 +176,7 @@ static TX_MODE read_tx_mode(AV1_COMMON *cm, struct aom_read_bit_buffer *rb) { ...@@ -176,7 +176,7 @@ static TX_MODE read_tx_mode(AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
#endif // CONFIG_VAR_TX_NO_TX_MODE #endif // CONFIG_VAR_TX_NO_TX_MODE
} }
#if !CONFIG_NEW_MULTISYMBOL #if !CONFIG_RESTRICT_COMPRESSED_HDR
static void read_inter_mode_probs(FRAME_CONTEXT *fc, aom_reader *r) { static void read_inter_mode_probs(FRAME_CONTEXT *fc, aom_reader *r) {
int i; int i;
for (i = 0; i < NEWMV_MODE_CONTEXTS; ++i) for (i = 0; i < NEWMV_MODE_CONTEXTS; ++i)
...@@ -205,7 +205,7 @@ static REFERENCE_MODE read_frame_reference_mode( ...@@ -205,7 +205,7 @@ static REFERENCE_MODE read_frame_reference_mode(
} }
} }
#if !CONFIG_NEW_MULTISYMBOL #if !CONFIG_RESTRICT_COMPRESSED_HDR
static void read_frame_reference_mode_probs(AV1_COMMON *cm, aom_reader *r) { static void read_frame_reference_mode_probs(AV1_COMMON *cm, aom_reader *r) {
FRAME_CONTEXT *const fc = cm->fc; FRAME_CONTEXT *const fc = cm->fc;
int i; int i;
...@@ -5180,6 +5180,12 @@ static void read_supertx_probs(FRAME_CONTEXT *fc, aom_reader *r) { ...@@ -5180,6 +5180,12 @@ static void read_supertx_probs(FRAME_CONTEXT *fc, aom_reader *r) {
static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data, static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
size_t partition_size) { size_t partition_size) {
#if CONFIG_RESTRICT_COMPRESSED_HDR
(void)pbi;
(void)data;
(void)partition_size;
return 0;
#else
AV1_COMMON *const cm = &pbi->common; AV1_COMMON *const cm = &pbi->common;
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
MACROBLOCKD *const xd = &pbi->mb; MACROBLOCKD *const xd = &pbi->mb;
...@@ -5277,6 +5283,7 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data, ...@@ -5277,6 +5283,7 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
} }
return aom_reader_has_error(&r); return aom_reader_has_error(&r);
#endif // CONFIG_RESTRICT_COMPRESSED_HDR
} }
#ifdef NDEBUG #ifdef NDEBUG
......
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