Fix Wundef warnings inside the codec
Change-Id: I2f4a5c836905b089b91b211368bf3a0dea682b75
diff --git a/aom_dsp/entdec.h b/aom_dsp/entdec.h
index cd90b2c..acb1768 100644
--- a/aom_dsp/entdec.h
+++ b/aom_dsp/entdec.h
@@ -20,7 +20,7 @@
typedef struct od_ec_dec od_ec_dec;
-#if OD_ACCOUNTING
+#if defined(OD_ACCOUNTING) && OD_ACCOUNTING
#define OD_ACC_STR , char *acc_str
#define od_ec_dec_bits(dec, ftb, str) od_ec_dec_bits_(dec, ftb, str)
#else
diff --git a/av1/common/tile_common.h b/av1/common/tile_common.h
index 19daac2..516896a 100644
--- a/av1/common/tile_common.h
+++ b/av1/common/tile_common.h
@@ -16,6 +16,8 @@
extern "C" {
#endif
+#include "./aom_config.h"
+
struct AV1Common;
#if CONFIG_TILE_GROUPS
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 3f8aac6..990a516 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1686,12 +1686,9 @@
tu_idx_c++;
}
- if (bsize >= BLOCK_8X8 && eobtotal == 0)
-#if CONFIG_MISC_FIXES
- mbmi->has_no_coeffs = 1;
-#else
- mbmi->skip = 1;
-#endif
+ // TODO(CONFIG_COEF_INTERLEAVE owners): bring eob == 0 corner case
+ // into line with the defaut configuration
+ if (bsize >= BLOCK_8X8 && eobtotal == 0) mbmi->skip = 1;
}
}
}
diff --git a/av1/decoder/detokenize.c b/av1/decoder/detokenize.c
index 9811689..dffc56a 100644
--- a/av1/decoder/detokenize.c
+++ b/av1/decoder/detokenize.c
@@ -9,14 +9,12 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include "./aom_config.h"
#if !CONFIG_PVQ
#include "aom_mem/aom_mem.h"
#include "aom_ports/mem.h"
#endif // !CONFIG_PVQ
-#if CONFIG_ANS
-#include "aom_dsp/ans.h"
-#endif // CONFIG_ANS
#include "av1/common/blockd.h"
#define ACCT_STR __func__
diff --git a/av1/decoder/detokenize.h b/av1/decoder/detokenize.h
index b31711e..ba40666 100644
--- a/av1/decoder/detokenize.h
+++ b/av1/decoder/detokenize.h
@@ -12,11 +12,9 @@
#ifndef AV1_DECODER_DETOKENIZE_H_
#define AV1_DECODER_DETOKENIZE_H_
+#include "./aom_config.h"
#if !CONFIG_PVQ || CONFIG_VAR_TX
#include "av1/decoder/decoder.h"
-#if CONFIG_ANS
-#include "aom_dsp/ans.h"
-#endif // CONFIG_ANS
#include "av1/common/scan.h"
#endif // !CONFIG_PVQ
diff --git a/av1/encoder/pvq_encoder.h b/av1/encoder/pvq_encoder.h
index 50a5e8a..7492287 100644
--- a/av1/encoder/pvq_encoder.h
+++ b/av1/encoder/pvq_encoder.h
@@ -19,6 +19,10 @@
# include "av1/common/pvq.h"
# include "av1/encoder/encint.h"
+#ifndef OD_SIGNAL_Q_SCALING
+# define OD_SIGNAL_Q_SCALING (0)
+#endif
+
void aom_encode_band_pvq_splits(aom_writer *w, od_pvq_codeword_ctx *adapt,
const int *y, int n, int k, int level);
diff --git a/av1/encoder/resize.c b/av1/encoder/resize.c
index ed416ed..3bb9f60 100644
--- a/av1/encoder/resize.c
+++ b/av1/encoder/resize.c
@@ -16,6 +16,7 @@
#include <stdlib.h>
#include <string.h>
+#include "./aom_config.h"
#if CONFIG_AOM_HIGHBITDEPTH
#include "aom_dsp/aom_dsp_common.h"
#endif // CONFIG_AOM_HIGHBITDEPTH
diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c
index 2dd7d02..c46b990 100644
--- a/av1/encoder/temporal_filter.c
+++ b/av1/encoder/temporal_filter.c
@@ -12,6 +12,7 @@
#include <math.h>
#include <limits.h>
+#include "./aom_config.h"
#include "av1/common/alloccommon.h"
#include "av1/common/onyxc_int.h"
#include "av1/common/quant_common.h"
