Commit c6787398 authored by Jim Bankoski's avatar Jim Bankoski

fixed includes to be fully specified

Change-Id: Ia1cce221f8511561b9cbd8edb7726fbc286ff243
parent 926d95cd
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <math.h> #include <math.h>
#include "vp9/common/vp9_filter.h" #include "vp9/common/vp9_filter.h"
#include "vp9/common/vp9_subpixel.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 void vp9_filter_block2d_bil_armv6
( (
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
*/ */
#include "vp9_loopfilter.h" #include "vp9/common/vp9_loopfilter.h"
#include "vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
typedef void loop_filter_function_y_ppc typedef void loop_filter_function_y_ppc
( (
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vp9_subpixel.h" #include "vp9/common/vp9_subpixel.h"
#include "vp9_loopfilter.h" #include "vp9/common/vp9_loopfilter.h"
#include "recon.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)(short *input, short *output, int pitch);
void (*vp8_short_idct4x4_1)(short *input, short *output, int pitch); void (*vp8_short_idct4x4_1)(short *input, short *output, int pitch);
......
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9_findnearmv.h" #include "vp9/common/vp9_findnearmv.h"
#include "vp9_entropymode.h" #include "vp9/common/vp9_entropymode.h"
#include "vp9_entropymv.h" #include "vp9/common/vp9_entropymv.h"
#include "vp9_systemdependent.h" #include "vp9/common/vp9_systemdependent.h"
void vp9_update_mode_info_border(VP9_COMMON *cpi, MODE_INFO *mi_base) { void vp9_update_mode_info_border(VP9_COMMON *cpi, MODE_INFO *mi_base) {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef __INC_ALLOCCOMMON_H #ifndef __INC_ALLOCCOMMON_H
#define __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_create_common(VP9_COMMON *oci);
void vp9_remove_common(VP9_COMMON *oci); void vp9_remove_common(VP9_COMMON *oci);
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
......
...@@ -16,11 +16,11 @@ void vpx_log(const char *format, ...); ...@@ -16,11 +16,11 @@ void vpx_log(const char *format, ...);
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "vp9_mv.h" #include "vp9/common/vp9_mv.h"
#include "vp9_treecoder.h" #include "vp9/common/vp9_treecoder.h"
#include "vp9_subpixel.h" #include "vp9/common/vp9_subpixel.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vp9_common.h" #include "vp9/common/vp9_common.h"
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "vpx_mem/vpx_mem.h" #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. */ /* Only need this for fixed-size arrays, for structs just assign. */
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vp9_entropy.h" #include "vp9/common/vp9_entropy.h"
/* *** GENERATED FILE: DO NOT EDIT *** */ /* *** GENERATED FILE: DO NOT EDIT *** */
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include <stdio.h> #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, void vp9_print_modes_and_motion_vectors(MODE_INFO *mi, int rows, int cols,
int frame) { int frame) {
......
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
#include <stdio.h> #include <stdio.h>
#include "vp9_entropy.h" #include "vp9/common/vp9_entropy.h"
#include "string.h" #include "string.h"
#include "vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9_entropymode.h" #include "vp9/common/vp9_entropymode.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#define uchar unsigned char /* typedefs can clash */ #define uchar unsigned char /* typedefs can clash */
...@@ -26,7 +26,7 @@ typedef const uint cuint; ...@@ -26,7 +26,7 @@ typedef const uint cuint;
typedef vp9_prob Prob; typedef vp9_prob Prob;
#include "vp9_coefupdateprobs.h" #include "vp9/common/vp9_coefupdateprobs.h"
const int vp9_i8x8_block[4] = {0, 2, 8, 10}; const int vp9_i8x8_block[4] = {0, 2, 8, 10};
...@@ -200,7 +200,7 @@ vp9_extra_bit_struct vp9_extra_bits[12] = { ...@@ -200,7 +200,7 @@ vp9_extra_bit_struct vp9_extra_bits[12] = {
{ 0, 0, 0, 0} { 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) { void vp9_default_coef_probs(VP9_COMMON *pc) {
vpx_memcpy(pc->fc.coef_probs, default_coef_probs, vpx_memcpy(pc->fc.coef_probs, default_coef_probs,
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
#ifndef __INC_ENTROPY_H #ifndef __INC_ENTROPY_H
#define __INC_ENTROPY_H #define __INC_ENTROPY_H
#include "vp9_treecoder.h" #include "vp9/common/vp9_treecoder.h"
#include "vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vp9_common.h" #include "vp9/common/vp9_common.h"
#include "vp9_coefupdateprobs.h" #include "vp9/common/vp9_coefupdateprobs.h"
extern const int vp9_i8x8_block[4]; extern const int vp9_i8x8_block[4];
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
*/ */
#include "vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9_modecont.h" #include "vp9/common/vp9_modecont.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#ifndef __INC_ENTROPYMODE_H #ifndef __INC_ENTROPYMODE_H
#define __INC_ENTROPYMODE_H #define __INC_ENTROPYMODE_H
#include "vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vp9_treecoder.h" #include "vp9/common/vp9_treecoder.h"
#define SUBMVREF_COUNT 5 #define SUBMVREF_COUNT 5
#define VP9_NUMMBSPLITS 4 #define VP9_NUMMBSPLITS 4
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
*/ */
#include "vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9_entropymv.h" #include "vp9/common/vp9_entropymv.h"
//#define MV_COUNT_TESTING //#define MV_COUNT_TESTING
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
#ifndef __INC_ENTROPYMV_H #ifndef __INC_ENTROPYMV_H
#define __INC_ENTROPYMV_H #define __INC_ENTROPYMV_H
#include "vp9_treecoder.h" #include "vp9/common/vp9_treecoder.h"
#include "vpx_config.h" #include "vpx_config.h"
#include "vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
struct VP9Common; struct VP9Common;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vp9_extend.h" #include "vp9/common/vp9_extend.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
static void copy_and_extend_plane(unsigned char *s, /* source */ static void copy_and_extend_plane(unsigned char *s, /* source */
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "vp9_filter.h" #include "vp9/common/vp9_filter.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vp9_rtcd.h" #include "vp9_rtcd.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vp9_findnearmv.h" #include "vp9/common/vp9_findnearmv.h"
#include "vp9/common/vp9_sadmxn.h" #include "vp9/common/vp9_sadmxn.h"
#include "vp9/common/vp9_subpelvar.h" #include "vp9/common/vp9_subpelvar.h"
#include <limits.h> #include <limits.h>
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
#ifndef __INC_FINDNEARMV_H #ifndef __INC_FINDNEARMV_H
#define __INC_FINDNEARMV_H #define __INC_FINDNEARMV_H
#include "vp9_mv.h" #include "vp9/common/vp9_mv.h"
#include "vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vp9_treecoder.h" #include "vp9/common/vp9_treecoder.h"
#include "vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
/* check a list of motion vectors by sad score using a number rows of pixels /* 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 * above and a number cols of pixels in the left to select the one with best
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vp9_invtrans.h" #include "vp9/common/vp9_invtrans.h"
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
static void recon_dcblock(MACROBLOCKD *xd) { static void recon_dcblock(MACROBLOCKD *xd) {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define __INC_INVTRANS_H #define __INC_INVTRANS_H
#include "vpx_ports/config.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); extern void vp9_inverse_transform_b_4x4(MACROBLOCKD *xd, int block, int pitch);
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
*/ */
#include "vpx_config.h" #include "vpx_config.h"
#include "vp9_loopfilter.h" #include "vp9/common/vp9_loopfilter.h"
#include "vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vp9/common/vp9_seg_common.h" #include "vp9/common/vp9_seg_common.h"
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_config.h" #include "vpx_config.h"
#include "vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#define MAX_LOOP_FILTER 63 #define MAX_LOOP_FILTER 63
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <stdlib.h> #include <stdlib.h>
#include "vpx_config.h" #include "vpx_config.h"
#include "vp9_loopfilter.h" #include "vp9/common/vp9_loopfilter.h"
#include "vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
typedef unsigned char uc; typedef unsigned char uc;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
typedef enum { typedef enum {
PRED = 0, PRED = 0,
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "vp9_entropy.h" #include "vp9/common/vp9_entropy.h"
const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4] = { const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4] = {
{223, 1, 1, 237}, // 0,0 best: Only candidate {223, 1, 1, 237}, // 0,0 best: Only candidate
......
...@@ -9,7 +9,7 @@ ...@@ -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] const unsigned int vp9_kf_default_bmode_counts[VP9_KF_BINTRAMODES]
[VP9_KF_BINTRAMODES] [VP9_KF_BINTRAMODES]
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vp9_mvref_common.h" #include "vp9/common/vp9_mvref_common.h"
#define MVREF_NEIGHBOURS 8 #define MVREF_NEIGHBOURS 8
static int mb_mv_ref_search[MVREF_NEIGHBOURS][2] = { static int mb_mv_ref_search[MVREF_NEIGHBOURS][2] = {
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#ifndef __INC_MVREF_COMMON_H #ifndef __INC_MVREF_COMMON_H
......
...@@ -20,8 +20,8 @@ extern "C" ...@@ -20,8 +20,8 @@ extern "C"
#include "vpx/internal/vpx_codec_internal.h" #include "vpx/internal/vpx_codec_internal.h"
#include "vpx/vp8cx.h" #include "vpx/vp8cx.h"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "vp9_type_aliases.h" #include "vp9/common/vp9_type_aliases.h"
#include "vp9_ppflags.h" #include "vp9/common/vp9_ppflags.h"
typedef int *VP9_PTR; typedef int *VP9_PTR;
/* Create/destroy static data structures. */ /* Create/destroy static data structures. */
......
...@@ -15,16 +15,16 @@ ...@@ -15,16 +15,16 @@
#include "vpx_config.h" #include "vpx_config.h"
#include "vpx/internal/vpx_codec_internal.h" #include "vpx/internal/vpx_codec_internal.h"
#include "vp9_rtcd.h" #include "vp9_rtcd.h"
#include "vp9_loopfilter.h" #include "vp9/common/vp9_loopfilter.h"
#include "vp9_entropymv.h" #include "vp9/common/vp9_entropymv.h"
#include "vp9_entropy.h" #include "vp9/common/vp9_entropy.h"
#include "vp9_entropymode.h" #include "vp9/common/vp9_entropymode.h"
#if CONFIG_POSTPROC #if CONFIG_POSTPROC
#include "vp9_postproc.h" #include "vp9/common/vp9_postproc.h"
#endif #endif
/*#ifdef PACKET_TESTING*/ /*#ifdef PACKET_TESTING*/
#include "vp9_header.h" #include "vp9/common/vp9_header.h"
/*#endif*/ /*#endif*/
/* Create/destroy static data structures. */ /* Create/destroy static data structures. */
......
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
extern "C" extern "C"
{ {
#endif #endif
#include "vp9_type_aliases.h" #include "vp9/common/vp9_type_aliases.h"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "vp9_ppflags.h" #include "vp9/common/vp9_ppflags.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx/vpx_codec.h" #include "vpx/vpx_codec.h"
......
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
#include "vpx_ports/config.h" #include "vpx_ports/config.h"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "vp9_postproc.h" #include "vp9/common/vp9_postproc.h"
#include "vp9/common/vp9_textblit.h" #include "vp9/common/vp9_textblit.h"
#include "vpx_scale/vpxscale.h" #include "vpx_scale/vpxscale.h"
#include "vp9_systemdependent.h" #include "vp9/common/vp9_systemdependent.h"
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
......
...@@ -21,8 +21,8 @@ struct postproc_state { ...@@ -21,8 +21,8 @@ struct postproc_state {
DECLARE_ALIGNED(16, char, whiteclamp[16]); DECLARE_ALIGNED(16, char, whiteclamp[16]);
DECLARE_ALIGNED(16, char, bothclamp[16]); DECLARE_ALIGNED(16, char, bothclamp[16]);
}; };
#include "vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9_ppflags.h" #include "vp9/common/vp9_ppflags.h"
int vp9_post_proc_frame(struct VP9Common *oci, YV12_BUFFER_CONFIG *dest, int vp9_post_proc_frame(struct VP9Common *oci, YV12_BUFFER_CONFIG *dest,
vp9_ppflags_t *flags); vp9_ppflags_t *flags);
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vp9_type_aliases.h" #include "vp9/common/vp9_type_aliases.h"
#include "vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#ifndef __INC_PRED_COMMON_H__