From dddb21f9ed155cfcdb3d1504499d02fcc9bbe7d2 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Tue, 28 Feb 2017 14:44:05 -0800 Subject: [PATCH] Fix compiling warnings in var-tx and coef-interleave Resolve compiler warnings when the two experiments are turned on. Change-Id: I568ddd74afad6fe720e1f46d0119df08fd2f689b --- av1/decoder/decodeframe.c | 4 ++-- av1/encoder/bitstream.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index e78687c0f..a12555ee4 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c @@ -539,7 +539,7 @@ static void predict_and_reconstruct_intra_block( } } -#if CONFIG_VAR_TX +#if CONFIG_VAR_TX && !CONFIG_COEF_INTERLEAVE static void decode_reconstruct_tx(AV1_COMMON *cm, MACROBLOCKD *const xd, aom_reader *r, MB_MODE_INFO *const mbmi, int plane, BLOCK_SIZE plane_bsize, @@ -597,7 +597,7 @@ static void decode_reconstruct_tx(AV1_COMMON *cm, MACROBLOCKD *const xd, } #endif // CONFIG_VAR_TX -#if !CONFIG_VAR_TX || CONFIG_SUPERTX || \ +#if !CONFIG_VAR_TX || CONFIG_SUPERTX || CONFIG_COEF_INTERLEAVE || \ (!CONFIG_VAR_TX && CONFIG_EXT_TX && CONFIG_RECT_TX) static int reconstruct_inter_block(AV1_COMMON *cm, MACROBLOCKD *const xd, aom_reader *const r, int segment_id, diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c index 9b8eeac12..da60f2945 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c @@ -961,7 +961,7 @@ static void pack_mb_tokens(aom_writer *w, const TOKENEXTRA **tp, } #endif #endif // !CONFIG_PVG -#if CONFIG_VAR_TX +#if CONFIG_VAR_TX && !CONFIG_COEF_INTERLEAVE static void pack_txb_tokens(aom_writer *w, const TOKENEXTRA **tp, const TOKENEXTRA *const tok_end, MACROBLOCKD *xd, MB_MODE_INFO *mbmi, int plane,