Commit 02321de0 authored by John Koleszar's avatar John Koleszar Committed by Johann

Fix relative include paths

Allow compiling without adding vp8/{common,encoder,decoder} to the
include paths.

Change-Id: Ifeb5dac351cdfadcd659736f5158b315a0030b6c
parent 7d8199f0
......@@ -11,13 +11,13 @@
#include "vpx_ports/config.h"
#include "vpx_ports/arm.h"
#include "g_common.h"
#include "pragmas.h"
#include "subpixel.h"
#include "loopfilter.h"
#include "recon.h"
#include "idct.h"
#include "onyxc_int.h"
#include "vp8/common/g_common.h"
#include "vp8/common/pragmas.h"
#include "vp8/common/subpixel.h"
#include "vp8/common/loopfilter.h"
#include "vp8/common/recon.h"
#include "vp8/common/idct.h"
#include "vp8/common/onyxc_int.h"
extern void (*vp8_build_intra_predictors_mby_ptr)(MACROBLOCKD *x);
extern void vp8_build_intra_predictors_mby(MACROBLOCKD *x);
......
......@@ -10,9 +10,9 @@
#include <math.h>
#include "filter.h"
#include "subpixel.h"
#include "arm/bilinearfilter_arm.h"
#include "vp8/common/filter.h"
#include "vp8/common/subpixel.h"
#include "bilinearfilter_arm.h"
void vp8_filter_block2d_bil_armv6
(
......
......@@ -11,8 +11,8 @@
#include "vpx_ports/config.h"
#include <math.h>
#include "filter.h"
#include "subpixel.h"
#include "vp8/common/filter.h"
#include "vp8/common/subpixel.h"
#include "vpx_ports/mem.h"
extern void vp8_filter_block2d_first_pass_armv6
......
......@@ -11,8 +11,8 @@
#include "vpx_ports/config.h"
#include <math.h>
#include "loopfilter.h"
#include "onyxc_int.h"
#include "vp8/common/loopfilter.h"
#include "vp8/common/onyxc_int.h"
extern prototype_loopfilter(vp8_loop_filter_horizontal_edge_armv6);
extern prototype_loopfilter(vp8_loop_filter_vertical_edge_armv6);
......
......@@ -10,8 +10,8 @@
#include "vpx_ports/config.h"
#include "recon.h"
#include "blockd.h"
#include "vp8/common/recon.h"
#include "vp8/common/blockd.h"
extern void vp8_recon16x16mb_neon(unsigned char *pred_ptr, short *diff_ptr, unsigned char *dst_ptr, int ystride, unsigned char *udst_ptr, unsigned char *vdst_ptr);
......
......@@ -10,10 +10,10 @@
#include "vpx_ports/config.h"
#include "blockd.h"
#include "reconintra.h"
#include "vp8/common/blockd.h"
#include "vp8/common/reconintra.h"
#include "vpx_mem/vpx_mem.h"
#include "recon.h"
#include "vp8/common/recon.h"
#if HAVE_ARMV7
extern void vp8_build_intra_predictors_mby_neon_func(
......
......@@ -10,12 +10,12 @@
#include "vpx_ports/config.h"
#include "g_common.h"
#include "subpixel.h"
#include "loopfilter.h"
#include "recon.h"
#include "idct.h"
#include "onyxc_int.h"
#include "vp8/common/g_common.h"
#include "vp8/common/subpixel.h"
#include "vp8/common/loopfilter.h"
#include "vp8/common/recon.h"
#include "vp8/common/idct.h"
#include "vp8/common/onyxc_int.h"
extern void vp8_arch_x86_common_init(VP8_COMMON *ctx);
extern void vp8_arch_arm_common_init(VP8_COMMON *ctx);
......
......@@ -10,7 +10,7 @@
#include "vpx_ports/config.h"
#include "loopfilter.h"
#include "vp8/common/loopfilter.h"
prototype_loopfilter(vp8_loop_filter_horizontal_edge_c);
prototype_loopfilter(vp8_loop_filter_vertical_edge_c);
......
......@@ -11,7 +11,7 @@
#include "vpx_ports/config.h"
#include "vpx_ports/mem.h"
#include "subpixel.h"
#include "vp8/common/subpixel.h"
extern const short vp8_six_tap_mmx[8][6*8];
extern const short vp8_bilinear_filters_mmx[8][2*8];
......
......@@ -11,13 +11,13 @@
#include "vpx_ports/config.h"
#include "vpx_ports/x86.h"
#include "g_common.h"
#include "subpixel.h"
#include "loopfilter.h"
#include "recon.h"
#include "idct.h"
#include "pragmas.h"
#include "onyxc_int.h"
#include "vp8/common/g_common.h"
#include "vp8/common/subpixel.h"
#include "vp8/common/loopfilter.h"
#include "vp8/common/recon.h"
#include "vp8/common/idct.h"
#include "vp8/common/pragmas.h"
#include "vp8/common/onyxc_int.h"
void vp8_arch_x86_common_init(VP8_COMMON *ctx)
{
......
......@@ -11,11 +11,11 @@
#include "vpx_ports/config.h"
#include "vpx_ports/arm.h"
#include "blockd.h"
#include "pragmas.h"
#include "postproc.h"
#include "dequantize.h"
#include "onyxd_int.h"
#include "vp8/common/blockd.h"
#include "vp8/common/pragmas.h"
#include "vp8/common/postproc.h"
#include "vp8/decoder/dequantize.h"
#include "vp8/decoder/onyxd_int.h"
void vp8_arch_arm_decode_init(VP8D_COMP *pbi)
{
......
......@@ -9,8 +9,8 @@
*/
#include "vpx_ports/config.h"
#include "idct.h"
#include "dequantize.h"
#include "vp8/common/idct.h"
#include "vp8/decoder/dequantize.h"
void vp8_dequant_dc_idct_add_y_block_v6
(short *q, short *dq, unsigned char *pre,
......
......@@ -10,9 +10,9 @@
#include "vpx_ports/config.h"
#include "dequantize.h"
#include "predictdc.h"
#include "idct.h"
#include "vp8/decoder/dequantize.h"
#include "vp8/common/predictdc.h"
#include "vp8/common/idct.h"
#include "vpx_mem/vpx_mem.h"
#if HAVE_ARMV7
......
......@@ -9,8 +9,8 @@
*/
#include "vpx_ports/config.h"
#include "idct.h"
#include "dequantize.h"
#include "vp8/common/idct.h"
#include "vp8/decoder/dequantize.h"
/* place these declarations here because we don't want to maintain them
* outside of this scope
......
......@@ -10,10 +10,10 @@
#include "treereader.h"
#include "entropymv.h"
#include "entropymode.h"
#include "vp8/common/entropymv.h"
#include "vp8/common/entropymode.h"
#include "onyxd_int.h"
#include "findnearmv.h"
#include "vp8/common/findnearmv.h"
#if CONFIG_DEBUG
#include <assert.h>
......
......@@ -10,28 +10,28 @@
#include "onyxd_int.h"
#include "header.h"
#include "reconintra.h"
#include "reconintra4x4.h"
#include "recon.h"
#include "reconinter.h"
#include "vp8/common/header.h"
#include "vp8/common/reconintra.h"
#include "vp8/common/reconintra4x4.h"
#include "vp8/common/recon.h"
#include "vp8/common/reconinter.h"
#include "dequantize.h"
#include "detokenize.h"
#include "invtrans.h"
#include "alloccommon.h"
#include "entropymode.h"
#include "quant_common.h"
#include "vp8/common/invtrans.h"
#include "vp8/common/alloccommon.h"
#include "vp8/common/entropymode.h"
#include "vp8/common/quant_common.h"
#include "vpx_scale/vpxscale.h"
#include "vpx_scale/yv12extend.h"
#include "setupintrarecon.h"
#include "vp8/common/setupintrarecon.h"
#include "decodemv.h"
#include "extend.h"
#include "vp8/common/extend.h"
#include "vpx_mem/vpx_mem.h"
#include "idct.h"
#include "vp8/common/idct.h"
#include "dequantize.h"
#include "predictdc.h"
#include "threading.h"
#include "vp8/common/predictdc.h"
#include "vp8/common/threading.h"
#include "decoderthreading.h"
#include "dboolhuff.h"
......
......@@ -11,8 +11,8 @@
#include "vpx_ports/config.h"
#include "dequantize.h"
#include "predictdc.h"
#include "idct.h"
#include "vp8/common/predictdc.h"
#include "vp8/common/idct.h"
#include "vpx_mem/vpx_mem.h"
extern void vp8_short_idct4x4llm_c(short *input, short *output, int pitch) ;
......
......@@ -11,7 +11,7 @@
#ifndef DEQUANTIZE_H
#define DEQUANTIZE_H
#include "blockd.h"
#include "vp8/common/blockd.h"
#define prototype_dequant_block(sym) \
void sym(BLOCKD *x)
......
......@@ -9,8 +9,8 @@
*/
#include "type_aliases.h"
#include "blockd.h"
#include "vp8/common/type_aliases.h"
#include "vp8/common/blockd.h"
#include "onyxd_int.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
......
......@@ -10,8 +10,8 @@
#include "vpx_ports/config.h"
#include "dequantize.h"
#include "onyxd_int.h"
#include "vp8/decoder/dequantize.h"
#include "vp8/decoder/onyxd_int.h"
extern void vp8_arch_x86_decode_init(VP8D_COMP *pbi);
extern void vp8_arch_arm_decode_init(VP8D_COMP *pbi);
......
......@@ -9,7 +9,7 @@
*/
#include "vpx_ports/config.h"
#include "idct.h"
#include "vp8/common/idct.h"
#include "dequantize.h"
void vp8_dequant_dc_idct_add_c(short *input, short *dq, unsigned char *pred,
......
......@@ -9,25 +9,25 @@
*/
#include "onyxc_int.h"
#include "vp8/common/onyxc_int.h"
#if CONFIG_POSTPROC
#include "postproc.h"
#include "vp8/common/postproc.h"
#endif
#include "onyxd.h"
#include "vp8/common/onyxd.h"
#include "onyxd_int.h"
#include "vpx_mem/vpx_mem.h"
#include "alloccommon.h"
#include "vp8/common/alloccommon.h"
#include "vpx_scale/yv12extend.h"
#include "loopfilter.h"
#include "swapyv12buffer.h"
#include "g_common.h"
#include "threading.h"
#include "vp8/common/loopfilter.h"
#include "vp8/common/swapyv12buffer.h"
#include "vp8/common/g_common.h"
#include "vp8/common/threading.h"
#include "decoderthreading.h"
#include <stdio.h>
#include "quant_common.h"
#include "vp8/common/quant_common.h"
#include "vpx_scale/vpxscale.h"
#include "systemdependent.h"
#include "vp8/common/systemdependent.h"
#include "vpx_ports/vpx_timer.h"
#include "detokenize.h"
#if ARCH_ARM
......
......@@ -12,10 +12,10 @@
#ifndef __INC_VP8D_INT_H
#define __INC_VP8D_INT_H
#include "vpx_ports/config.h"
#include "onyxd.h"
#include "vp8/common/onyxd.h"
#include "treereader.h"
#include "onyxc_int.h"
#include "threading.h"
#include "vp8/common/onyxc_int.h"
#include "vp8/common/threading.h"
#include "dequantize.h"
typedef struct
......
......@@ -10,8 +10,8 @@
#include "vpx_ports/config.h"
#include "recon.h"
#include "reconintra.h"
#include "vp8/common/recon.h"
#include "vp8/common/reconintra.h"
#include "vpx_mem/vpx_mem.h"
#include "onyxd_int.h"
......
......@@ -17,13 +17,13 @@
#endif
#include "onyxd_int.h"
#include "vpx_mem/vpx_mem.h"
#include "threading.h"
#include "vp8/common/threading.h"
#include "loopfilter.h"
#include "extend.h"
#include "vp8/common/loopfilter.h"
#include "vp8/common/extend.h"
#include "vpx_ports/vpx_timer.h"
#include "detokenize.h"
#include "reconinter.h"
#include "vp8/common/reconinter.h"
#include "reconintra_mt.h"
extern void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd);
......
......@@ -12,7 +12,7 @@
#ifndef tree_reader_h
#define tree_reader_h 1
#include "treecoder.h"
#include "vp8/common/treecoder.h"
#include "dboolhuff.h"
......
......@@ -9,8 +9,8 @@
*/
#include "vpx_ports/config.h"
#include "idct.h"
#include "dequantize.h"
#include "vp8/common/idct.h"
#include "vp8/decoder/dequantize.h"
void vp8_dequant_dc_idct_add_y_block_mmx
(short *q, short *dq, unsigned char *pre,
......
......@@ -9,8 +9,8 @@
*/
#include "vpx_ports/config.h"
#include "idct.h"
#include "dequantize.h"
#include "vp8/common/idct.h"
#include "vp8/decoder/dequantize.h"
void idct_dequant_dc_0_2x_sse2
(short *q, short *dq, unsigned char *pre,
......
......@@ -21,19 +21,19 @@
* Header Files
****************************************************************************/
#include <math.h> // For Abs()
#include "pragmas.h"
#include "vp8/common/pragmas.h"
#include "vpxdxv.h"
#include "vpxdxv_plugin.h"
#include "onyxd_int.h"
#include "onyx.h"
#include "codec_common_interface.h"
#include "vp8/decoder/onyxd_int.h"
#include "vp8/common/onyx.h"
#include "vp8/common/codec_common_interface.h"
#include "vpx_scale/vpxscale.h"
#include "vpx_mem/vpx_mem.h"
#include "postproc.h"
#include "vpxblit.h"
#include "g_common.h"
#include "vp8/common/postproc.h"
#include "vp8/common/vpxblit.h"
#include "vp8/common/g_common.h"
#include "vpx_scale/yv12extend.h"
#include <limits.h>
......
......@@ -11,7 +11,7 @@
#include "vpx_ports/config.h"
#include "vpx_ports/x86.h"
#include "onyxd_int.h"
#include "vp8/decoder/onyxd_int.h"
#if HAVE_MMX
......
......@@ -11,8 +11,8 @@
#include "vpx_ports/config.h"
#include "vpx_ports/arm.h"
#include "variance.h"
#include "onyx_int.h"
#include "vp8/encoder/variance.h"
#include "vp8/encoder/onyx_int.h"
extern void (*vp8_yv12_copy_partial_frame_ptr)(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction);
extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction);
......
......@@ -9,8 +9,8 @@
*/
#include "boolhuff.h"
#include "blockd.h"
#include "vp8/encoder/boolhuff.h"
#include "vp8/common/blockd.h"
const unsigned int vp8_prob_cost[256] =
{
......
......@@ -9,13 +9,13 @@
*/
#include "encodemb.h"
#include "reconinter.h"
#include "quantize.h"
#include "invtrans.h"
#include "recon.h"
#include "reconintra.h"
#include "dct.h"
#include "vp8/encoder/encodemb.h"
#include "vp8/common/reconinter.h"
#include "vp8/encoder/quantize.h"
#include "vp8/common/invtrans.h"
#include "vp8/common/recon.h"
#include "vp8/common/reconintra.h"
#include "vp8/encoder/dct.h"
#include "vpx_mem/vpx_mem.h"
extern void vp8_subtract_b_neon_func(short *diff, unsigned char *src, unsigned char *pred, int stride, int pitch);
......
......@@ -9,13 +9,13 @@
*/
#include "onyxc_int.h"
#include "onyx_int.h"
#include "quantize.h"
#include "vp8/common/onyxc_int.h"
#include "vp8/encoder/onyx_int.h"
#include "vp8/encoder/quantize.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_scale/yv12extend.h"
#include "vpx_scale/vpxscale.h"
#include "alloccommon.h"
#include "vp8/common/alloccommon.h"
extern void vp8_memcpy_neon(unsigned char *dst_ptr, unsigned char *src_ptr, int sz);
......
......@@ -12,9 +12,9 @@
#include <math.h>
#include "vpx_mem/vpx_mem.h"
#include "quantize.h"
#include "entropy.h"
#include "predictdc.h"
#include "vp8/encoder/quantize.h"
#include "vp8/common/entropy.h"
#include "vp8/common/predictdc.h"
DECLARE_ALIGNED(16, const short, vp8_rvsplus1_default_zig_zag1d[16]) =
{
......
......@@ -9,9 +9,9 @@
*/
#include "vpx_config.h"
#include "variance.h"
#include "filter.h"
#include "arm/bilinearfilter_arm.h"
#include "vp8/encoder/variance.h"
#include "vp8/common/filter.h"
#include "vp8/common/arm/bilinearfilter_arm.h"
#if HAVE_ARMV6
......
......@@ -9,15 +9,15 @@
*/
#include "header.h"
#include "vp8/common/header.h"
#include "encodemv.h"
#include "entropymode.h"
#include "findnearmv.h"
#include "vp8/common/entropymode.h"
#include "vp8/common/findnearmv.h"
#include "mcomp.h"
#include "systemdependent.h"
#include "vp8/common/systemdependent.h"
#include <assert.h>
#include <stdio.h>
#include "pragmas.h"
#include "vp8/common/pragmas.h"
#include "vpx_mem/vpx_mem.h"
#include "bitstream.h"
......
......@@ -12,10 +12,10 @@
#ifndef __INC_BLOCK_H
#define __INC_BLOCK_H
#include "onyx.h"
#include "blockd.h"
#include "entropymv.h"
#include "entropy.h"
#include "vp8/common/onyx.h"
#include "vp8/common/blockd.h"
#include "vp8/common/entropymv.h"
#include "vp8/common/entropy.h"
#include "vpx_ports/mem.h"
// motion search site
......
......@@ -10,7 +10,7 @@
#include "boolhuff.h"
#include "blockd.h"
#include "vp8/common/blockd.h"
......
......@@ -12,22 +12,22 @@
#include "vpx_ports/config.h"
#include "encodemb.h"
#include "encodemv.h"
#include "common.h"
#include "vp8/common/common.h"
#include "onyx_int.h"
#include "extend.h"
#include "entropymode.h"
#include "quant_common.h"
#include "vp8/common/extend.h"
#include "vp8/common/entropymode.h"
#include "vp8/common/quant_common.h"
#include "segmentation.h"
#include "setupintrarecon.h"
#include "vp8/common/setupintrarecon.h"
#include "encodeintra.h"
#include "reconinter.h"
#include "vp8/common/reconinter.h"
#include "rdopt.h"
#include "pickinter.h"
#include "findnearmv.h"
#include "reconintra.h"
#include "vp8/common/findnearmv.h"
#include "vp8/common/reconintra.h"
#include <stdio.h>
#include <limits.h>
#include "subpixel.h"
#include "vp8/common/subpixel.h"
#include "vpx_ports/vpx_timer.h"
#if CONFIG_RUNTIME_CPU_DETECT
......
......@@ -10,15 +10,15 @@
#include "vpx_ports/config.h"
#include "idct.h"
#include "vp8/common/idct.h"
#include "quantize.h"
#include "reconintra.h"
#include "reconintra4x4.h"
#include "vp8/common/reconintra.h"
#include "vp8/common/reconintra4x4.h"
#include "encodemb.h"
#include "invtrans.h"
#include "recon.h"
#include "vp8/common/invtrans.h"
#include "vp8/common/recon.h"
#include "dct.h"
#include "g_common.h"
#include "vp8/common/g_common.h"
#include "encodeintra.h"
#define intra4x4ibias_rate 128
......
......@@ -11,12 +11,12 @@
#include "vpx_ports/config.h"
#include "encodemb.h"
#include "reconinter.h"
#include "vp8/common/reconinter.h"
#include "quantize.h"
#include "tokenize.h"
#include "invtrans.h"
#include "recon.h"
#include "reconintra.h"
#include "vp8/common/invtrans.h"
#include "vp8/common/recon.h"
#include "vp8/common/reconintra.h"
#include "dct.h"
#include "vpx_mem/vpx_mem.h"
......
......@@ -9,10 +9,10 @@
*/
#include "common.h"
#include "vp8/common/common.h"
#include "encodemv.h"
#include "entropymode.h"
#include "systemdependent.h"
#include "vp8/common/entropymode.h"
#include "vp8/common/systemdependent.h"
#include <math.h>
......
......@@ -9,9 +9,9 @@
*/
#include "onyx_int.h"
#include "threading.h"
#include "common.h"
#include "extend.h"
#include "vp8/common/threading.h"
#include "vp8/common/common.h"
#include "vp8/common/extend.h"
#if CONFIG_MULTITHREAD
......
......@@ -14,18 +14,18 @@
#include "onyx_int.h"
#include "variance.h"
#include "encodeintra.h"
#include "setupintrarecon.h"
#include "vp8/common/setupintrarecon.h"
#include "mcomp.h"
#include "vpx_scale/vpxscale.h"
#include "encodemb.h"
#include "extend.h"
#include "systemdependent.h"
#include "vp8/common/extend.h"
#include "vp8/common/systemdependent.h"
#include "vpx_scale/yv12extend.h"
#include "vpx_mem/vpx_mem.h"
#include "swapyv12buffer.h"
#include "vp8/common/swapyv12buffer.h"
#include <stdio.h>
#include "rdopt.h"
#include "quant_common.h"
#include "vp8/common/quant_common.h"
#include "encodemv.h"
//#define OUTPUT_FPF 1
......
......@@ -10,8 +10,8 @@
#include "vpx_ports/config.h"
#include "variance.h"
#include "onyx_int.h"
#include "vp8/encoder/variance.h"
#include "vp8/encoder/onyx_int.h"