Commit 1a7d25a4 authored by Attila Nagy's avatar Attila Nagy
Browse files

Replace vpx_ports/config.h with vpx_config.h

Just a clean-up.

Change-Id: Iea5b6dc925dcfa7db548bc1ab1a13d26ed5a2c9a
parent e529a825
...@@ -16,7 +16,7 @@ UTILS-$(CONFIG_DECODERS) += vpxdec.c ...@@ -16,7 +16,7 @@ UTILS-$(CONFIG_DECODERS) += vpxdec.c
vpxdec.SRCS += md5_utils.c md5_utils.h vpxdec.SRCS += md5_utils.c md5_utils.h
vpxdec.SRCS += vpx_ports/vpx_timer.h vpxdec.SRCS += vpx_ports/vpx_timer.h
vpxdec.SRCS += vpx/vpx_integer.h vpxdec.SRCS += vpx/vpx_integer.h
vpxdec.SRCS += args.c args.h vpx_ports/config.h vpxdec.SRCS += args.c args.h
vpxdec.SRCS += tools_common.c tools_common.h vpxdec.SRCS += tools_common.c tools_common.h
vpxdec.SRCS += nestegg/halloc/halloc.h vpxdec.SRCS += nestegg/halloc/halloc.h
vpxdec.SRCS += nestegg/halloc/src/align.h vpxdec.SRCS += nestegg/halloc/src/align.h
...@@ -30,7 +30,7 @@ vpxdec.DESCRIPTION = Full featured decoder ...@@ -30,7 +30,7 @@ vpxdec.DESCRIPTION = Full featured decoder
UTILS-$(CONFIG_ENCODERS) += vpxenc.c UTILS-$(CONFIG_ENCODERS) += vpxenc.c
vpxenc.SRCS += args.c args.h y4minput.c y4minput.h vpxenc.SRCS += args.c args.h y4minput.c y4minput.h
vpxenc.SRCS += tools_common.c tools_common.h vpxenc.SRCS += tools_common.c tools_common.h
vpxenc.SRCS += vpx_ports/config.h vpx_ports/mem_ops.h vpxenc.SRCS += vpx_ports/mem_ops.h
vpxenc.SRCS += vpx_ports/mem_ops_aligned.h vpxenc.SRCS += vpx_ports/mem_ops_aligned.h
vpxenc.SRCS += libmkv/EbmlIDs.h vpxenc.SRCS += libmkv/EbmlIDs.h
vpxenc.SRCS += libmkv/EbmlWriter.c vpxenc.SRCS += libmkv/EbmlWriter.c
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "blockd.h" #include "blockd.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "onyxc_int.h" #include "onyxc_int.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vpx_ports/arm.h" #include "vpx_ports/arm.h"
#include "vp8/common/g_common.h" #include "vp8/common/g_common.h"
#include "vp8/common/pragmas.h" #include "vp8/common/pragmas.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include <math.h> #include <math.h>
#include "vp8/common/filter.h" #include "vp8/common/filter.h"
#include "vp8/common/subpixel.h" #include "vp8/common/subpixel.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/recon.h" #include "vp8/common/recon.h"
#include "vp8/common/blockd.h" #include "vp8/common/blockd.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/blockd.h" #include "vp8/common/blockd.h"
#include "vp8/common/reconintra.h" #include "vp8/common/reconintra.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
void vpx_log(const char *format, ...); void vpx_log(const char *format, ...);
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "mv.h" #include "mv.h"
#include "treecoder.h" #include "treecoder.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/g_common.h" #include "vp8/common/g_common.h"
#include "vp8/common/subpixel.h" #include "vp8/common/subpixel.h"
#include "vp8/common/loopfilter.h" #include "vp8/common/loopfilter.h"
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef __INC_INVTRANS_H #ifndef __INC_INVTRANS_H
#define __INC_INVTRANS_H #define __INC_INVTRANS_H
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "idct.h" #include "idct.h"
#include "blockd.h" #include "blockd.h"
extern void vp8_inverse_transform_b(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch); extern void vp8_inverse_transform_b(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch);
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "postproc.h" #include "postproc.h"
#include "vpx_scale/yv12extend.h" #include "vpx_scale/yv12extend.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "recon.h" #include "recon.h"
#include "blockd.h" #include "blockd.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "recon.h" #include "recon.h"
#include "subpixel.h" #include "subpixel.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "recon.h" #include "recon.h"
#include "reconintra.h" #include "reconintra.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "recon.h" #include "recon.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "reconintra.h" #include "reconintra.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#if ARCH_X86 || ARCH_X86_64 #if ARCH_X86 || ARCH_X86_64
void vpx_reset_mmx_state(void); void vpx_reset_mmx_state(void);
#define vp8_clear_system_state() vpx_reset_mmx_state() #define vp8_clear_system_state() vpx_reset_mmx_state()
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/recon.h" #include "vp8/common/recon.h"
#include "recon_x86.h" #include "recon_x86.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vp8/common/subpixel.h" #include "vp8/common/subpixel.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vpx_ports/arm.h" #include "vpx_ports/arm.h"
#include "vp8/common/blockd.h" #include "vp8/common/blockd.h"
#include "vp8/common/pragmas.h" #include "vp8/common/pragmas.h"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "vp8/decoder/dequantize.h" #include "vp8/decoder/dequantize.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/decoder/dequantize.h" #include "vp8/decoder/dequantize.h"
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "vp8/decoder/dequantize.h" #include "vp8/decoder/dequantize.h"
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#define DBOOLHUFF_H #define DBOOLHUFF_H
#include <stddef.h> #include <stddef.h>
#include <limits.h> #include <limits.h>
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "dequantize.h" #include "dequantize.h"
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/decoder/dequantize.h" #include "vp8/decoder/dequantize.h"
#include "vp8/decoder/onyxd_int.h" #include "vp8/decoder/onyxd_int.h"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "dequantize.h" #include "dequantize.h"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#ifndef __INC_VP8D_INT_H #ifndef __INC_VP8D_INT_H
#define __INC_VP8D_INT_H #define __INC_VP8D_INT_H
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/onyxd.h" #include "vp8/common/onyxd.h"
#include "treereader.h" #include "treereader.h"
#include "vp8/common/onyxc_int.h" #include "vp8/common/onyxc_int.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/recon.h" #include "vp8/common/recon.h"
#include "vp8/common/reconintra.h" #include "vp8/common/reconintra.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "vp8/decoder/dequantize.h" #include "vp8/decoder/dequantize.h"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "vp8/decoder/dequantize.h" #include "vp8/decoder/dequantize.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vpx_ports/x86.h" #include "vpx_ports/x86.h"
#include "vp8/decoder/onyxd_int.h" #include "vp8/decoder/onyxd_int.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vpx_ports/arm.h" #include "vpx_ports/arm.h"
#include "vp8/encoder/variance.h" #include "vp8/encoder/variance.h"
#include "vp8/encoder/onyx_int.h" #include "vp8/encoder/onyx_int.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "encodemb.h" #include "encodemb.h"
#include "encodemv.h" #include "encodemv.h"
#include "vp8/common/common.h" #include "vp8/common/common.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "quantize.h" #include "quantize.h"
#include "vp8/common/reconintra.h" #include "vp8/common/reconintra.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "encodemb.h" #include "encodemb.h"
#include "vp8/common/reconinter.h" #include "vp8/common/reconinter.h"
#include "quantize.h" #include "quantize.h"
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef __INC_ENCODEMB_H #ifndef __INC_ENCODEMB_H
#define __INC_ENCODEMB_H #define __INC_ENCODEMB_H
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "block.h" #include "block.h"
#define prototype_mberr(sym) \ #define prototype_mberr(sym) \
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/encoder/variance.h" #include "vp8/encoder/variance.h"
#include "vp8/encoder/onyx_int.h" #include "vp8/encoder/onyx_int.h"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "mcomp.h" #include "mcomp.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/config.h" #include "vpx_config.h"
#include <stdio.h> #include <stdio.h>
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#define __INC_VP8_INT_H #define __INC_VP8_INT_H
#include <stdio.h> #include <stdio.h>
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/onyx.h" #include "vp8/common/onyx.h"
#include "treewriter.h" #include "treewriter.h"
#include "tokenize.h" #include "tokenize.h"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <limits.h> #include <limits.h>
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "onyx_int.h" #include "onyx_int.h"
#include "modecosts.h" #include "modecosts.h"
#include "encodeintra.h" #include "encodeintra.h"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#ifndef __INC_PICKINTER_H #ifndef __INC_PICKINTER_H
#define __INC_PICKINTER_H #define __INC_PICKINTER_H
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vp8/common/onyxc_int.h" #include "vp8/common/onyxc_int.h"
extern void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra); extern void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra);
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
unsigned int vp8_sad16x16_c( unsigned int vp8_sad16x16_c(
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_config.h"
#include "vpx_ports/x86.h" #include "vpx_ports/x86.h"