Commit 64d7ef67 authored by Alex Converse's avatar Alex Converse

Fix Wundef warnings inside the codec

Change-Id: I2f4a5c836905b089b91b211368bf3a0dea682b75
parent e8e6cad7
......@@ -20,7 +20,7 @@ extern "C" {
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
......
......@@ -16,6 +16,8 @@
extern "C" {
#endif
#include "./aom_config.h"
struct AV1Common;
#if CONFIG_TILE_GROUPS
......
......@@ -1686,12 +1686,9 @@ static void decode_token_and_recon_block(AV1Decoder *const pbi,
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;
}
}
}
......
......@@ -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__
......
......@@ -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
......
......@@ -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);
......
......@@ -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
......
......@@ -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"
......
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