Merge "Fix relative include paths"

This commit is contained in:
John Koleszar 2011-02-17 04:13:44 -08:00 committed by Code Review
commit c351aa7f1b
70 changed files with 233 additions and 249 deletions

View File

@ -11,13 +11,13 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "vpx_ports/arm.h" #include "vpx_ports/arm.h"
#include "g_common.h" #include "vp8/common/g_common.h"
#include "pragmas.h" #include "vp8/common/pragmas.h"
#include "subpixel.h" #include "vp8/common/subpixel.h"
#include "loopfilter.h" #include "vp8/common/loopfilter.h"
#include "recon.h" #include "vp8/common/recon.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
extern void (*vp8_build_intra_predictors_mby_ptr)(MACROBLOCKD *x); extern void (*vp8_build_intra_predictors_mby_ptr)(MACROBLOCKD *x);
extern void vp8_build_intra_predictors_mby(MACROBLOCKD *x); extern void vp8_build_intra_predictors_mby(MACROBLOCKD *x);

View File

@ -10,9 +10,9 @@
#include <math.h> #include <math.h>
#include "filter.h" #include "vp8/common/filter.h"
#include "subpixel.h" #include "vp8/common/subpixel.h"
#include "arm/bilinearfilter_arm.h" #include "bilinearfilter_arm.h"
void vp8_filter_block2d_bil_armv6 void vp8_filter_block2d_bil_armv6
( (

View File

@ -11,8 +11,8 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include <math.h> #include <math.h>
#include "filter.h" #include "vp8/common/filter.h"
#include "subpixel.h" #include "vp8/common/subpixel.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
extern void vp8_filter_block2d_first_pass_armv6 extern void vp8_filter_block2d_first_pass_armv6

View File

@ -11,8 +11,8 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include <math.h> #include <math.h>
#include "loopfilter.h" #include "vp8/common/loopfilter.h"
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
extern prototype_loopfilter(vp8_loop_filter_horizontal_edge_armv6); extern prototype_loopfilter(vp8_loop_filter_horizontal_edge_armv6);
extern prototype_loopfilter(vp8_loop_filter_vertical_edge_armv6); extern prototype_loopfilter(vp8_loop_filter_vertical_edge_armv6);

View File

@ -10,8 +10,8 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "recon.h" #include "vp8/common/recon.h"
#include "blockd.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); 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);

View File

@ -10,10 +10,10 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "blockd.h" #include "vp8/common/blockd.h"
#include "reconintra.h" #include "vp8/common/reconintra.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "recon.h" #include "vp8/common/recon.h"
#if HAVE_ARMV7 #if HAVE_ARMV7
extern void vp8_build_intra_predictors_mby_neon_func( extern void vp8_build_intra_predictors_mby_neon_func(

View File

@ -10,12 +10,12 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "g_common.h" #include "vp8/common/g_common.h"
#include "subpixel.h" #include "vp8/common/subpixel.h"
#include "loopfilter.h" #include "vp8/common/loopfilter.h"
#include "recon.h" #include "vp8/common/recon.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
extern void vp8_arch_x86_common_init(VP8_COMMON *ctx); extern void vp8_arch_x86_common_init(VP8_COMMON *ctx);
extern void vp8_arch_arm_common_init(VP8_COMMON *ctx); extern void vp8_arch_arm_common_init(VP8_COMMON *ctx);

View File

@ -10,7 +10,7 @@
#include "vpx_ports/config.h" #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_horizontal_edge_c);
prototype_loopfilter(vp8_loop_filter_vertical_edge_c); prototype_loopfilter(vp8_loop_filter_vertical_edge_c);

View File

@ -11,7 +11,7 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "vpx_ports/mem.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_six_tap_mmx[8][6*8];
extern const short vp8_bilinear_filters_mmx[8][2*8]; extern const short vp8_bilinear_filters_mmx[8][2*8];

View File

@ -11,13 +11,13 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "vpx_ports/x86.h" #include "vpx_ports/x86.h"
#include "g_common.h" #include "vp8/common/g_common.h"
#include "subpixel.h" #include "vp8/common/subpixel.h"
#include "loopfilter.h" #include "vp8/common/loopfilter.h"
#include "recon.h" #include "vp8/common/recon.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "pragmas.h" #include "vp8/common/pragmas.h"
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
void vp8_arch_x86_common_init(VP8_COMMON *ctx) void vp8_arch_x86_common_init(VP8_COMMON *ctx)
{ {

View File

@ -11,11 +11,11 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "vpx_ports/arm.h" #include "vpx_ports/arm.h"
#include "blockd.h" #include "vp8/common/blockd.h"
#include "pragmas.h" #include "vp8/common/pragmas.h"
#include "postproc.h" #include "vp8/common/postproc.h"
#include "dequantize.h" #include "vp8/decoder/dequantize.h"
#include "onyxd_int.h" #include "vp8/decoder/onyxd_int.h"
void vp8_arch_arm_decode_init(VP8D_COMP *pbi) void vp8_arch_arm_decode_init(VP8D_COMP *pbi)
{ {

View File

@ -9,8 +9,8 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "dequantize.h" #include "vp8/decoder/dequantize.h"
void vp8_dequant_dc_idct_add_y_block_v6 void vp8_dequant_dc_idct_add_y_block_v6
(short *q, short *dq, unsigned char *pre, (short *q, short *dq, unsigned char *pre,

View File

@ -10,9 +10,9 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "dequantize.h" #include "vp8/decoder/dequantize.h"
#include "predictdc.h" #include "vp8/common/predictdc.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#if HAVE_ARMV7 #if HAVE_ARMV7

View File

@ -9,8 +9,8 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "dequantize.h" #include "vp8/decoder/dequantize.h"
/* place these declarations here because we don't want to maintain them /* place these declarations here because we don't want to maintain them
* outside of this scope * outside of this scope

View File

@ -10,10 +10,10 @@
#include "treereader.h" #include "treereader.h"
#include "entropymv.h" #include "vp8/common/entropymv.h"
#include "entropymode.h" #include "vp8/common/entropymode.h"
#include "onyxd_int.h" #include "onyxd_int.h"
#include "findnearmv.h" #include "vp8/common/findnearmv.h"
#if CONFIG_DEBUG #if CONFIG_DEBUG
#include <assert.h> #include <assert.h>

View File

@ -10,28 +10,28 @@
#include "onyxd_int.h" #include "onyxd_int.h"
#include "header.h" #include "vp8/common/header.h"
#include "reconintra.h" #include "vp8/common/reconintra.h"
#include "reconintra4x4.h" #include "vp8/common/reconintra4x4.h"
#include "recon.h" #include "vp8/common/recon.h"
#include "reconinter.h" #include "vp8/common/reconinter.h"
#include "dequantize.h" #include "dequantize.h"
#include "detokenize.h" #include "detokenize.h"
#include "invtrans.h" #include "vp8/common/invtrans.h"
#include "alloccommon.h" #include "vp8/common/alloccommon.h"
#include "entropymode.h" #include "vp8/common/entropymode.h"
#include "quant_common.h" #include "vp8/common/quant_common.h"
#include "vpx_scale/vpxscale.h" #include "vpx_scale/vpxscale.h"
#include "vpx_scale/yv12extend.h" #include "vpx_scale/yv12extend.h"
#include "setupintrarecon.h" #include "vp8/common/setupintrarecon.h"
#include "decodemv.h" #include "decodemv.h"
#include "extend.h" #include "vp8/common/extend.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "dequantize.h" #include "dequantize.h"
#include "predictdc.h" #include "vp8/common/predictdc.h"
#include "threading.h" #include "vp8/common/threading.h"
#include "decoderthreading.h" #include "decoderthreading.h"
#include "dboolhuff.h" #include "dboolhuff.h"

View File

@ -11,8 +11,8 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "dequantize.h" #include "dequantize.h"
#include "predictdc.h" #include "vp8/common/predictdc.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
extern void vp8_short_idct4x4llm_c(short *input, short *output, int pitch) ; extern void vp8_short_idct4x4llm_c(short *input, short *output, int pitch) ;

View File

@ -11,7 +11,7 @@
#ifndef DEQUANTIZE_H #ifndef DEQUANTIZE_H
#define DEQUANTIZE_H #define DEQUANTIZE_H
#include "blockd.h" #include "vp8/common/blockd.h"
#define prototype_dequant_block(sym) \ #define prototype_dequant_block(sym) \
void sym(BLOCKD *x) void sym(BLOCKD *x)

View File

@ -9,8 +9,8 @@
*/ */
#include "type_aliases.h" #include "vp8/common/type_aliases.h"
#include "blockd.h" #include "vp8/common/blockd.h"
#include "onyxd_int.h" #include "onyxd_int.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"

View File

@ -10,8 +10,8 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "dequantize.h" #include "vp8/decoder/dequantize.h"
#include "onyxd_int.h" #include "vp8/decoder/onyxd_int.h"
extern void vp8_arch_x86_decode_init(VP8D_COMP *pbi); extern void vp8_arch_x86_decode_init(VP8D_COMP *pbi);
extern void vp8_arch_arm_decode_init(VP8D_COMP *pbi); extern void vp8_arch_arm_decode_init(VP8D_COMP *pbi);

View File

@ -9,7 +9,7 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "dequantize.h" #include "dequantize.h"
void vp8_dequant_dc_idct_add_c(short *input, short *dq, unsigned char *pred, void vp8_dequant_dc_idct_add_c(short *input, short *dq, unsigned char *pred,

View File

@ -9,25 +9,25 @@
*/ */
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
#if CONFIG_POSTPROC #if CONFIG_POSTPROC
#include "postproc.h" #include "vp8/common/postproc.h"
#endif #endif
#include "onyxd.h" #include "vp8/common/onyxd.h"
#include "onyxd_int.h" #include "onyxd_int.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "alloccommon.h" #include "vp8/common/alloccommon.h"
#include "vpx_scale/yv12extend.h" #include "vpx_scale/yv12extend.h"
#include "loopfilter.h" #include "vp8/common/loopfilter.h"
#include "swapyv12buffer.h" #include "vp8/common/swapyv12buffer.h"
#include "g_common.h" #include "vp8/common/g_common.h"
#include "threading.h" #include "vp8/common/threading.h"
#include "decoderthreading.h" #include "decoderthreading.h"
#include <stdio.h> #include <stdio.h>
#include "quant_common.h" #include "vp8/common/quant_common.h"
#include "vpx_scale/vpxscale.h" #include "vpx_scale/vpxscale.h"
#include "systemdependent.h" #include "vp8/common/systemdependent.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#include "detokenize.h" #include "detokenize.h"
#if ARCH_ARM #if ARCH_ARM

View File

@ -12,10 +12,10 @@
#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_ports/config.h"
#include "onyxd.h" #include "vp8/common/onyxd.h"
#include "treereader.h" #include "treereader.h"
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
#include "threading.h" #include "vp8/common/threading.h"
#include "dequantize.h" #include "dequantize.h"
typedef struct typedef struct

View File

@ -10,8 +10,8 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "recon.h" #include "vp8/common/recon.h"
#include "reconintra.h" #include "vp8/common/reconintra.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "onyxd_int.h" #include "onyxd_int.h"

View File

@ -17,13 +17,13 @@
#endif #endif
#include "onyxd_int.h" #include "onyxd_int.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "threading.h" #include "vp8/common/threading.h"
#include "loopfilter.h" #include "vp8/common/loopfilter.h"
#include "extend.h" #include "vp8/common/extend.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#include "detokenize.h" #include "detokenize.h"
#include "reconinter.h" #include "vp8/common/reconinter.h"
#include "reconintra_mt.h" #include "reconintra_mt.h"
extern void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd); extern void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd);

View File

@ -12,7 +12,7 @@
#ifndef tree_reader_h #ifndef tree_reader_h
#define tree_reader_h 1 #define tree_reader_h 1
#include "treecoder.h" #include "vp8/common/treecoder.h"
#include "dboolhuff.h" #include "dboolhuff.h"

View File

@ -9,8 +9,8 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "dequantize.h" #include "vp8/decoder/dequantize.h"
void vp8_dequant_dc_idct_add_y_block_mmx void vp8_dequant_dc_idct_add_y_block_mmx
(short *q, short *dq, unsigned char *pre, (short *q, short *dq, unsigned char *pre,

View File

@ -9,8 +9,8 @@
*/ */
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "dequantize.h" #include "vp8/decoder/dequantize.h"
void idct_dequant_dc_0_2x_sse2 void idct_dequant_dc_0_2x_sse2
(short *q, short *dq, unsigned char *pre, (short *q, short *dq, unsigned char *pre,

View File

@ -21,19 +21,19 @@
* Header Files * Header Files
****************************************************************************/ ****************************************************************************/
#include <math.h> // For Abs() #include <math.h> // For Abs()
#include "pragmas.h" #include "vp8/common/pragmas.h"
#include "vpxdxv.h" #include "vpxdxv.h"
#include "vpxdxv_plugin.h" #include "vpxdxv_plugin.h"
#include "onyxd_int.h" #include "vp8/decoder/onyxd_int.h"
#include "onyx.h" #include "vp8/common/onyx.h"
#include "codec_common_interface.h" #include "vp8/common/codec_common_interface.h"
#include "vpx_scale/vpxscale.h" #include "vpx_scale/vpxscale.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "postproc.h" #include "vp8/common/postproc.h"
#include "vpxblit.h" #include "vp8/common/vpxblit.h"
#include "g_common.h" #include "vp8/common/g_common.h"
#include "vpx_scale/yv12extend.h" #include "vpx_scale/yv12extend.h"
#include <limits.h> #include <limits.h>

View File

@ -11,7 +11,7 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "vpx_ports/x86.h" #include "vpx_ports/x86.h"
#include "onyxd_int.h" #include "vp8/decoder/onyxd_int.h"
#if HAVE_MMX #if HAVE_MMX

View File

@ -11,8 +11,8 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "vpx_ports/arm.h" #include "vpx_ports/arm.h"
#include "variance.h" #include "vp8/encoder/variance.h"
#include "onyx_int.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_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); extern void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc, int Fraction);

View File

@ -9,8 +9,8 @@
*/ */
#include "boolhuff.h" #include "vp8/encoder/boolhuff.h"
#include "blockd.h" #include "vp8/common/blockd.h"
const unsigned int vp8_prob_cost[256] = const unsigned int vp8_prob_cost[256] =
{ {

View File

@ -9,13 +9,13 @@
*/ */
#include "encodemb.h" #include "vp8/encoder/encodemb.h"
#include "reconinter.h" #include "vp8/common/reconinter.h"
#include "quantize.h" #include "vp8/encoder/quantize.h"
#include "invtrans.h" #include "vp8/common/invtrans.h"
#include "recon.h" #include "vp8/common/recon.h"
#include "reconintra.h" #include "vp8/common/reconintra.h"
#include "dct.h" #include "vp8/encoder/dct.h"
#include "vpx_mem/vpx_mem.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); extern void vp8_subtract_b_neon_func(short *diff, unsigned char *src, unsigned char *pred, int stride, int pitch);

View File

@ -9,13 +9,13 @@
*/ */
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
#include "onyx_int.h" #include "vp8/encoder/onyx_int.h"
#include "quantize.h" #include "vp8/encoder/quantize.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_scale/yv12extend.h" #include "vpx_scale/yv12extend.h"
#include "vpx_scale/vpxscale.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); extern void vp8_memcpy_neon(unsigned char *dst_ptr, unsigned char *src_ptr, int sz);

View File

@ -12,9 +12,9 @@
#include <math.h> #include <math.h>
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "quantize.h" #include "vp8/encoder/quantize.h"
#include "entropy.h" #include "vp8/common/entropy.h"
#include "predictdc.h" #include "vp8/common/predictdc.h"
DECLARE_ALIGNED(16, const short, vp8_rvsplus1_default_zig_zag1d[16]) = DECLARE_ALIGNED(16, const short, vp8_rvsplus1_default_zig_zag1d[16]) =
{ {

View File

@ -9,9 +9,9 @@
*/ */
#include "vpx_config.h" #include "vpx_config.h"
#include "variance.h" #include "vp8/encoder/variance.h"
#include "filter.h" #include "vp8/common/filter.h"
#include "arm/bilinearfilter_arm.h" #include "vp8/common/arm/bilinearfilter_arm.h"
#if HAVE_ARMV6 #if HAVE_ARMV6

View File

@ -9,15 +9,15 @@
*/ */
#include "header.h" #include "vp8/common/header.h"
#include "encodemv.h" #include "encodemv.h"
#include "entropymode.h" #include "vp8/common/entropymode.h"
#include "findnearmv.h" #include "vp8/common/findnearmv.h"
#include "mcomp.h" #include "mcomp.h"
#include "systemdependent.h" #include "vp8/common/systemdependent.h"
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include "pragmas.h" #include "vp8/common/pragmas.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "bitstream.h" #include "bitstream.h"

View File

@ -12,10 +12,10 @@
#ifndef __INC_BLOCK_H #ifndef __INC_BLOCK_H
#define __INC_BLOCK_H #define __INC_BLOCK_H
#include "onyx.h" #include "vp8/common/onyx.h"
#include "blockd.h" #include "vp8/common/blockd.h"
#include "entropymv.h" #include "vp8/common/entropymv.h"
#include "entropy.h" #include "vp8/common/entropy.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
// motion search site // motion search site

View File

@ -10,7 +10,7 @@
#include "boolhuff.h" #include "boolhuff.h"
#include "blockd.h" #include "vp8/common/blockd.h"

View File

@ -12,22 +12,22 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "encodemb.h" #include "encodemb.h"
#include "encodemv.h" #include "encodemv.h"
#include "common.h" #include "vp8/common/common.h"
#include "onyx_int.h" #include "onyx_int.h"
#include "extend.h" #include "vp8/common/extend.h"
#include "entropymode.h" #include "vp8/common/entropymode.h"
#include "quant_common.h" #include "vp8/common/quant_common.h"
#include "segmentation.h" #include "segmentation.h"
#include "setupintrarecon.h" #include "vp8/common/setupintrarecon.h"
#include "encodeintra.h" #include "encodeintra.h"
#include "reconinter.h" #include "vp8/common/reconinter.h"
#include "rdopt.h" #include "rdopt.h"
#include "pickinter.h" #include "pickinter.h"
#include "findnearmv.h" #include "vp8/common/findnearmv.h"
#include "reconintra.h" #include "vp8/common/reconintra.h"
#include <stdio.h> #include <stdio.h>
#include <limits.h> #include <limits.h>
#include "subpixel.h" #include "vp8/common/subpixel.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT

View File

@ -10,15 +10,15 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "quantize.h" #include "quantize.h"
#include "reconintra.h" #include "vp8/common/reconintra.h"
#include "reconintra4x4.h" #include "vp8/common/reconintra4x4.h"
#include "encodemb.h" #include "encodemb.h"
#include "invtrans.h" #include "vp8/common/invtrans.h"
#include "recon.h" #include "vp8/common/recon.h"
#include "dct.h" #include "dct.h"
#include "g_common.h" #include "vp8/common/g_common.h"
#include "encodeintra.h" #include "encodeintra.h"
#define intra4x4ibias_rate 128 #define intra4x4ibias_rate 128

View File

@ -11,12 +11,12 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "encodemb.h" #include "encodemb.h"
#include "reconinter.h" #include "vp8/common/reconinter.h"
#include "quantize.h" #include "quantize.h"
#include "tokenize.h" #include "tokenize.h"
#include "invtrans.h" #include "vp8/common/invtrans.h"
#include "recon.h" #include "vp8/common/recon.h"
#include "reconintra.h" #include "vp8/common/reconintra.h"
#include "dct.h" #include "dct.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"

View File

@ -9,10 +9,10 @@
*/ */
#include "common.h" #include "vp8/common/common.h"
#include "encodemv.h" #include "encodemv.h"
#include "entropymode.h" #include "vp8/common/entropymode.h"
#include "systemdependent.h" #include "vp8/common/systemdependent.h"
#include <math.h> #include <math.h>

View File

@ -9,9 +9,9 @@
*/ */
#include "onyx_int.h" #include "onyx_int.h"
#include "threading.h" #include "vp8/common/threading.h"
#include "common.h" #include "vp8/common/common.h"
#include "extend.h" #include "vp8/common/extend.h"
#if CONFIG_MULTITHREAD #if CONFIG_MULTITHREAD

View File

@ -14,18 +14,18 @@
#include "onyx_int.h" #include "onyx_int.h"
#include "variance.h" #include "variance.h"
#include "encodeintra.h" #include "encodeintra.h"
#include "setupintrarecon.h" #include "vp8/common/setupintrarecon.h"
#include "mcomp.h" #include "mcomp.h"
#include "vpx_scale/vpxscale.h" #include "vpx_scale/vpxscale.h"
#include "encodemb.h" #include "encodemb.h"
#include "extend.h" #include "vp8/common/extend.h"
#include "systemdependent.h" #include "vp8/common/systemdependent.h"
#include "vpx_scale/yv12extend.h" #include "vpx_scale/yv12extend.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "swapyv12buffer.h" #include "vp8/common/swapyv12buffer.h"
#include <stdio.h> #include <stdio.h>
#include "rdopt.h" #include "rdopt.h"
#include "quant_common.h" #include "vp8/common/quant_common.h"
#include "encodemv.h" #include "encodemv.h"
//#define OUTPUT_FPF 1 //#define OUTPUT_FPF 1

View File

@ -10,8 +10,8 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "variance.h" #include "vp8/encoder/variance.h"
#include "onyx_int.h" #include "vp8/encoder/onyx_int.h"
void vp8_arch_x86_encoder_init(VP8_COMP *cpi); void vp8_arch_x86_encoder_init(VP8_COMP *cpi);

View File

@ -9,10 +9,10 @@
*/ */
#include "blockd.h" #include "vp8/common/blockd.h"
#include "onyx_int.h" #include "onyx_int.h"
#include "treewriter.h" #include "treewriter.h"
#include "entropymode.h" #include "vp8/common/entropymode.h"
void vp8_init_mode_costs(VP8_COMP *c) void vp8_init_mode_costs(VP8_COMP *c)

View File

@ -9,27 +9,27 @@
*/ */
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
#include "onyx_int.h" #include "onyx_int.h"
#include "systemdependent.h" #include "vp8/common/systemdependent.h"
#include "quantize.h" #include "quantize.h"
#include "alloccommon.h" #include "vp8/common/alloccommon.h"
#include "mcomp.h" #include "mcomp.h"
#include "firstpass.h" #include "firstpass.h"
#include "psnr.h" #include "psnr.h"
#include "vpx_scale/vpxscale.h" #include "vpx_scale/vpxscale.h"
#include "extend.h" #include "vp8/common/extend.h"
#include "ratectrl.h" #include "ratectrl.h"
#include "quant_common.h" #include "vp8/common/quant_common.h"
#include "segmentation.h" #include "segmentation.h"
#include "g_common.h" #include "vp8/common/g_common.h"
#include "vpx_scale/yv12extend.h" #include "vpx_scale/yv12extend.h"
#include "postproc.h" #include "vp8/common/postproc.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "swapyv12buffer.h" #include "vp8/common/swapyv12buffer.h"
#include "threading.h" #include "vp8/common/threading.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#include "vpxerrors.h" #include "vp8/common/vpxerrors.h"
#include "temporal_filter.h" #include "temporal_filter.h"
#if ARCH_ARM #if ARCH_ARM
#include "vpx_ports/arm.h" #include "vpx_ports/arm.h"

View File

@ -14,21 +14,21 @@
#include <stdio.h> #include <stdio.h>
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "onyx.h" #include "vp8/common/onyx.h"
#include "treewriter.h" #include "treewriter.h"
#include "tokenize.h" #include "tokenize.h"
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
#include "variance.h" #include "variance.h"
#include "dct.h" #include "dct.h"
#include "encodemb.h" #include "encodemb.h"
#include "quantize.h" #include "quantize.h"
#include "entropy.h" #include "vp8/common/entropy.h"
#include "threading.h" #include "vp8/common/threading.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx/internal/vpx_codec_internal.h" #include "vpx/internal/vpx_codec_internal.h"
#include "mcomp.h" #include "mcomp.h"
#include "temporal_filter.h" #include "temporal_filter.h"
#include "findnearmv.h" #include "vp8/common/findnearmv.h"
//#define SPEEDSTATS 1 //#define SPEEDSTATS 1
#define MIN_GF_INTERVAL 4 #define MIN_GF_INTERVAL 4

View File

@ -16,7 +16,7 @@
#include <fstream> #include <fstream>
extern "C" extern "C"
{ {
#include "onyx.h" #include "vp8/common/onyx.h"
} }

View File

@ -14,14 +14,14 @@
#include "onyx_int.h" #include "onyx_int.h"
#include "modecosts.h" #include "modecosts.h"
#include "encodeintra.h" #include "encodeintra.h"
#include "entropymode.h" #include "vp8/common/entropymode.h"
#include "pickinter.h" #include "pickinter.h"
#include "findnearmv.h" #include "vp8/common/findnearmv.h"
#include "encodemb.h" #include "encodemb.h"
#include "reconinter.h" #include "vp8/common/reconinter.h"
#include "reconintra.h" #include "vp8/common/reconintra.h"
#include "reconintra4x4.h" #include "vp8/common/reconintra4x4.h"
#include "g_common.h" #include "vp8/common/g_common.h"
#include "variance.h" #include "variance.h"
#include "mcomp.h" #include "mcomp.h"
#include "rdopt.h" #include "rdopt.h"

View File

@ -12,7 +12,7 @@
#ifndef __INC_PICKINTER_H #ifndef __INC_PICKINTER_H
#define __INC_PICKINTER_H #define __INC_PICKINTER_H
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
#define RD_ESTIMATE(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) ) #define RD_ESTIMATE(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) )
extern int vp8_pick_intra4x4mby_modes(const VP8_ENCODER_RTCD *, MACROBLOCK *mb, int *Rate, int *Distortion); extern int vp8_pick_intra4x4mby_modes(const VP8_ENCODER_RTCD *, MACROBLOCK *mb, int *Rate, int *Distortion);

View File

@ -9,13 +9,13 @@
*/ */
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
#include "onyx_int.h" #include "onyx_int.h"
#include "quantize.h" #include "quantize.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_scale/yv12extend.h" #include "vpx_scale/yv12extend.h"
#include "vpx_scale/vpxscale.h" #include "vpx_scale/vpxscale.h"
#include "alloccommon.h" #include "vp8/common/alloccommon.h"
#if ARCH_ARM #if ARCH_ARM
#include "vpx_ports/arm.h" #include "vpx_ports/arm.h"
#endif #endif

View File

@ -9,8 +9,8 @@
*/ */
#include "variance.h" #include "vp8/encoder/variance.h"
#include "onyx_int.h" #include "vp8/encoder/onyx_int.h"
SADFunction *vp8_sad16x16; SADFunction *vp8_sad16x16;
SADFunction *vp8_sad16x8; SADFunction *vp8_sad16x8;

View File

@ -11,7 +11,7 @@
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "math.h" #include "math.h"
#include "systemdependent.h" /* for vp8_clear_system_state() */ #include "vp8/common/systemdependent.h" /* for vp8_clear_system_state() */
#define MAX_PSNR 60 #define MAX_PSNR 60

View File

@ -13,8 +13,8 @@
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "quantize.h" #include "quantize.h"
#include "entropy.h" #include "vp8/common/entropy.h"
#include "predictdc.h" #include "vp8/common/predictdc.h"
#define EXACT_QUANT #define EXACT_QUANT

View File

@ -16,11 +16,11 @@
#include <assert.h> #include <assert.h>
#include "math.h" #include "math.h"
#include "common.h" #include "vp8/common/common.h"
#include "ratectrl.h" #include "ratectrl.h"
#include "entropymode.h" #include "vp8/common/entropymode.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "systemdependent.h" #include "vp8/common/systemdependent.h"
#include "encodemv.h" #include "encodemv.h"

View File

@ -13,28 +13,28 @@
#include <math.h> #include <math.h>
#include <limits.h> #include <limits.h>
#include <assert.h> #include <assert.h>
#include "pragmas.h" #include "vp8/common/pragmas.h"
#include "tokenize.h" #include "tokenize.h"
#include "treewriter.h" #include "treewriter.h"
#include "onyx_int.h" #include "onyx_int.h"
#include "modecosts.h" #include "modecosts.h"
#include "encodeintra.h" #include "encodeintra.h"
#include "entropymode.h" #include "vp8/common/entropymode.h"
#include "reconinter.h" #include "vp8/common/reconinter.h"
#include "reconintra.h" #include "vp8/common/reconintra.h"
#include "reconintra4x4.h" #include "vp8/common/reconintra4x4.h"
#include "findnearmv.h" #include "vp8/common/findnearmv.h"
#include "encodemb.h" #include "encodemb.h"
#include "quantize.h" #include "quantize.h"
#include "idct.h" #include "vp8/common/idct.h"
#include "g_common.h" #include "vp8/common/g_common.h"
#include "variance.h" #include "variance.h"
#include "mcomp.h" #include "mcomp.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "dct.h" #include "dct.h"
#include "systemdependent.h" #include "vp8/common/systemdependent.h"
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
#define IF_RTCD(x) (x) #define IF_RTCD(x) (x)

View File

@ -10,7 +10,7 @@
#include "string.h" #include "string.h"
#include "blockd.h" #include "vp8/common/blockd.h"
#include "onyx_int.h" #include "onyx_int.h"
extern void vp8_update_gf_useage_maps(VP8_COMP *cpi, VP8_COMMON *cm, MACROBLOCK *x); extern void vp8_update_gf_useage_maps(VP8_COMP *cpi, VP8_COMMON *cm, MACROBLOCK *x);

View File

@ -9,27 +9,27 @@
*/ */
#include "onyxc_int.h" #include "vp8/common/onyxc_int.h"
#include "onyx_int.h" #include "onyx_int.h"
#include "systemdependent.h" #include "vp8/common/systemdependent.h"
#include "quantize.h" #include "quantize.h"
#include "alloccommon.h" #include "vp8/common/alloccommon.h"
#include "mcomp.h" #include "mcomp.h"
#include "firstpass.h" #include "firstpass.h"
#include "psnr.h" #include "psnr.h"
#include "vpx_scale/vpxscale.h" #include "vpx_scale/vpxscale.h"
#include "extend.h" #include "vp8/common/extend.h"
#include "ratectrl.h" #include "ratectrl.h"
#include "quant_common.h" #include "vp8/common/quant_common.h"
#include "segmentation.h" #include "segmentation.h"
#include "g_common.h" #include "vp8/common/g_common.h"
#include "vpx_scale/yv12extend.h" #include "vpx_scale/yv12extend.h"
#include "postproc.h" #include "vp8/common/postproc.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "swapyv12buffer.h" #include "vp8/common/swapyv12buffer.h"
#include "threading.h" #include "vp8/common/threading.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#include "vpxerrors.h" #include "vp8/common/vpxerrors.h"
#include <math.h> #include <math.h>
#include <limits.h> #include <limits.h>

View File

@ -12,7 +12,7 @@
#ifndef tokenize_h #ifndef tokenize_h
#define tokenize_h #define tokenize_h
#include "entropy.h" #include "vp8/common/entropy.h"
#include "block.h" #include "block.h"
void vp8_tokenize_initialize(); void vp8_tokenize_initialize();

View File

@ -15,7 +15,7 @@
/* Trees map alphabets into huffman-like codes suitable for an arithmetic /* Trees map alphabets into huffman-like codes suitable for an arithmetic
bit coder. Timothy S Murphy 11 October 2004 */ bit coder. Timothy S Murphy 11 October 2004 */
#include "treecoder.h" #include "vp8/common/treecoder.h"
#include "boolhuff.h" /* for now */ #include "boolhuff.h" /* for now */

View File

@ -9,8 +9,8 @@
*/ */
#include "variance.h" #include "vp8/encoder/variance.h"
#include "pragmas.h" #include "vp8/common/pragmas.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
extern void filter_block1d_h6_mmx extern void filter_block1d_h6_mmx

View File

@ -9,8 +9,8 @@
*/ */
#include "variance.h" #include "vp8/encoder/variance.h"
#include "pragmas.h" #include "vp8/common/pragmas.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
extern void filter_block1d_h6_mmx(const unsigned char *src_ptr, unsigned short *output_ptr, unsigned int src_pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *vp7_filter); extern void filter_block1d_h6_mmx(const unsigned char *src_ptr, unsigned short *output_ptr, unsigned int src_pixels_per_line, unsigned int pixel_step, unsigned int output_height, unsigned int output_width, short *vp7_filter);

View File

@ -11,8 +11,8 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "vpx_ports/x86.h" #include "vpx_ports/x86.h"
#include "variance.h" #include "vp8/encoder/variance.h"
#include "onyx_int.h" #include "vp8/encoder/onyx_int.h"
#if HAVE_MMX #if HAVE_MMX

View File

@ -8,24 +8,13 @@
## 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.
## ##
#add this file to the installed sources list
VP8_COMMON_SRCS-yes += vp8_common.mk VP8_COMMON_SRCS-yes += vp8_common.mk
CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)common
VP8_COMMON_SRCS-yes += common/type_aliases.h VP8_COMMON_SRCS-yes += common/type_aliases.h
VP8_COMMON_SRCS-yes += common/pragmas.h VP8_COMMON_SRCS-yes += common/pragmas.h
CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)common
VP8_COMMON_SRCS-yes += common/vpxerrors.h VP8_COMMON_SRCS-yes += common/vpxerrors.h
CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)common
VP8_COMMON_SRCS-yes += common/ppflags.h VP8_COMMON_SRCS-yes += common/ppflags.h
VP8_COMMON_SRCS-yes += common/onyx.h VP8_COMMON_SRCS-yes += common/onyx.h
VP8_COMMON_SRCS-yes += common/onyxd.h VP8_COMMON_SRCS-yes += common/onyxd.h
CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)common
VP8_COMMON_SRCS-yes += common/alloccommon.c VP8_COMMON_SRCS-yes += common/alloccommon.c
VP8_COMMON_SRCS-yes += common/blockd.c VP8_COMMON_SRCS-yes += common/blockd.c
VP8_COMMON_SRCS-yes += common/coefupdateprobs.h VP8_COMMON_SRCS-yes += common/coefupdateprobs.h

View File

@ -12,10 +12,10 @@
#include "vpx/vpx_codec.h" #include "vpx/vpx_codec.h"
#include "vpx/internal/vpx_codec_internal.h" #include "vpx/internal/vpx_codec_internal.h"
#include "vpx_version.h" #include "vpx_version.h"
#include "onyx_int.h" #include "vp8/encoder/onyx_int.h"
#include "vpx/vp8e.h" #include "vpx/vp8e.h"
#include "vp8/encoder/firstpass.h" #include "vp8/encoder/firstpass.h"
#include "onyx.h" #include "vp8/common/onyx.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@ -15,8 +15,8 @@
#include "vpx/vp8dx.h" #include "vpx/vp8dx.h"
#include "vpx/internal/vpx_codec_internal.h" #include "vpx/internal/vpx_codec_internal.h"
#include "vpx_version.h" #include "vpx_version.h"
#include "onyxd.h" #include "common/onyxd.h"
#include "onyxd_int.h" #include "decoder/onyxd_int.h"
#define VP8_CAP_POSTPROC (CONFIG_POSTPROC ? VPX_CODEC_CAP_POSTPROC : 0) #define VP8_CAP_POSTPROC (CONFIG_POSTPROC ? VPX_CODEC_CAP_POSTPROC : 0)

View File

@ -33,8 +33,6 @@ VP8_CX_SRCS-yes += vp8_cx_iface.c
#INCLUDES += common #INCLUDES += common
#INCLUDES += encoder #INCLUDES += encoder
CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)encoder
VP8_CX_SRCS-yes += encoder/bitstream.c VP8_CX_SRCS-yes += encoder/bitstream.c
VP8_CX_SRCS-yes += encoder/boolhuff.c VP8_CX_SRCS-yes += encoder/boolhuff.c
VP8_CX_SRCS-yes += encoder/dct.c VP8_CX_SRCS-yes += encoder/dct.c

View File

@ -24,9 +24,6 @@ endif
VP8_DX_SRCS-yes += vp8_dx_iface.c VP8_DX_SRCS-yes += vp8_dx_iface.c
CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)decoder
# common # common
#define ARM #define ARM
#define DISABLE_THREAD #define DISABLE_THREAD