Add vp9_ prefix to all vp9 files

Support for gyp which doesn't support multiple objects in the same
static library having the same basename.

Change-Id: Ib947eefbaf68f8b177a796d23f875ccdfa6bc9dc

test/variance_test.cc

@@ -14,7 +14,7 @@
 
 #include "vpx_config.h"
 extern "C" {
-#include "vp9/encoder/variance.h"
+#include "vp9/encoder/vp9_variance.h"
 #include "vpx/vpx_integer.h"
 #include "vp9_rtcd.h"
 }

test/vp9_boolcoder_test.cc

@@ -15,8 +15,8 @@
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
 extern "C" {
-#include "vp9/encoder/boolhuff.h"
-#include "vp9/decoder/dboolhuff.h"
+#include "vp9/encoder/vp9_boolhuff.h"
+#include "vp9/decoder/vp9_dboolhuff.h"
 }
 
 #include "acm_random.h"

vp9/common/arm/neon/vp9_recon_neon.c

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

vp9/common/arm/vp9_arm_systemdependent.c

@@ -11,11 +11,11 @@
 
 #include "vpx_ports/config.h"
 #include "vpx_ports/arm.h"
-#include "vp9/common/pragmas.h"
-#include "vp9/common/subpixel.h"
-#include "vp9/common/loopfilter.h"
+#include "vp9/common/vp9_pragmas.h"
+#include "vp9/common/vp9_subpixel.h"
+#include "vp9/common/vp9_loopfilter.h"
 #include "vp9/common/recon.h"
-#include "vp9/common/onyxc_int.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 void vp9_arch_arm_common_init(VP9_COMMON *ctx) {
 #if CONFIG_RUNTIME_CPU_DETECT

vp9/common/arm/vp9_bilinearfilter_arm.c

@@ -10,9 +10,9 @@
 
 
 #include <math.h>
-#include "vp9/common/filter.h"
-#include "vp9/common/subpixel.h"
-#include "bilinearfilter_arm.h"
+#include "vp9/common/vp9_filter.h"
+#include "vp9/common/vp9_subpixel.h"
+#include "vp9_bilinearfilter_arm.h"
 
 void vp9_filter_block2d_bil_armv6
 (

vp9/common/arm/vp9_filter_arm.c

@@ -11,8 +11,8 @@
 
 #include "vpx_ports/config.h"
 #include <math.h>
-#include "vp9/common/filter.h"
-#include "vp9/common/subpixel.h"
+#include "vp9/common/vp9_filter.h"
+#include "vp9/common/vp9_subpixel.h"
 #include "vpx_ports/mem.h"
 
 extern void vp9_filter_block2d_first_pass_armv6

vp9/common/arm/vp9_loopfilter_arm.c

@@ -10,8 +10,8 @@
 
 
 #include "vpx_config.h"
-#include "vp9/common/loopfilter.h"
-#include "vp9/common/onyxc_int.h"
+#include "vp9/common/vp9_loopfilter.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 #if HAVE_ARMV6
 extern prototype_loopfilter(vp9_loop_filter_horizontal_edge_armv6);

vp9/common/arm/vp9_reconintra_arm.c

@@ -10,8 +10,8 @@
 
 
 #include "vpx_ports/config.h"
-#include "vp9/common/blockd.h"
-#include "vp9/common/reconintra.h"
+#include "vp9/common/vp9_blockd.h"
+#include "vp9/common/vp9_reconintra.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp9/common/recon.h"
 

vp9/common/generic/vp9_systemdependent.c

@@ -11,9 +11,9 @@
 
 #include "vpx_ports/config.h"
 #include "vp9_rtcd.h"
-#include "vp9/common/subpixel.h"
-#include "vp9/common/loopfilter.h"
-#include "vp9/common/onyxc_int.h"
+#include "vp9/common/vp9_subpixel.h"
+#include "vp9/common/vp9_loopfilter.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 extern void vp9_arch_x86_common_init(VP9_COMMON *ctx);
 extern void vp9_arch_arm_common_init(VP9_COMMON *ctx);

vp9/common/ppc/vp9_loopfilter_altivec.c

@@ -9,8 +9,8 @@
  */
 
 
-#include "loopfilter.h"
-#include "onyxc_int.h"
+#include "vp9_loopfilter.h"
+#include "vp9_onyxc_int.h"
 
 typedef void loop_filter_function_y_ppc
 (

vp9/common/ppc/vp9_systemdependent.c

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "subpixel.h"
-#include "loopfilter.h"
+#include "vp9_subpixel.h"
+#include "vp9_loopfilter.h"
 #include "recon.h"
-#include "onyxc_int.h"
+#include "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);

vp9/common/vp9_alloccommon.c

@@ -10,13 +10,13 @@
 
 
 #include "vpx_ports/config.h"
-#include "blockd.h"
+#include "vp9_blockd.h"
 #include "vpx_mem/vpx_mem.h"
-#include "onyxc_int.h"
-#include "findnearmv.h"
-#include "entropymode.h"
-#include "entropymv.h"
-#include "systemdependent.h"
+#include "vp9_onyxc_int.h"
+#include "vp9_findnearmv.h"
+#include "vp9_entropymode.h"
+#include "vp9_entropymv.h"
+#include "vp9_systemdependent.h"
 
 
 void vp9_update_mode_info_border(VP9_COMMON *cpi, MODE_INFO *mi_base) {

vp9/common/vp9_alloccommon.h

@@ -12,7 +12,7 @@
 #ifndef __INC_ALLOCCOMMON_H
 #define __INC_ALLOCCOMMON_H
 
-#include "onyxc_int.h"
+#include "vp9_onyxc_int.h"
 
 void vp9_create_common(VP9_COMMON *oci);
 void vp9_remove_common(VP9_COMMON *oci);

vp9/common/vp9_blockd.c

@@ -9,7 +9,7 @@
  */
 
 
-#include "blockd.h"
+#include "vp9_blockd.h"
 #include "vpx_mem/vpx_mem.h"
 
 

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 "mv.h"
-#include "treecoder.h"
-#include "subpixel.h"
+#include "vp9_mv.h"
+#include "vp9_treecoder.h"
+#include "vp9_subpixel.h"
 #include "vpx_ports/mem.h"
-#include "common.h"
+#include "vp9_common.h"
 
 #define TRUE    1
 #define FALSE   0

vp9/common/vp9_coefupdateprobs.h

@@ -10,7 +10,7 @@
 
 
 /* Update probabilities for the nodes in the token entropy tree.
-   Generated file included by entropy.c */
+   Generated file included by vp9_entropy.c */
 #define COEF_UPDATE_PROB 252
 #define COEF_UPDATE_PROB_8X8 252
 #define COEF_UPDATE_PROB_16X16 252

vp9/common/vp9_common.h

@@ -18,7 +18,7 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "common_types.h"
+#include "vp9_common_types.h"
 
 /* Only need this for fixed-size arrays, for structs just assign. */
 

vp9/common/vp9_context.c

@@ -9,7 +9,7 @@
  */
 
 
-#include "entropy.h"
+#include "vp9_entropy.h"
 
 /* *** GENERATED FILE: DO NOT EDIT *** */
 

vp9/common/vp9_debugmodes.c

@@ -9,7 +9,7 @@
  */
 
 #include <stdio.h>
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 void vp9_print_modes_and_motion_vectors(MODE_INFO *mi, int rows, int cols,
                                         int frame) {

vp9/common/vp9_default_coef_probs.h

@@ -9,7 +9,7 @@
 */
 
 
-/*Generated file, included by entropy.c*/
+/*Generated file, included by vp9_entropy.c*/
 
 
 static const vp9_prob default_coef_probs [BLOCK_TYPES]

vp9/common/vp9_entropy.c

@@ -11,11 +11,11 @@
 
 #include <stdio.h>
 
-#include "entropy.h"
+#include "vp9_entropy.h"
 #include "string.h"
-#include "blockd.h"
-#include "onyxc_int.h"
-#include "entropymode.h"
+#include "vp9_blockd.h"
+#include "vp9_onyxc_int.h"
+#include "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 "coefupdateprobs.h"
+#include "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 "default_coef_probs.h"
+#include "vp9_default_coef_probs.h"
 
 void vp9_default_coef_probs(VP9_COMMON *pc) {
   vpx_memcpy(pc->fc.coef_probs, default_coef_probs,

vp9/common/vp9_entropy.h

@@ -12,10 +12,10 @@
 #ifndef __INC_ENTROPY_H
 #define __INC_ENTROPY_H
 
-#include "treecoder.h"
-#include "blockd.h"
-#include "common.h"
-#include "coefupdateprobs.h"
+#include "vp9_treecoder.h"
+#include "vp9_blockd.h"
+#include "vp9_common.h"
+#include "vp9_coefupdateprobs.h"
 
 extern const int vp9_i8x8_block[4];
 

vp9/common/vp9_entropymode.c

@@ -9,8 +9,8 @@
  */
 
 
-#include "onyxc_int.h"
-#include "modecont.h"
+#include "vp9_onyxc_int.h"
+#include "vp9_modecont.h"
 #include "vpx_mem/vpx_mem.h"
 
 
@@ -519,7 +519,7 @@ void vp9_update_mode_context(VP9_COMMON *pc) {
 }
 
 #ifdef MODE_STATS
-#include "vp9/common/modecont.h"
+#include "vp9/common/vp9_modecont.h"
 void print_mode_contexts(VP9_COMMON *pc) {
   int j, i;
   printf("\n====================\n");

vp9/common/vp9_entropymode.h

@@ -12,8 +12,8 @@
 #ifndef __INC_ENTROPYMODE_H
 #define __INC_ENTROPYMODE_H
 
-#include "blockd.h"
-#include "treecoder.h"
+#include "vp9_blockd.h"
+#include "vp9_treecoder.h"
 
 #define SUBMVREF_COUNT 5
 #define VP9_NUMMBSPLITS 4

vp9/common/vp9_entropymv.c

@@ -9,8 +9,8 @@
  */
 
 
-#include "onyxc_int.h"
-#include "entropymv.h"
+#include "vp9_onyxc_int.h"
+#include "vp9_entropymv.h"
 
 //#define MV_COUNT_TESTING
 

vp9/common/vp9_entropymv.h

@@ -12,9 +12,9 @@
 #ifndef __INC_ENTROPYMV_H
 #define __INC_ENTROPYMV_H
 
-#include "treecoder.h"
+#include "vp9_treecoder.h"
 #include "vpx_config.h"
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 struct VP9Common;
 

vp9/common/vp9_extend.c

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "extend.h"
+#include "vp9_extend.h"
 #include "vpx_mem/vpx_mem.h"
 
 static void copy_and_extend_plane(unsigned char *s, /* source */

vp9/common/vp9_filter.c

@@ -10,7 +10,7 @@
 
 
 #include <stdlib.h>
-#include "filter.h"
+#include "vp9_filter.h"
 #include "vpx_ports/mem.h"
 #include "vp9_rtcd.h"
 

vp9/common/vp9_findnearmv.c

@@ -9,9 +9,9 @@
  */
 
 
-#include "findnearmv.h"
-#include "vp9/common/sadmxn.h"
-#include "vp9/common/subpelvar.h"
+#include "vp9_findnearmv.h"
+#include "vp9/common/vp9_sadmxn.h"
+#include "vp9/common/vp9_subpelvar.h"
 #include <limits.h>
 
 const unsigned char vp9_mbsplit_offset[4][16] = {

vp9/common/vp9_findnearmv.h

@@ -12,10 +12,10 @@
 #ifndef __INC_FINDNEARMV_H
 #define __INC_FINDNEARMV_H
 
-#include "mv.h"
-#include "blockd.h"
-#include "treecoder.h"
-#include "onyxc_int.h"
+#include "vp9_mv.h"
+#include "vp9_blockd.h"
+#include "vp9_treecoder.h"
+#include "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

vp9/common/vp9_idctllm.c

@@ -25,9 +25,9 @@
 #include <assert.h>
 #include <math.h>
 #include "vpx_ports/config.h"
-#include "vp9/common/systemdependent.h"
+#include "vp9/common/vp9_systemdependent.h"
 
-#include "vp9/common/blockd.h"
+#include "vp9/common/vp9_blockd.h"
 
 static const int cospi8sqrt2minus1 = 20091;
 static const int sinpi8sqrt2      = 35468;

vp9/common/vp9_implicit_segmentation.c

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp9/common/onyxc_int.h"
+#include "vp9/common/vp9_onyxc_int.h"
 
 #define MAX_REGIONS 24000
 #ifndef NULL

vp9/common/vp9_invtrans.c

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "invtrans.h"
+#include "vp9_invtrans.h"
 #include "./vp9_rtcd.h"
 
 static void recon_dcblock(MACROBLOCKD *xd) {

vp9/common/vp9_invtrans.h

@@ -12,7 +12,7 @@
 #define __INC_INVTRANS_H
 
 #include "vpx_ports/config.h"
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 extern void vp9_inverse_transform_b_4x4(MACROBLOCKD *xd, int block, int pitch);
 

vp9/common/vp9_loopfilter.c

@@ -9,11 +9,11 @@
  */
 
 #include "vpx_config.h"
-#include "loopfilter.h"
-#include "onyxc_int.h"
+#include "vp9_loopfilter.h"
+#include "vp9_onyxc_int.h"
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp9/common/seg_common.h"
+#include "vp9/common/vp9_seg_common.h"
 
 static void lf_init_lut(loop_filter_info_n *lfi) {
   int filt_lvl;

vp9/common/vp9_loopfilter.h

@@ -13,7 +13,7 @@
 
 #include "vpx_ports/mem.h"
 #include "vpx_config.h"
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 #define MAX_LOOP_FILTER 63
 
@@ -64,11 +64,11 @@ struct loop_filter_info {
   void sym(unsigned char *y, int ystride, const unsigned char *blimit)
 
 #if ARCH_X86 || ARCH_X86_64
-#include "x86/loopfilter_x86.h"
+#include "x86/vp9_loopfilter_x86.h"
 #endif
 
 #if ARCH_ARM
-#include "arm/loopfilter_arm.h"
+#include "arm/vp9_loopfilter_arm.h"
 #endif
 
 typedef void loop_filter_uvfunction(unsigned char *u,   /* source pointer */

vp9/common/vp9_loopfilter_filters.c

@@ -10,8 +10,8 @@
 
 #include <stdlib.h>
 #include "vpx_config.h"
-#include "loopfilter.h"
-#include "onyxc_int.h"
+#include "vp9_loopfilter.h"
+#include "vp9_onyxc_int.h"
 
 typedef unsigned char uc;
 

vp9/common/vp9_maskingmv.c

@@ -1,6 +1,6 @@
 /*
  ============================================================================
- Name        : maskingmv.c
+ Name        : vp9_maskingmv.c
  Author      : jimbankoski
  Version     :
  Copyright   : Your copyright notice

vp9/common/vp9_mbpitch.c

@@ -9,7 +9,7 @@
  */
 
 
-#include "blockd.h"
+#include "vp9_blockd.h"
 
 typedef enum {
   PRED = 0,

vp9/common/vp9_modecont.c

@@ -9,7 +9,7 @@
  */
 
 
-#include "entropy.h"
+#include "vp9_entropy.h"
 
 const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4] = {
   {223,     1,     1,    237},  // 0,0 best: Only candidate

vp9/common/vp9_modecontext.c

@@ -9,7 +9,7 @@
  */
 
 
-#include "entropymode.h"
+#include "vp9_entropymode.h"
 
 const unsigned int vp9_kf_default_bmode_counts[VP9_KF_BINTRAMODES]
                                               [VP9_KF_BINTRAMODES]

vp9/common/vp9_mvref_common.c

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "mvref_common.h"
+#include "vp9_mvref_common.h"
 
 #define MVREF_NEIGHBOURS 8
 static int mb_mv_ref_search[MVREF_NEIGHBOURS][2] = {

vp9/common/vp9_mvref_common.h

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "onyxc_int.h"
-#include "blockd.h"
+#include "vp9_onyxc_int.h"
+#include "vp9_blockd.h"
 
 
 #ifndef __INC_MVREF_COMMON_H

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 "type_aliases.h"
-#include "ppflags.h"
+#include "vp9_type_aliases.h"
+#include "vp9_ppflags.h"
   typedef int *VP9_PTR;
 
   /* Create/destroy static data structures. */