Commit 60e653d4 authored by Tom Finegan's avatar Tom Finegan

cmake: Output aom_config in config sub dir.

Does away with somewhat confusing usage of "./aom_config.h" in
include statements while keeping linters silent.

aom_config.asm, aom_config.c, and aom_config.h are now written to
the config sub dir.

Change-Id: I99e2422d6ca8b20b9cdf2feee83a866c273e47b0
parent c8c0fbcc
......@@ -140,8 +140,8 @@ list(APPEND AOM_LIBYUV_SOURCES
"${AOM_ROOT}/third_party/libyuv/source/scale_win.cc")
list(APPEND AOM_SOURCES
"${AOM_CONFIG_DIR}/aom_config.c"
"${AOM_CONFIG_DIR}/aom_config.h"
"${AOM_CONFIG_DIR}/config/aom_config.c"
"${AOM_CONFIG_DIR}/config/aom_config.h"
"${AOM_ROOT}/aom/aom.h"
"${AOM_ROOT}/aom/aom_codec.h"
"${AOM_ROOT}/aom/aom_decoder.h"
......
......@@ -16,7 +16,8 @@
#include <stdarg.h>
#include <stdlib.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
#include "aom/internal/aom_codec_internal.h"
#include "aom_version.h"
......
......@@ -13,7 +13,7 @@
* \brief Provides the high level interface to wrap encoder algorithms.
*
*/
#include "./aom_config.h"
#include "config/aom_config.h"
#if HAVE_FEXCEPT
#define _GNU_SOURCE
......
......@@ -12,7 +12,7 @@
#include <math.h>
#include <stdlib.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
......
......@@ -12,8 +12,9 @@
#include <assert.h>
#include <string.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
#include "aom_dsp/aom_convolve.h"
#include "aom_dsp/aom_dsp_common.h"
......
......@@ -11,7 +11,8 @@
#ifndef AOM_DSP_AOM_CONVOLVE_H_
#define AOM_DSP_AOM_CONVOLVE_H_
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
#ifdef __cplusplus
......
......@@ -12,7 +12,8 @@
#ifndef AOM_DSP_AOM_DSP_COMMON_H_
#define AOM_DSP_AOM_DSP_COMMON_H_
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
#include "aom_ports/mem.h"
......
......@@ -8,7 +8,8 @@
* Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
#include "./aom_config.h"
#include "config/aom_config.h"
#define RTCD_C
#include "./aom_dsp_rtcd.h"
#include "aom_ports/aom_once.h"
......
......@@ -18,7 +18,8 @@
#include <intrin.h>
#endif
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_simd_inline.h"
#define SIMD_CHECK 1 // Sanity checks in C equivalents
......
......@@ -12,7 +12,8 @@
#include <arm_neon.h>
#include <assert.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
#include "aom_ports/mem.h"
......
......@@ -13,7 +13,7 @@
#include <assert.h>
#include "./aom_dsp_rtcd.h"
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
......
......@@ -11,7 +11,8 @@
#include <arm_neon.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom_dsp/txfm_common.h"
void aom_fdct8x8_neon(const int16_t *input, int16_t *final_output, int stride) {
......
......@@ -11,7 +11,8 @@
#include <arm_neon.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
......
......@@ -12,7 +12,8 @@
#include <arm_neon.h>
#include "./aom_dsp_rtcd.h"
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
static INLINE void loop_filter_neon_16(uint8x16_t qblimit, // blimit
......
......@@ -12,7 +12,8 @@
#include <arm_neon.h>
#include "./aom_dsp_rtcd.h"
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
void aom_lpf_vertical_4_dual_neon(uint8_t *s, int p, const uint8_t *blimit0,
......
......@@ -11,7 +11,8 @@
#include <arm_neon.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
......
......@@ -11,7 +11,7 @@
#include <arm_neon.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
......
......@@ -11,7 +11,7 @@
#include <arm_neon.h>
#include "./aom_dsp_rtcd.h"
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom_ports/mem.h"
#include "aom/aom_integer.h"
......
......@@ -11,7 +11,8 @@
#include <arm_neon.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
void aom_subtract_block_neon(int rows, int cols, int16_t *diff,
......
......@@ -12,7 +12,7 @@
#include <arm_neon.h>
#include "./aom_dsp_rtcd.h"
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
#include "aom_ports/mem.h"
......
......@@ -18,7 +18,8 @@ extern "C" {
#include <assert.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
#include "aom_dsp/bitreader.h"
#include "aom_dsp/bitreader_buffer.h"
......
......@@ -17,7 +17,8 @@ extern "C" {
#endif
#include <assert.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
#include "aom_dsp/bitwriter.h"
#include "aom_dsp/bitwriter_buffer.h"
......
......@@ -15,7 +15,7 @@
#include <assert.h>
#include <limits.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aomdx.h"
#include "aom/aom_integer.h"
......
......@@ -8,7 +8,8 @@
* Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./bitreader_buffer.h"
size_t aom_rb_bytes_read(struct aom_read_bit_buffer *rb) {
......
......@@ -13,7 +13,8 @@
#define AOM_DSP_BITWRITER_H_
#include <assert.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom_dsp/daalaboolwriter.h"
#include "aom_dsp/prob.h"
......
......@@ -12,7 +12,8 @@
#include <limits.h>
#include <stdlib.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./bitwriter_buffer.h"
int aom_wb_is_byte_aligned(const struct aom_write_bit_buffer *wb) {
......
......@@ -16,7 +16,8 @@
// backwards due to ANS's stack like behavior.
#include <assert.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
#include "aom_dsp/ans.h"
#include "aom_dsp/answriter.h"
......
......@@ -15,7 +15,9 @@
#include <math.h>
#include <stdlib.h>
#include <string.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/ssim.h"
#include "aom_ports/system_state.h"
......
......@@ -12,7 +12,7 @@
#include <assert.h>
#include <math.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/aom_dsp_common.h"
......
......@@ -12,7 +12,7 @@
#ifndef _AOM_DSP_INTRAPRED_COMMON_H
#define _AOM_DSP_INTRAPRED_COMMON_H
#include "./aom_config.h"
#include "config/aom_config.h"
// Weights are quadratic from '1' to '1 / block_size', scaled by
// 2^sm_weight_log2_scale.
......
......@@ -11,7 +11,8 @@
#include <stdlib.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/aom_dsp_common.h"
#include "aom_ports/mem.h"
......
......@@ -13,7 +13,9 @@
#define AOM_COMMON_MIPS_DSPR2_H_
#include <assert.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
#ifdef __cplusplus
......
......@@ -14,7 +14,8 @@
#include <assert.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
#include "aom_dsp/mips/common_dspr2.h"
......
......@@ -14,7 +14,8 @@
#include <msa.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
#define LD_B(RTYPE, psrc) *((const RTYPE *)(psrc))
......
......@@ -15,7 +15,8 @@
#include <assert.h>
#include <stdio.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_common.h"
#include "aom_ports/bitops.h"
......
......@@ -17,7 +17,8 @@
#include <stdio.h>
#include <stdlib.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/psnr.h"
#include "aom_dsp/ssim.h"
......
......@@ -12,7 +12,8 @@
#ifndef AOM_DSP_QUANTIZE_H_
#define AOM_DSP_QUANTIZE_H_
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom_dsp/aom_dsp_common.h"
#ifdef __cplusplus
......
......@@ -11,7 +11,8 @@
#include <stdlib.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
......
......@@ -11,7 +11,8 @@
#include <stdlib.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
......
......@@ -15,7 +15,8 @@
#include <stdio.h>
#include <stdlib.h>
#include "./v64_intrinsics_c.h"
#include "./aom_config.h"
#include "config/aom_config.h"
typedef union {
uint8_t u8[16];
......
......@@ -15,7 +15,8 @@
#include <stdio.h>
#include <stdlib.h>
#include "./v128_intrinsics_c.h"
#include "./aom_config.h"
#include "config/aom_config.h"
typedef union {
uint8_t u8[32];
......
......@@ -17,7 +17,8 @@
#include <stdio.h>
#include <stdlib.h>
#include "./aom_config.h"
#include "config/aom_config.h"
typedef union {
uint8_t u8[8];
......
......@@ -18,7 +18,8 @@
extern "C" {
#endif
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom_scale/yv12config.h"
// metrics used for calculating ssim, ssim2, dssim, and ssimc
......
......@@ -11,7 +11,8 @@
#include <stdlib.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
......
......@@ -12,7 +12,8 @@
#include <stdlib.h>
#include <string.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
......
......@@ -12,7 +12,7 @@
#ifndef AOM_DSP_VARIANCE_H_
#define AOM_DSP_VARIANCE_H_
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
......
......@@ -9,7 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/x86/convolve.h"
......
......@@ -14,7 +14,7 @@
#include <immintrin.h>
#include "./aom_config.h"
#include "config/aom_config.h"
// Note: in and out could have the same value
static INLINE void mm256_transpose_16x16(const __m256i *in, __m256i *out) {
......
......@@ -13,7 +13,8 @@
#include <assert.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
#include "aom_ports/mem.h"
#include "aom_dsp/aom_convolve.h"
......
......@@ -11,7 +11,8 @@
#include <emmintrin.h> // SSE2
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/aom_dsp_common.h"
#include "aom_dsp/x86/fwd_txfm_sse2.h"
......
......@@ -11,7 +11,8 @@
#include <assert.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
......
......@@ -13,7 +13,8 @@
#include <emmintrin.h>
#include <stddef.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
typedef void (*SubtractWxHFuncType)(int16_t *diff, ptrdiff_t diff_stride,
......
......@@ -12,7 +12,8 @@
#include <assert.h>
#include <emmintrin.h> // SSE2
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/x86/synonyms.h"
......
......@@ -11,7 +11,8 @@
#include <smmintrin.h> /* SSE4.1 */
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/variance.h"
......
......@@ -13,7 +13,8 @@
#include <emmintrin.h> // SSE2
#include <tmmintrin.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/x86/synonyms.h"
......
......@@ -13,7 +13,8 @@
#include <emmintrin.h> // SSE2
#include <tmmintrin.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/x86/synonyms.h"
......
......@@ -14,7 +14,7 @@
#include <emmintrin.h> // SSE2
#include "./aom_config.h"
#include "config/aom_config.h"
static INLINE void highbd_transpose6x6_sse2(__m128i *x0, __m128i *x1,
__m128i *x2, __m128i *x3,
......
......@@ -12,7 +12,8 @@
#include <stdio.h>
#include <tmmintrin.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/blend.h"
#include "aom/aom_integer.h"
......
......@@ -13,7 +13,8 @@
#include <string.h>
#include <tmmintrin.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
#include "aom_dsp/aom_filter.h"
......
......@@ -16,7 +16,8 @@
#include <string.h>
#include <tmmintrin.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "aom_dsp/blend.h"
......
......@@ -14,7 +14,8 @@
#include <emmintrin.h> // SSE2
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom/aom_integer.h"
static INLINE __m128i loadh_epi64(const void *const src, const __m128i s) {
......
......@@ -14,7 +14,7 @@
#include <immintrin.h>
#include "./aom_config.h"
#include "config/aom_config.h"
static INLINE int32_t xx_hsum_epi32_si32(__m128i v_d) {
v_d = _mm_hadd_epi32(v_d, v_d);
......
......@@ -12,7 +12,8 @@
#include <assert.h>
#include <immintrin.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom_ports/mem.h"
#include "aom/aom_integer.h"
......
......@@ -12,7 +12,8 @@
#include <assert.h>
#include <immintrin.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "aom_ports/mem.h"
#include "aom/aom_integer.h"
......
......@@ -11,7 +11,8 @@
#include <immintrin.h>
#include "./aom_config.h"
#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"</