diff options
Diffstat (limited to 'vp8/encoder')
35 files changed, 138 insertions, 144 deletions
diff --git a/vp8/encoder/arm/arm_csystemdependent.c b/vp8/encoder/arm/arm_csystemdependent.c index cec35d548..5852afddb 100644 --- a/vp8/encoder/arm/arm_csystemdependent.c +++ b/vp8/encoder/arm/arm_csystemdependent.c @@ -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); diff --git a/vp8/encoder/arm/boolhuff_arm.c b/vp8/encoder/arm/boolhuff_arm.c index fe8e70c16..9089663ca 100644 --- a/vp8/encoder/arm/boolhuff_arm.c +++ b/vp8/encoder/arm/boolhuff_arm.c @@ -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] = { diff --git a/vp8/encoder/arm/encodemb_arm.c b/vp8/encoder/arm/encodemb_arm.c index cc9e014b2..88ad3fcff 100644 --- a/vp8/encoder/arm/encodemb_arm.c +++ b/vp8/encoder/arm/encodemb_arm.c @@ -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); diff --git a/vp8/encoder/arm/picklpf_arm.c b/vp8/encoder/arm/picklpf_arm.c index b2d8f2b2c..3fb370c3d 100644 --- a/vp8/encoder/arm/picklpf_arm.c +++ b/vp8/encoder/arm/picklpf_arm.c @@ -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); diff --git a/vp8/encoder/arm/quantize_arm.c b/vp8/encoder/arm/quantize_arm.c index 225feaca6..75ec205cc 100644 --- a/vp8/encoder/arm/quantize_arm.c +++ b/vp8/encoder/arm/quantize_arm.c @@ -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]) = { diff --git a/vp8/encoder/arm/variance_arm.c b/vp8/encoder/arm/variance_arm.c index 9737bef46..1cf9fd8f0 100644 --- a/vp8/encoder/arm/variance_arm.c +++ b/vp8/encoder/arm/variance_arm.c @@ -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 diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index 419646c30..cb0846046 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -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" #if CONFIG_SEGMENTATION @@ -60,16 +60,6 @@ extern unsigned int active_section; int count_mb_seg[4] = { 0, 0, 0, 0 }; #endif -#if CONFIG_BIG_ENDIAN -# define make_endian_16(a) \ - (((unsigned int)(a & 0xff)) << 8) | (((unsigned int)(a & 0xff00)) >> 8) -# define make_endian_32(a) \ - (((unsigned int)(a & 0xff)) << 24) | (((unsigned int)(a & 0xff00)) << 8) | \ - (((unsigned int)(a & 0xff0000)) >> 8) | (((unsigned int)(a & 0xff000000)) >> 24) -#else -# define make_endian_16(a) a -# define make_endian_32(a) a -#endif static void update_mode( vp8_writer *const w, @@ -1467,13 +1457,20 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) // every keyframe send startcode, width, height, scale factor, clamp and color type if (oh.type == KEY_FRAME) { + int v; + // Start / synch code cx_data[0] = 0x9D; cx_data[1] = 0x01; cx_data[2] = 0x2a; - *((unsigned short *)(cx_data + 3)) = make_endian_16((pc->horiz_scale << 14) | pc->Width); - *((unsigned short *)(cx_data + 5)) = make_endian_16((pc->vert_scale << 14) | pc->Height); + v = (pc->horiz_scale << 14) | pc->Width; + cx_data[3] = v; + cx_data[4] = v >> 8; + + v = (pc->vert_scale << 14) | pc->Height; + cx_data[5] = v; + cx_data[6] = v >> 8; extra_bytes_packed = 7; cx_data += extra_bytes_packed ; @@ -1748,19 +1745,16 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) *size = cpi->bc2.pos + cpi->bc.pos + VP8_HEADER_SIZE + extra_bytes_packed; } -#if CONFIG_BIG_ENDIAN { int v = (oh.first_partition_length_in_bytes << 5) | (oh.show_frame << 4) | (oh.version << 1) | oh.type; - v = make_endian_32(v); - vpx_memcpy(dest, &v, 3); + dest[0] = v; + dest[1] = v >> 8; + dest[2] = v >> 16; } -#else - vpx_memcpy(dest, &oh, 3); -#endif } #ifdef ENTROPY_STATS diff --git a/vp8/encoder/block.h b/vp8/encoder/block.h index 3ad40efc0..2fd67822b 100644 --- a/vp8/encoder/block.h +++ b/vp8/encoder/block.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 diff --git a/vp8/encoder/boolhuff.c b/vp8/encoder/boolhuff.c index 82006b196..788d2b05f 100644 --- a/vp8/encoder/boolhuff.c +++ b/vp8/encoder/boolhuff.c @@ -10,7 +10,7 @@ #include "boolhuff.h" -#include "blockd.h" +#include "vp8/common/blockd.h" diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 2950bb45f..5dbe1975f 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -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" diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c index e016fa35b..cd66016cc 100644 --- a/vp8/encoder/encodeintra.c +++ b/vp8/encoder/encodeintra.c @@ -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 diff --git a/vp8/encoder/encodemb.c b/vp8/encoder/encodemb.c index aa2beacde..f75b25858 100644 --- a/vp8/encoder/encodemb.c +++ b/vp8/encoder/encodemb.c @@ -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" diff --git a/vp8/encoder/encodemv.c b/vp8/encoder/encodemv.c index 4cb4c6e55..6b1e6f965 100644 --- a/vp8/encoder/encodemv.c +++ b/vp8/encoder/encodemv.c @@ -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> diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index 967d2a6a9..d7a2089d2 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -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 diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index a27f9ce6c..eec239afb 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -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 diff --git a/vp8/encoder/generic/csystemdependent.c b/vp8/encoder/generic/csystemdependent.c index b6de95b8d..f067b3937 100644 --- a/vp8/encoder/generic/csystemdependent.c +++ b/vp8/encoder/generic/csystemdependent.c @@ -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" void vp8_arch_x86_encoder_init(VP8_COMP *cpi); diff --git a/vp8/encoder/modecosts.c b/vp8/encoder/modecosts.c index d23c97e6e..c636c482b 100644 --- a/vp8/encoder/modecosts.c +++ b/vp8/encoder/modecosts.c @@ -9,10 +9,10 @@ */ -#include "blockd.h" +#include "vp8/common/blockd.h" #include "onyx_int.h" #include "treewriter.h" -#include "entropymode.h" +#include "vp8/common/entropymode.h" void vp8_init_mode_costs(VP8_COMP *c) diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index b0912941e..c53bb7dda 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -9,27 +9,27 @@ */ -#include "onyxc_int.h" +#include "vp8/common/onyxc_int.h" #include "onyx_int.h" -#include "systemdependent.h" +#include "vp8/common/systemdependent.h" #include "quantize.h" -#include "alloccommon.h" +#include "vp8/common/alloccommon.h" #include "mcomp.h" #include "firstpass.h" #include "psnr.h" #include "vpx_scale/vpxscale.h" -#include "extend.h" +#include "vp8/common/extend.h" #include "ratectrl.h" -#include "quant_common.h" +#include "vp8/common/quant_common.h" #include "segmentation.h" -#include "g_common.h" +#include "vp8/common/g_common.h" #include "vpx_scale/yv12extend.h" -#include "postproc.h" +#include "vp8/common/postproc.h" #include "vpx_mem/vpx_mem.h" -#include "swapyv12buffer.h" -#include "threading.h" +#include "vp8/common/swapyv12buffer.h" +#include "vp8/common/threading.h" #include "vpx_ports/vpx_timer.h" -#include "vpxerrors.h" +#include "vp8/common/vpxerrors.h" #include "temporal_filter.h" #if ARCH_ARM #include "vpx_ports/arm.h" diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index 881594c29..0d33b42a6 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -14,21 +14,21 @@ #include <stdio.h> #include "vpx_ports/config.h" -#include "onyx.h" +#include "vp8/common/onyx.h" #include "treewriter.h" #include "tokenize.h" -#include "onyxc_int.h" +#include "vp8/common/onyxc_int.h" #include "variance.h" #include "dct.h" #include "encodemb.h" #include "quantize.h" -#include "entropy.h" -#include "threading.h" +#include "vp8/common/entropy.h" +#include "vp8/common/threading.h" #include "vpx_ports/mem.h" #include "vpx/internal/vpx_codec_internal.h" #include "mcomp.h" #include "temporal_filter.h" -#include "findnearmv.h" +#include "vp8/common/findnearmv.h" //#define SPEEDSTATS 1 #define MIN_GF_INTERVAL 4 diff --git a/vp8/encoder/parms.cpp b/vp8/encoder/parms.cpp index 6cc450121..2a39b2ca3 100644 --- a/vp8/encoder/parms.cpp +++ b/vp8/encoder/parms.cpp @@ -16,7 +16,7 @@ #include <fstream> extern "C" { - #include "onyx.h" + #include "vp8/common/onyx.h" } diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 1a58257a3..6ab85adbc 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -14,14 +14,14 @@ #include "onyx_int.h" #include "modecosts.h" #include "encodeintra.h" -#include "entropymode.h" +#include "vp8/common/entropymode.h" #include "pickinter.h" -#include "findnearmv.h" +#include "vp8/common/findnearmv.h" #include "encodemb.h" -#include "reconinter.h" -#include "reconintra.h" -#include "reconintra4x4.h" -#include "g_common.h" +#include "vp8/common/reconinter.h" +#include "vp8/common/reconintra.h" +#include "vp8/common/reconintra4x4.h" +#include "vp8/common/g_common.h" #include "variance.h" #include "mcomp.h" #include "rdopt.h" diff --git a/vp8/encoder/pickinter.h b/vp8/encoder/pickinter.h index b80e4c86f..af060d701 100644 --- a/vp8/encoder/pickinter.h +++ b/vp8/encoder/pickinter.h @@ -12,7 +12,7 @@ #ifndef __INC_PICKINTER_H #define __INC_PICKINTER_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) ) extern int vp8_pick_intra4x4mby_modes(const VP8_ENCODER_RTCD *, MACROBLOCK *mb, int *Rate, int *Distortion); diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c index 78aa866dd..d294af6c0 100644 --- a/vp8/encoder/picklpf.c +++ b/vp8/encoder/picklpf.c @@ -9,13 +9,13 @@ */ -#include "onyxc_int.h" +#include "vp8/common/onyxc_int.h" #include "onyx_int.h" #include "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" #if ARCH_ARM #include "vpx_ports/arm.h" #endif diff --git a/vp8/encoder/ppc/csystemdependent.c b/vp8/encoder/ppc/csystemdependent.c index 588656b97..8dfd2a543 100644 --- a/vp8/encoder/ppc/csystemdependent.c +++ b/vp8/encoder/ppc/csystemdependent.c @@ -9,8 +9,8 @@ */ -#include "variance.h" -#include "onyx_int.h" +#include "vp8/encoder/variance.h" +#include "vp8/encoder/onyx_int.h" SADFunction *vp8_sad16x16; SADFunction *vp8_sad16x8; diff --git a/vp8/encoder/psnr.c b/vp8/encoder/psnr.c index ff0222e2d..abd2ed47c 100644 --- a/vp8/encoder/psnr.c +++ b/vp8/encoder/psnr.c @@ -11,7 +11,7 @@ #include "vpx_scale/yv12config.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 100 diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index 4a2329fc1..02b9d7bd9 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -13,8 +13,8 @@ #include "vpx_mem/vpx_mem.h" #include "quantize.h" -#include "entropy.h" -#include "predictdc.h" +#include "vp8/common/entropy.h" +#include "vp8/common/predictdc.h" #define EXACT_QUANT diff --git a/vp8/encoder/ratectrl.c b/vp8/encoder/ratectrl.c index c38cf4c74..0a5f3bff1 100644 --- a/vp8/encoder/ratectrl.c +++ b/vp8/encoder/ratectrl.c @@ -16,11 +16,11 @@ #include <assert.h> #include "math.h" -#include "common.h" +#include "vp8/common/common.h" #include "ratectrl.h" -#include "entropymode.h" +#include "vp8/common/entropymode.h" #include "vpx_mem/vpx_mem.h" -#include "systemdependent.h" +#include "vp8/common/systemdependent.h" #include "encodemv.h" diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 2ecd5018b..cf5b5ccc6 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -13,28 +13,28 @@ #include <math.h> #include <limits.h> #include <assert.h> -#include "pragmas.h" +#include "vp8/common/pragmas.h" #include "tokenize.h" #include "treewriter.h" #include "onyx_int.h" #include "modecosts.h" #include "encodeintra.h" -#include "entropymode.h" -#include "reconinter.h" -#include "reconintra.h" -#include "reconintra4x4.h" -#include "findnearmv.h" +#include "vp8/common/entropymode.h" +#include "vp8/common/reconinter.h" +#include "vp8/common/reconintra.h" +#include "vp8/common/reconintra4x4.h" +#include "vp8/common/findnearmv.h" #include "encodemb.h" #include "quantize.h" -#include "idct.h" -#include "g_common.h" +#include "vp8/common/idct.h" +#include "vp8/common/g_common.h" #include "variance.h" #include "mcomp.h" #include "vpx_mem/vpx_mem.h" #include "dct.h" -#include "systemdependent.h" +#include "vp8/common/systemdependent.h" #if CONFIG_RUNTIME_CPU_DETECT #define IF_RTCD(x) (x) diff --git a/vp8/encoder/segmentation.h b/vp8/encoder/segmentation.h index 216e194c2..12815b087 100644 --- a/vp8/encoder/segmentation.h +++ b/vp8/encoder/segmentation.h @@ -10,7 +10,7 @@ #include "string.h" -#include "blockd.h" +#include "vp8/common/blockd.h" #include "onyx_int.h" extern void vp8_update_gf_useage_maps(VP8_COMP *cpi, VP8_COMMON *cm, MACROBLOCK *x); diff --git a/vp8/encoder/temporal_filter.c b/vp8/encoder/temporal_filter.c index e4c3db1b8..9ff8887e5 100644 --- a/vp8/encoder/temporal_filter.c +++ b/vp8/encoder/temporal_filter.c @@ -9,27 +9,27 @@ */ -#include "onyxc_int.h" +#include "vp8/common/onyxc_int.h" #include "onyx_int.h" -#include "systemdependent.h" +#include "vp8/common/systemdependent.h" #include "quantize.h" -#include "alloccommon.h" +#include "vp8/common/alloccommon.h" #include "mcomp.h" #include "firstpass.h" #include "psnr.h" #include "vpx_scale/vpxscale.h" -#include "extend.h" +#include "vp8/common/extend.h" #include "ratectrl.h" -#include "quant_common.h" +#include "vp8/common/quant_common.h" #include "segmentation.h" -#include "g_common.h" +#include "vp8/common/g_common.h" #include "vpx_scale/yv12extend.h" -#include "postproc.h" +#include "vp8/common/postproc.h" #include "vpx_mem/vpx_mem.h" -#include "swapyv12buffer.h" -#include "threading.h" +#include "vp8/common/swapyv12buffer.h" +#include "vp8/common/threading.h" #include "vpx_ports/vpx_timer.h" -#include "vpxerrors.h" +#include "vp8/common/vpxerrors.h" #include <math.h> #include <limits.h> diff --git a/vp8/encoder/tokenize.h b/vp8/encoder/tokenize.h index ed5eb0ce9..d87c1a3e7 100644 --- a/vp8/encoder/tokenize.h +++ b/vp8/encoder/tokenize.h @@ -12,7 +12,7 @@ #ifndef tokenize_h #define tokenize_h -#include "entropy.h" +#include "vp8/common/entropy.h" #include "block.h" void vp8_tokenize_initialize(); diff --git a/vp8/encoder/treewriter.h b/vp8/encoder/treewriter.h index 88096d875..c28a0fa37 100644 --- a/vp8/encoder/treewriter.h +++ b/vp8/encoder/treewriter.h @@ -15,7 +15,7 @@ /* Trees map alphabets into huffman-like codes suitable for an arithmetic bit coder. Timothy S Murphy 11 October 2004 */ -#include "treecoder.h" +#include "vp8/common/treecoder.h" #include "boolhuff.h" /* for now */ diff --git a/vp8/encoder/x86/variance_mmx.c b/vp8/encoder/x86/variance_mmx.c index 2df73a635..6eed98e07 100644 --- a/vp8/encoder/x86/variance_mmx.c +++ b/vp8/encoder/x86/variance_mmx.c @@ -9,8 +9,8 @@ */ -#include "variance.h" -#include "pragmas.h" +#include "vp8/encoder/variance.h" +#include "vp8/common/pragmas.h" #include "vpx_ports/mem.h" extern void filter_block1d_h6_mmx diff --git a/vp8/encoder/x86/variance_sse2.c b/vp8/encoder/x86/variance_sse2.c index 6f79f0d23..7cf6a6308 100644 --- a/vp8/encoder/x86/variance_sse2.c +++ b/vp8/encoder/x86/variance_sse2.c @@ -9,8 +9,8 @@ */ -#include "variance.h" -#include "pragmas.h" +#include "vp8/encoder/variance.h" +#include "vp8/common/pragmas.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); diff --git a/vp8/encoder/x86/x86_csystemdependent.c b/vp8/encoder/x86/x86_csystemdependent.c index 31438f916..4e3ce070d 100644 --- a/vp8/encoder/x86/x86_csystemdependent.c +++ b/vp8/encoder/x86/x86_csystemdependent.c @@ -11,8 +11,8 @@ #include "vpx_ports/config.h" #include "vpx_ports/x86.h" -#include "variance.h" -#include "onyx_int.h" +#include "vp8/encoder/variance.h" +#include "vp8/encoder/onyx_int.h" #if HAVE_MMX |