diff options
Diffstat (limited to 'vp9/common')
48 files changed, 91 insertions, 91 deletions
diff --git a/vp9/common/arm/vp9_bilinearfilter_arm.c b/vp9/common/arm/vp9_bilinearfilter_arm.c index 409e271b1..678173141 100644 --- a/vp9/common/arm/vp9_bilinearfilter_arm.c +++ b/vp9/common/arm/vp9_bilinearfilter_arm.c @@ -12,7 +12,7 @@ #include <math.h> #include "vp9/common/vp9_filter.h" #include "vp9/common/vp9_subpixel.h" -#include "vp9_bilinearfilter_arm.h" +#include "vp9/common/arm/vp9_bilinearfilter_arm.h" void vp9_filter_block2d_bil_armv6 ( diff --git a/vp9/common/ppc/vp9_loopfilter_altivec.c b/vp9/common/ppc/vp9_loopfilter_altivec.c index cae171805..599070a75 100644 --- a/vp9/common/ppc/vp9_loopfilter_altivec.c +++ b/vp9/common/ppc/vp9_loopfilter_altivec.c @@ -9,8 +9,8 @@ */ -#include "vp9_loopfilter.h" -#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_loopfilter.h" +#include "vp9/common/vp9_onyxc_int.h" typedef void loop_filter_function_y_ppc ( diff --git a/vp9/common/ppc/vp9_systemdependent.c b/vp9/common/ppc/vp9_systemdependent.c index 2137dee9c..106a2b763 100644 --- a/vp9/common/ppc/vp9_systemdependent.c +++ b/vp9/common/ppc/vp9_systemdependent.c @@ -8,10 +8,10 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp9_subpixel.h" -#include "vp9_loopfilter.h" +#include "vp9/common/vp9_subpixel.h" +#include "vp9/common/vp9_loopfilter.h" #include "recon.h" -#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_onyxc_int.h" void (*vp8_short_idct4x4)(short *input, short *output, int pitch); void (*vp8_short_idct4x4_1)(short *input, short *output, int pitch); diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c index 04a8b368a..08882b3a6 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -10,13 +10,13 @@ #include "vpx_ports/config.h" -#include "vp9_blockd.h" +#include "vp9/common/vp9_blockd.h" #include "vpx_mem/vpx_mem.h" -#include "vp9_onyxc_int.h" -#include "vp9_findnearmv.h" -#include "vp9_entropymode.h" -#include "vp9_entropymv.h" -#include "vp9_systemdependent.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9/common/vp9_findnearmv.h" +#include "vp9/common/vp9_entropymode.h" +#include "vp9/common/vp9_entropymv.h" +#include "vp9/common/vp9_systemdependent.h" void vp9_update_mode_info_border(VP9_COMMON *cpi, MODE_INFO *mi_base) { diff --git a/vp9/common/vp9_alloccommon.h b/vp9/common/vp9_alloccommon.h index df94f421e..bfecef524 100644 --- a/vp9/common/vp9_alloccommon.h +++ b/vp9/common/vp9_alloccommon.h @@ -12,7 +12,7 @@ #ifndef __INC_ALLOCCOMMON_H #define __INC_ALLOCCOMMON_H -#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_onyxc_int.h" void vp9_create_common(VP9_COMMON *oci); void vp9_remove_common(VP9_COMMON *oci); diff --git a/vp9/common/vp9_blockd.c b/vp9/common/vp9_blockd.c index d8bb394d4..60aedf8cb 100644 --- a/vp9/common/vp9_blockd.c +++ b/vp9/common/vp9_blockd.c @@ -9,7 +9,7 @@ */ -#include "vp9_blockd.h" +#include "vp9/common/vp9_blockd.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index a91e8d4d0..d819a3d69 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -16,11 +16,11 @@ void vpx_log(const char *format, ...); #include "vpx_ports/config.h" #include "vpx_scale/yv12config.h" -#include "vp9_mv.h" -#include "vp9_treecoder.h" -#include "vp9_subpixel.h" +#include "vp9/common/vp9_mv.h" +#include "vp9/common/vp9_treecoder.h" +#include "vp9/common/vp9_subpixel.h" #include "vpx_ports/mem.h" -#include "vp9_common.h" +#include "vp9/common/vp9_common.h" #define TRUE 1 #define FALSE 0 diff --git a/vp9/common/vp9_common.h b/vp9/common/vp9_common.h index 61c0e25d8..64804e16e 100644 --- a/vp9/common/vp9_common.h +++ b/vp9/common/vp9_common.h @@ -18,7 +18,7 @@ #include "vpx_mem/vpx_mem.h" -#include "vp9_common_types.h" +#include "vp9/common/vp9_common_types.h" /* Only need this for fixed-size arrays, for structs just assign. */ diff --git a/vp9/common/vp9_context.c b/vp9/common/vp9_context.c index 90a1f796f..271b45541 100644 --- a/vp9/common/vp9_context.c +++ b/vp9/common/vp9_context.c @@ -9,7 +9,7 @@ */ -#include "vp9_entropy.h" +#include "vp9/common/vp9_entropy.h" /* *** GENERATED FILE: DO NOT EDIT *** */ diff --git a/vp9/common/vp9_debugmodes.c b/vp9/common/vp9_debugmodes.c index 058abb57e..76318d2e1 100644 --- a/vp9/common/vp9_debugmodes.c +++ b/vp9/common/vp9_debugmodes.c @@ -9,7 +9,7 @@ */ #include <stdio.h> -#include "vp9_blockd.h" +#include "vp9/common/vp9_blockd.h" void vp9_print_modes_and_motion_vectors(MODE_INFO *mi, int rows, int cols, int frame) { diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c index e6ee2729e..4832b4e9c 100644 --- a/vp9/common/vp9_entropy.c +++ b/vp9/common/vp9_entropy.c @@ -11,11 +11,11 @@ #include <stdio.h> -#include "vp9_entropy.h" +#include "vp9/common/vp9_entropy.h" #include "string.h" -#include "vp9_blockd.h" -#include "vp9_onyxc_int.h" -#include "vp9_entropymode.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9/common/vp9_entropymode.h" #include "vpx_mem/vpx_mem.h" #define uchar unsigned char /* typedefs can clash */ @@ -26,7 +26,7 @@ typedef const uint cuint; typedef vp9_prob Prob; -#include "vp9_coefupdateprobs.h" +#include "vp9/common/vp9_coefupdateprobs.h" const int vp9_i8x8_block[4] = {0, 2, 8, 10}; @@ -200,7 +200,7 @@ vp9_extra_bit_struct vp9_extra_bits[12] = { { 0, 0, 0, 0} }; -#include "vp9_default_coef_probs.h" +#include "vp9/common/vp9_default_coef_probs.h" void vp9_default_coef_probs(VP9_COMMON *pc) { vpx_memcpy(pc->fc.coef_probs, default_coef_probs, diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index a2053609b..ccf68a422 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -12,10 +12,10 @@ #ifndef __INC_ENTROPY_H #define __INC_ENTROPY_H -#include "vp9_treecoder.h" -#include "vp9_blockd.h" -#include "vp9_common.h" -#include "vp9_coefupdateprobs.h" +#include "vp9/common/vp9_treecoder.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9/common/vp9_common.h" +#include "vp9/common/vp9_coefupdateprobs.h" extern const int vp9_i8x8_block[4]; diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index 0eb21ca82..9b48dc97a 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -9,8 +9,8 @@ */ -#include "vp9_onyxc_int.h" -#include "vp9_modecont.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9/common/vp9_modecont.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h index aee6e6c76..0b14cf67e 100644 --- a/vp9/common/vp9_entropymode.h +++ b/vp9/common/vp9_entropymode.h @@ -12,8 +12,8 @@ #ifndef __INC_ENTROPYMODE_H #define __INC_ENTROPYMODE_H -#include "vp9_blockd.h" -#include "vp9_treecoder.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9/common/vp9_treecoder.h" #define SUBMVREF_COUNT 5 #define VP9_NUMMBSPLITS 4 diff --git a/vp9/common/vp9_entropymv.c b/vp9/common/vp9_entropymv.c index 8d2ebebc4..94543c54d 100644 --- a/vp9/common/vp9_entropymv.c +++ b/vp9/common/vp9_entropymv.c @@ -9,8 +9,8 @@ */ -#include "vp9_onyxc_int.h" -#include "vp9_entropymv.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9/common/vp9_entropymv.h" //#define MV_COUNT_TESTING diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h index 3be95117c..b6b35df04 100644 --- a/vp9/common/vp9_entropymv.h +++ b/vp9/common/vp9_entropymv.h @@ -12,9 +12,9 @@ #ifndef __INC_ENTROPYMV_H #define __INC_ENTROPYMV_H -#include "vp9_treecoder.h" +#include "vp9/common/vp9_treecoder.h" #include "vpx_config.h" -#include "vp9_blockd.h" +#include "vp9/common/vp9_blockd.h" struct VP9Common; diff --git a/vp9/common/vp9_extend.c b/vp9/common/vp9_extend.c index 4f2aa0e0c..61c7abfc7 100644 --- a/vp9/common/vp9_extend.c +++ b/vp9/common/vp9_extend.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp9_extend.h" +#include "vp9/common/vp9_extend.h" #include "vpx_mem/vpx_mem.h" static void copy_and_extend_plane(unsigned char *s, /* source */ diff --git a/vp9/common/vp9_filter.c b/vp9/common/vp9_filter.c index 8d5eb9333..18217e627 100644 --- a/vp9/common/vp9_filter.c +++ b/vp9/common/vp9_filter.c @@ -10,7 +10,7 @@ #include <stdlib.h> -#include "vp9_filter.h" +#include "vp9/common/vp9_filter.h" #include "vpx_ports/mem.h" #include "vp9_rtcd.h" diff --git a/vp9/common/vp9_findnearmv.c b/vp9/common/vp9_findnearmv.c index bfbac4e18..ed8a99af2 100644 --- a/vp9/common/vp9_findnearmv.c +++ b/vp9/common/vp9_findnearmv.c @@ -9,7 +9,7 @@ */ -#include "vp9_findnearmv.h" +#include "vp9/common/vp9_findnearmv.h" #include "vp9/common/vp9_sadmxn.h" #include "vp9/common/vp9_subpelvar.h" #include <limits.h> diff --git a/vp9/common/vp9_findnearmv.h b/vp9/common/vp9_findnearmv.h index 759bdbaff..a12a72201 100644 --- a/vp9/common/vp9_findnearmv.h +++ b/vp9/common/vp9_findnearmv.h @@ -12,10 +12,10 @@ #ifndef __INC_FINDNEARMV_H #define __INC_FINDNEARMV_H -#include "vp9_mv.h" -#include "vp9_blockd.h" -#include "vp9_treecoder.h" -#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_mv.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9/common/vp9_treecoder.h" +#include "vp9/common/vp9_onyxc_int.h" /* check a list of motion vectors by sad score using a number rows of pixels * above and a number cols of pixels in the left to select the one with best diff --git a/vp9/common/vp9_invtrans.c b/vp9/common/vp9_invtrans.c index 76eb10307..b79977385 100644 --- a/vp9/common/vp9_invtrans.c +++ b/vp9/common/vp9_invtrans.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp9_invtrans.h" +#include "vp9/common/vp9_invtrans.h" #include "./vp9_rtcd.h" static void recon_dcblock(MACROBLOCKD *xd) { diff --git a/vp9/common/vp9_invtrans.h b/vp9/common/vp9_invtrans.h index 0e50c45d7..9ac9bb1cd 100644 --- a/vp9/common/vp9_invtrans.h +++ b/vp9/common/vp9_invtrans.h @@ -12,7 +12,7 @@ #define __INC_INVTRANS_H #include "vpx_ports/config.h" -#include "vp9_blockd.h" +#include "vp9/common/vp9_blockd.h" extern void vp9_inverse_transform_b_4x4(MACROBLOCKD *xd, int block, int pitch); diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index 73b343974..8d4d014ba 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -9,8 +9,8 @@ */ #include "vpx_config.h" -#include "vp9_loopfilter.h" -#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_loopfilter.h" +#include "vp9/common/vp9_onyxc_int.h" #include "vpx_mem/vpx_mem.h" #include "vp9/common/vp9_seg_common.h" diff --git a/vp9/common/vp9_loopfilter.h b/vp9/common/vp9_loopfilter.h index b3254f692..34d1cd37f 100644 --- a/vp9/common/vp9_loopfilter.h +++ b/vp9/common/vp9_loopfilter.h @@ -13,7 +13,7 @@ #include "vpx_ports/mem.h" #include "vpx_config.h" -#include "vp9_blockd.h" +#include "vp9/common/vp9_blockd.h" #define MAX_LOOP_FILTER 63 diff --git a/vp9/common/vp9_loopfilter_filters.c b/vp9/common/vp9_loopfilter_filters.c index 9fd6c5fa6..b8cfb9c1a 100644 --- a/vp9/common/vp9_loopfilter_filters.c +++ b/vp9/common/vp9_loopfilter_filters.c @@ -10,8 +10,8 @@ #include <stdlib.h> #include "vpx_config.h" -#include "vp9_loopfilter.h" -#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_loopfilter.h" +#include "vp9/common/vp9_onyxc_int.h" typedef unsigned char uc; diff --git a/vp9/common/vp9_mbpitch.c b/vp9/common/vp9_mbpitch.c index b42db987a..84e473bb1 100644 --- a/vp9/common/vp9_mbpitch.c +++ b/vp9/common/vp9_mbpitch.c @@ -9,7 +9,7 @@ */ -#include "vp9_blockd.h" +#include "vp9/common/vp9_blockd.h" typedef enum { PRED = 0, diff --git a/vp9/common/vp9_modecont.c b/vp9/common/vp9_modecont.c index 2f5bbd2ba..64ff377c3 100644 --- a/vp9/common/vp9_modecont.c +++ b/vp9/common/vp9_modecont.c @@ -9,7 +9,7 @@ */ -#include "vp9_entropy.h" +#include "vp9/common/vp9_entropy.h" const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4] = { {223, 1, 1, 237}, // 0,0 best: Only candidate diff --git a/vp9/common/vp9_modecontext.c b/vp9/common/vp9_modecontext.c index e18cf63c1..ab91c0b14 100644 --- a/vp9/common/vp9_modecontext.c +++ b/vp9/common/vp9_modecontext.c @@ -9,7 +9,7 @@ */ -#include "vp9_entropymode.h" +#include "vp9/common/vp9_entropymode.h" const unsigned int vp9_kf_default_bmode_counts[VP9_KF_BINTRAMODES] [VP9_KF_BINTRAMODES] diff --git a/vp9/common/vp9_mvref_common.c b/vp9/common/vp9_mvref_common.c index 33dc3fa5b..dce49304d 100644 --- a/vp9/common/vp9_mvref_common.c +++ b/vp9/common/vp9_mvref_common.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp9_mvref_common.h" +#include "vp9/common/vp9_mvref_common.h" #define MVREF_NEIGHBOURS 8 static int mb_mv_ref_search[MVREF_NEIGHBOURS][2] = { diff --git a/vp9/common/vp9_mvref_common.h b/vp9/common/vp9_mvref_common.h index 9a1877919..eb8626ed2 100644 --- a/vp9/common/vp9_mvref_common.h +++ b/vp9/common/vp9_mvref_common.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp9_onyxc_int.h" -#include "vp9_blockd.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9/common/vp9_blockd.h" #ifndef __INC_MVREF_COMMON_H diff --git a/vp9/common/vp9_onyx.h b/vp9/common/vp9_onyx.h index 92ec667e7..96c7123b4 100644 --- a/vp9/common/vp9_onyx.h +++ b/vp9/common/vp9_onyx.h @@ -20,8 +20,8 @@ extern "C" #include "vpx/internal/vpx_codec_internal.h" #include "vpx/vp8cx.h" #include "vpx_scale/yv12config.h" -#include "vp9_type_aliases.h" -#include "vp9_ppflags.h" +#include "vp9/common/vp9_type_aliases.h" +#include "vp9/common/vp9_ppflags.h" typedef int *VP9_PTR; /* Create/destroy static data structures. */ diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index bef4b41ac..1bbdaeeb5 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -15,16 +15,16 @@ #include "vpx_config.h" #include "vpx/internal/vpx_codec_internal.h" #include "vp9_rtcd.h" -#include "vp9_loopfilter.h" -#include "vp9_entropymv.h" -#include "vp9_entropy.h" -#include "vp9_entropymode.h" +#include "vp9/common/vp9_loopfilter.h" +#include "vp9/common/vp9_entropymv.h" +#include "vp9/common/vp9_entropy.h" +#include "vp9/common/vp9_entropymode.h" #if CONFIG_POSTPROC -#include "vp9_postproc.h" +#include "vp9/common/vp9_postproc.h" #endif /*#ifdef PACKET_TESTING*/ -#include "vp9_header.h" +#include "vp9/common/vp9_header.h" /*#endif*/ /* Create/destroy static data structures. */ diff --git a/vp9/common/vp9_onyxd.h b/vp9/common/vp9_onyxd.h index 2fc51db96..af16ee71c 100644 --- a/vp9/common/vp9_onyxd.h +++ b/vp9/common/vp9_onyxd.h @@ -18,9 +18,9 @@ extern "C" { #endif -#include "vp9_type_aliases.h" +#include "vp9/common/vp9_type_aliases.h" #include "vpx_scale/yv12config.h" -#include "vp9_ppflags.h" +#include "vp9/common/vp9_ppflags.h" #include "vpx_ports/mem.h" #include "vpx/vpx_codec.h" diff --git a/vp9/common/vp9_postproc.c b/vp9/common/vp9_postproc.c index aa8186be2..2cf3b6f77 100644 --- a/vp9/common/vp9_postproc.c +++ b/vp9/common/vp9_postproc.c @@ -11,10 +11,10 @@ #include "vpx_ports/config.h" #include "vpx_scale/yv12config.h" -#include "vp9_postproc.h" +#include "vp9/common/vp9_postproc.h" #include "vp9/common/vp9_textblit.h" #include "vpx_scale/vpxscale.h" -#include "vp9_systemdependent.h" +#include "vp9/common/vp9_systemdependent.h" #include "./vp9_rtcd.h" diff --git a/vp9/common/vp9_postproc.h b/vp9/common/vp9_postproc.h index de011b575..d7fc30db4 100644 --- a/vp9/common/vp9_postproc.h +++ b/vp9/common/vp9_postproc.h @@ -21,8 +21,8 @@ struct postproc_state { DECLARE_ALIGNED(16, char, whiteclamp[16]); DECLARE_ALIGNED(16, char, bothclamp[16]); }; -#include "vp9_onyxc_int.h" -#include "vp9_ppflags.h" +#include "vp9/common/vp9_onyxc_int.h" +#include "vp9/common/vp9_ppflags.h" int vp9_post_proc_frame(struct VP9Common *oci, YV12_BUFFER_CONFIG *dest, vp9_ppflags_t *flags); diff --git a/vp9/common/vp9_pred_common.h b/vp9/common/vp9_pred_common.h index 2628bb3ca..28511c2f2 100644 --- a/vp9/common/vp9_pred_common.h +++ b/vp9/common/vp9_pred_common.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp9_type_aliases.h" -#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_type_aliases.h" +#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_blockd.h" #ifndef __INC_PRED_COMMON_H__ diff --git a/vp9/common/vp9_quant_common.c b/vp9/common/vp9_quant_common.c index 5d1f2594a..119038121 100644 --- a/vp9/common/vp9_quant_common.c +++ b/vp9/common/vp9_quant_common.c @@ -9,7 +9,7 @@ */ -#include "vp9_quant_common.h" +#include "vp9/common/vp9_quant_common.h" static int dc_qlookup[QINDEX_RANGE]; static int ac_qlookup[QINDEX_RANGE]; diff --git a/vp9/common/vp9_quant_common.h b/vp9/common/vp9_quant_common.h index 88588d5d2..6e0555e09 100644 --- a/vp9/common/vp9_quant_common.h +++ b/vp9/common/vp9_quant_common.h @@ -10,8 +10,8 @@ #include "string.h" -#include "vp9_blockd.h" -#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9/common/vp9_onyxc_int.h" extern void vp9_init_quant_tables(); extern int vp9_ac_yquant(int QIndex); diff --git a/vp9/common/vp9_recon.c b/vp9/common/vp9_recon.c index 9c9029f2a..1f8dfce34 100644 --- a/vp9/common/vp9_recon.c +++ b/vp9/common/vp9_recon.c @@ -11,7 +11,7 @@ #include "vpx_ports/config.h" #include "vp9_rtcd.h" -#include "vp9_blockd.h" +#include "vp9/common/vp9_blockd.h" void vp9_recon_b_c ( diff --git a/vp9/common/vp9_reconinter.c b/vp9/common/vp9_reconinter.c index eac07ae19..bcd75ec8b 100644 --- a/vp9/common/vp9_reconinter.c +++ b/vp9/common/vp9_reconinter.c @@ -11,11 +11,11 @@ #include "vpx_ports/config.h" #include "vpx/vpx_integer.h" -#include "vp9_blockd.h" -#include "vp9_reconinter.h" +#include "vp9/common/vp9_blockd.h" +#include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_reconintra.h" #if CONFIG_RUNTIME_CPU_DETECT -#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_onyxc_int.h" #endif void vp9_setup_interp_filters(MACROBLOCKD *xd, diff --git a/vp9/common/vp9_reconinter.h b/vp9/common/vp9_reconinter.h index 25a8adc3b..70ffd3bd1 100644 --- a/vp9/common/vp9_reconinter.h +++ b/vp9/common/vp9_reconinter.h @@ -11,7 +11,7 @@ #ifndef __INC_RECONINTER_H #define __INC_RECONINTER_H -#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_onyxc_int.h" extern void vp9_build_1st_inter16x16_predictors_mby(MACROBLOCKD *xd, unsigned char *dst_y, diff --git a/vp9/common/vp9_reconintra.c b/vp9/common/vp9_reconintra.c index 8199b94ae..5c5d4abbb 100644 --- a/vp9/common/vp9_reconintra.c +++ b/vp9/common/vp9_reconintra.c @@ -11,7 +11,7 @@ #include <stdio.h> #include "vpx_ports/config.h" #include "vp9_rtcd.h" -#include "vp9_reconintra.h" +#include "vp9/common/vp9_reconintra.h" #include "vpx_mem/vpx_mem.h" /* For skip_recon_mb(), add vp9_build_intra_predictors_mby_s(MACROBLOCKD *xd) diff --git a/vp9/common/vp9_reconintra.h b/vp9/common/vp9_reconintra.h index dd35b06ad..3ef44c85d 100644 --- a/vp9/common/vp9_reconintra.h +++ b/vp9/common/vp9_reconintra.h @@ -11,7 +11,7 @@ #ifndef __INC_RECONINTRA_H #define __INC_RECONINTRA_H -#include "vp9_blockd.h" +#include "vp9/common/vp9_blockd.h" extern void vp9_recon_intra_mbuv(MACROBLOCKD *xd); extern B_PREDICTION_MODE vp9_find_dominant_direction(unsigned char *ptr, diff --git a/vp9/common/vp9_reconintra4x4.c b/vp9/common/vp9_reconintra4x4.c index d5203acd0..e4a24f2cb 100644 --- a/vp9/common/vp9_reconintra4x4.c +++ b/vp9/common/vp9_reconintra4x4.c @@ -11,7 +11,7 @@ #include "vpx_ports/config.h" #include "vpx_mem/vpx_mem.h" -#include "vp9_reconintra.h" +#include "vp9/common/vp9_reconintra.h" #include "vp9_rtcd.h" #if CONFIG_NEWBINTRAMODES diff --git a/vp9/common/vp9_seg_common.h b/vp9/common/vp9_seg_common.h index 20959a705..29eee4ce9 100644 --- a/vp9/common/vp9_seg_common.h +++ b/vp9/common/vp9_seg_common.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp9_type_aliases.h" -#include "vp9_onyxc_int.h" +#include "vp9/common/vp9_type_aliases.h" +#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_blockd.h" #ifndef __INC_SEG_COMMON_H__ diff --git a/vp9/common/vp9_setupintrarecon.c b/vp9/common/vp9_setupintrarecon.c index 3fe4e3e50..2c84cd0c4 100644 --- a/vp9/common/vp9_setupintrarecon.c +++ b/vp9/common/vp9_setupintrarecon.c @@ -9,7 +9,7 @@ */ -#include "vp9_setupintrarecon.h" +#include "vp9/common/vp9_setupintrarecon.h" #include "vpx_mem/vpx_mem.h" void vp9_setup_intra_recon(YV12_BUFFER_CONFIG *ybf) { diff --git a/vp9/common/vp9_swapyv12buffer.c b/vp9/common/vp9_swapyv12buffer.c index 7882e0be0..b01462538 100644 --- a/vp9/common/vp9_swapyv12buffer.c +++ b/vp9/common/vp9_swapyv12buffer.c @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "vp9_swapyv12buffer.h" +#include "vp9/common/vp9_swapyv12buffer.h" void vp9_swap_yv12_buffer(YV12_BUFFER_CONFIG *new_frame, YV12_BUFFER_CONFIG *last_frame) { diff --git a/vp9/common/vp9_treecoder.c b/vp9/common/vp9_treecoder.c index 096dd59e5..64018a100 100644 --- a/vp9/common/vp9_treecoder.c +++ b/vp9/common/vp9_treecoder.c @@ -16,7 +16,7 @@ #endif #include <stdio.h> -#include "vp9_treecoder.h" +#include "vp9/common/vp9_treecoder.h" static void tree2tok( struct vp9_token_struct *const p, |