Remove vp9_ prefix from vp10 files

Remove the vp9_ prefix from vp10 file names.

Change-Id: I513a211b286a57d6126fc1b0fbfd6405120014f1

vp10/common/alloccommon.c

@@ -11,12 +11,12 @@
 #include "./vpx_config.h"
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/systemdependent.h"
 
 void vp10_set_mb_mi(VP9_COMMON *cm, int width, int height) {
   const int aligned_width = ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2);

vp10/common/arm/neon/iht4x4_add_neon.c

@@ -13,7 +13,7 @@
 
 #include "./vp10_rtcd.h"
 #include "./vpx_config.h"
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 
 static int16_t sinpi_1_9 = 0x14a3;
 static int16_t sinpi_2_9 = 0x26c9;

vp10/common/arm/neon/iht8x8_add_neon.c

@@ -13,7 +13,7 @@
 
 #include "./vp10_rtcd.h"
 #include "./vpx_config.h"
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 
 static int16_t cospi_2_64 = 16305;
 static int16_t cospi_4_64 = 16069;

vp10/common/blockd.c

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
 PREDICTION_MODE vp10_left_block_mode(const MODE_INFO *cur_mi,
                                     const MODE_INFO *left_mi, int b) {

vp10/common/blockd.h

@@ -17,13 +17,13 @@
 #include "vpx_ports/mem.h"
 #include "vpx_scale/yv12config.h"
 
-#include "vp10/common/vp9_common_data.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_mv.h"
-#include "vp10/common/vp9_scale.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/common_data.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/mv.h"
+#include "vp10/common/scale.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/tile_common.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/common.h

@@ -19,7 +19,7 @@
 #include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/systemdependent.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/common_data.c

@@ -8,6 +8,6 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_common_data.h"
+#include "vp10/common/common_data.h"
 
 

vp10/common/common_data.h

@@ -11,7 +11,7 @@
 #ifndef VP9_COMMON_VP9_COMMON_DATA_H_
 #define VP9_COMMON_VP9_COMMON_DATA_H_
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 #include "vpx/vpx_integer.h"
 
 #ifdef __cplusplus

vp10/common/debugmodes.c

@@ -10,8 +10,8 @@
 
 #include <stdio.h>
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/onyxc_int.h"
 
 static void log_frame_info(VP9_COMMON *cm, const char *str, FILE *f) {
   fprintf(f, "%s", str);

vp10/common/entropy.c

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_entropymode.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/entropymode.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx/vpx_integer.h"
 

vp10/common/entropy.h

@@ -14,8 +14,8 @@
 #include "vpx/vpx_integer.h"
 #include "vpx_dsp/prob.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/common.h"
+#include "vp10/common/enums.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/entropymode.c

@@ -10,8 +10,8 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/seg_common.h"
 
 const vpx_prob vp10_kf_y_mode_prob[INTRA_MODES][INTRA_MODES][INTRA_MODES - 1] = {
   {  // above = dc

vp10/common/entropymode.h

@@ -11,9 +11,9 @@
 #ifndef VP9_COMMON_VP9_ENTROPYMODE_H_
 #define VP9_COMMON_VP9_ENTROPYMODE_H_
 
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_filter.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/filter.h"
 #include "vpx_dsp/vpx_filter.h"
 
 #ifdef __cplusplus

vp10/common/entropymv.c

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_entropymv.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/entropymv.h"
 
 // Integer pel reference mv threshold for use of high-precision 1/8 mv
 #define COMPANDED_MVREF_THRESH 8

vp10/common/entropymv.h

@@ -16,7 +16,7 @@
 
 #include "vpx_dsp/prob.h"
 
-#include "vp10/common/vp9_mv.h"
+#include "vp10/common/mv.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/filter.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_filter.h"
+#include "vp10/common/filter.h"
 
 DECLARE_ALIGNED(256, static const InterpKernel,
                 bilinear_filters[SUBPEL_SHIFTS]) = {

vp10/common/frame_buffers.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_frame_buffers.h"
+#include "vp10/common/frame_buffers.h"
 #include "vpx_mem/vpx_mem.h"
 
 int vp10_alloc_internal_frame_buffers(InternalFrameBufferList *list) {

vp10/common/idct.c

@@ -12,9 +12,9 @@
 
 #include "./vp10_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/systemdependent.h"
 #include "vpx_dsp/inv_txfm.h"
 #include "vpx_ports/mem.h"
 

vp10/common/idct.h

@@ -14,8 +14,8 @@
 #include <assert.h>
 
 #include "./vpx_config.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/common.h"
+#include "vp10/common/enums.h"
 #include "vpx_dsp/inv_txfm.h"
 #include "vpx_dsp/txfm_common.h"
 #include "vpx_ports/mem.h"

vp10/common/loopfilter.c

@@ -10,13 +10,13 @@
 
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_reconinter.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/reconinter.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/seg_common.h"
 
 // 64 bit masks for left transform size. Each 1 represents a position where
 // we should apply a loop filter across the left border of an 8x8 block

vp10/common/loopfilter.h

@@ -14,8 +14,8 @@
 #include "vpx_ports/mem.h"
 #include "./vpx_config.h"
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/seg_common.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/mfqe.c

@@ -13,8 +13,8 @@
 #include "./vpx_dsp_rtcd.h"
 #include "./vpx_scale_rtcd.h"
 
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_postproc.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/postproc.h"
 
 // TODO(jackychen): Replace this function with SSE2 code. There is
 // one SSE2 implementation in vp8, so will consider how to share it

vp10/common/mips/dspr2/itrans16_dspr2.c

@@ -13,9 +13,9 @@
 
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_idct.h"
+#include "vp10/common/common.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/idct.h"
 #include "vpx_dsp/mips/inv_txfm_dspr2.h"
 #include "vpx_dsp/txfm_common.h"
 #include "vpx_ports/mem.h"

vp10/common/mips/dspr2/itrans4_dspr2.c

@@ -13,9 +13,9 @@
 
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_idct.h"
+#include "vp10/common/common.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/idct.h"
 #include "vpx_dsp/mips/inv_txfm_dspr2.h"
 #include "vpx_dsp/txfm_common.h"
 #include "vpx_ports/mem.h"

vp10/common/mips/dspr2/itrans8_dspr2.c

@@ -13,8 +13,8 @@
 
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/common.h"
+#include "vp10/common/blockd.h"
 #include "vpx_dsp/mips/inv_txfm_dspr2.h"
 #include "vpx_dsp/txfm_common.h"
 #include "vpx_ports/mem.h"

vp10/common/mips/msa/idct16x16_msa.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 #include "vpx_dsp/mips/inv_txfm_msa.h"
 
 void vp10_iht16x16_256_add_msa(const int16_t *input, uint8_t *dst,

vp10/common/mips/msa/idct4x4_msa.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 #include "vpx_dsp/mips/inv_txfm_msa.h"
 
 void vp10_iht4x4_16_add_msa(const int16_t *input, uint8_t *dst,

vp10/common/mips/msa/idct8x8_msa.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 #include "vpx_dsp/mips/inv_txfm_msa.h"
 
 void vp10_iht8x8_64_add_msa(const int16_t *input, uint8_t *dst,

vp10/common/mips/msa/mfqe_msa.c

@@ -9,7 +9,7 @@
  */
 
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/onyxc_int.h"
 #include "vpx_dsp/mips/macros_msa.h"
 
 static void filter_by_weight8x8_msa(const uint8_t *src_ptr, int32_t src_stride,

vp10/common/mv.h

@@ -13,7 +13,7 @@
 
 #include "vpx/vpx_integer.h"
 
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/mvref_common.c

@@ -9,7 +9,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_mvref_common.h"
+#include "vp10/common/mvref_common.h"
 
 // This function searches the neighbourhood of a given MB/SB
 // to try and find candidate reference vectors.

vp10/common/mvref_common.h

@@ -10,8 +10,8 @@
 #ifndef VP9_COMMON_VP9_MVREF_COMMON_H_
 #define VP9_COMMON_VP9_MVREF_COMMON_H_
 
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/onyxc_int.h

@@ -15,17 +15,17 @@
 #include "vpx/internal/vpx_codec_internal.h"
 #include "vpx_util/vpx_thread.h"
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_frame_buffers.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/frame_buffers.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/tile_common.h"
 
 #if CONFIG_VP9_POSTPROC
-#include "vp10/common/vp9_postproc.h"
+#include "vp10/common/postproc.h"
 #endif
 
 #ifdef __cplusplus

vp10/common/postproc.c

@@ -20,10 +20,10 @@
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_scale/yv12config.h"
 
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_postproc.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/common/vp9_textblit.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/postproc.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/common/textblit.h"
 
 #if CONFIG_VP9_POSTPROC
 static const short kernel5[] = {

vp10/common/postproc.h

@@ -14,9 +14,9 @@
 
 #include "vpx_ports/mem.h"
 #include "vpx_scale/yv12config.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_mfqe.h"
-#include "vp10/common/vp9_ppflags.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/mfqe.h"
+#include "vp10/common/ppflags.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/pred_common.c

@@ -9,9 +9,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/seg_common.h"
 
 // Returns a context number for the given MB prediction signal
 int vp10_get_pred_context_switchable_interp(const MACROBLOCKD *xd) {

vp10/common/pred_common.h

@@ -11,8 +11,8 @@
 #ifndef VP9_COMMON_VP9_PRED_COMMON_H_
 #define VP9_COMMON_VP9_PRED_COMMON_H_
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/onyxc_int.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/quant_common.c

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/seg_common.h"
 
 static const int16_t dc_qlookup[QINDEX_RANGE] = {
   4,       8,    8,    9,   10,   11,   12,   12,

vp10/common/quant_common.h

@@ -12,7 +12,7 @@
 #define VP9_COMMON_VP9_QUANT_COMMON_H_
 
 #include "vpx/vpx_codec.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/seg_common.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/reconinter.c

@@ -15,9 +15,9 @@
 
 #include "vpx/vpx_integer.h"
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
 
 #if CONFIG_VP9_HIGHBITDEPTH
 void vp10_highbd_build_inter_predictor(const uint8_t *src, int src_stride,

vp10/common/reconinter.h

@@ -11,8 +11,8 @@
 #ifndef VP9_COMMON_VP9_RECONINTER_H_
 #define VP9_COMMON_VP9_RECONINTER_H_
 
-#include "vp10/common/vp9_filter.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/filter.h"
+#include "vp10/common/onyxc_int.h"
 #include "vpx/vpx_integer.h"
 #include "vpx_dsp/vpx_filter.h"
 

vp10/common/reconintra.c

@@ -18,8 +18,8 @@
 #include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_once.h"
 
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/onyxc_int.h"
 
 enum {
   NEED_LEFT = 1 << 1,

vp10/common/reconintra.h

@@ -12,7 +12,7 @@
 #define VP9_COMMON_VP9_RECONINTRA_H_
 
 #include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/scale.c

@@ -9,8 +9,8 @@
  */
 
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/common/vp9_filter.h"
-#include "vp10/common/vp9_scale.h"
+#include "vp10/common/filter.h"
+#include "vp10/common/scale.h"
 #include "vpx_dsp/vpx_filter.h"
 
 static INLINE int scaled_x(int val, const struct scale_factors *sf) {

vp10/common/scale.h

@@ -11,7 +11,7 @@
 #ifndef VP9_COMMON_VP9_SCALE_H_
 #define VP9_COMMON_VP9_SCALE_H_
 
-#include "vp10/common/vp9_mv.h"
+#include "vp10/common/mv.h"
 #include "vpx_dsp/vpx_convolve.h"
 
 #ifdef __cplusplus

vp10/common/scan.c

@@ -10,7 +10,7 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_scan.h"
+#include "vp10/common/scan.h"
 
 DECLARE_ALIGNED(16, static const int16_t, default_scan_4x4[16]) = {
   0,  4,  1,  5,

vp10/common/scan.h

@@ -14,8 +14,8 @@
 #include "vpx/vpx_integer.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_enums.h"
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/enums.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/common/seg_common.c

@@ -10,10 +10,10 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_quant_common.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/quant_common.h"
 
 static const int seg_feature_data_signed[SEG_LVL_MAX] = { 1, 1, 0, 0 };
 

vp10/common/textblit.c

@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 
-#include "vp10/common/vp9_textblit.h"
+#include "vp10/common/textblit.h"
 
 static const int font[] = {
   0x0, 0x5C00, 0x8020, 0xAFABEA, 0xD7EC0, 0x1111111, 0x1855740, 0x18000,

vp10/common/thread_common.c

@@ -10,10 +10,10 @@
 
 #include "./vpx_config.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_loopfilter.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/loopfilter.h"
 
 #if CONFIG_MULTITHREAD
 static INLINE void mutex_lock(pthread_mutex_t *const mutex) {

vp10/common/thread_common.h

@@ -11,7 +11,7 @@
 #ifndef VP9_COMMON_VP9_LOOPFILTER_THREAD_H_
 #define VP9_COMMON_VP9_LOOPFILTER_THREAD_H_
 #include "./vpx_config.h"
-#include "vp10/common/vp9_loopfilter.h"
+#include "vp10/common/loopfilter.h"
 #include "vpx_util/vpx_thread.h"
 
 struct VP9Common;

vp10/common/tile_common.c

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/tile_common.h"
 
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/onyxc_int.h"
 
 #define MIN_TILE_WIDTH_B64 4
 #define MAX_TILE_WIDTH_B64 64

vp10/common/vp10_rtcd_defs.pl

@@ -1,12 +1,12 @@
 sub vp10_common_forward_decls() {
 print <<EOF
 /*
- * VP9
+ * VP10
  */
 
 #include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/common.h"
+#include "vp10/common/enums.h"
 
 struct macroblockd;
 

vp10/decoder/decodeframe.c

@@ -23,24 +23,24 @@
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/tile_common.h"
 
-#include "vp10/decoder/vp9_decodeframe.h"
-#include "vp10/decoder/vp9_detokenize.h"
-#include "vp10/decoder/vp9_decodemv.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/decoder/vp9_dsubexp.h"
+#include "vp10/decoder/decodeframe.h"
+#include "vp10/decoder/detokenize.h"
+#include "vp10/decoder/decodemv.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/decoder/dsubexp.h"
 
 #define MAX_VP9_HEADER_SIZE 80
 

vp10/decoder/decodemv.c

@@ -10,17 +10,17 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/seg_common.h"
 
-#include "vp10/decoder/vp9_decodemv.h"
-#include "vp10/decoder/vp9_decodeframe.h"
+#include "vp10/decoder/decodemv.h"
+#include "vp10/decoder/decodeframe.h"
 
 static PREDICTION_MODE read_intra_mode(vpx_reader *r, const vpx_prob *p) {
   return (PREDICTION_MODE)vpx_read_tree(r, vp10_intra_mode_tree, p);

vp10/decoder/decodemv.h

@@ -13,7 +13,7 @@
 
 #include "vpx_dsp/bitreader.h"
 
-#include "vp10/decoder/vp9_decoder.h"
+#include "vp10/decoder/decoder.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/decoder/decoder.c

@@ -22,19 +22,19 @@
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/onyxc_int.h"
 #if CONFIG_VP9_POSTPROC
-#include "vp10/common/vp9_postproc.h"
+#include "vp10/common/postproc.h"
 #endif
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/systemdependent.h"
 
-#include "vp10/decoder/vp9_decodeframe.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/decoder/vp9_detokenize.h"
+#include "vp10/decoder/decodeframe.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/decoder/detokenize.h"
 
 static void initialize_dec(void) {
   static volatile int init_done = 0;

vp10/decoder/decoder.h

@@ -18,10 +18,10 @@
 #include "vpx_scale/yv12config.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_ppflags.h"
-#include "vp10/decoder/vp9_dthread.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/ppflags.h"
+#include "vp10/decoder/dthread.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/decoder/detokenize.c

@@ -11,14 +11,14 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
 #if CONFIG_COEFFICIENT_RANGE_CHECKING
-#include "vp10/common/vp9_idct.h"
+#include "vp10/common/idct.h"
 #endif
 
-#include "vp10/decoder/vp9_detokenize.h"
+#include "vp10/decoder/detokenize.h"
 
 #define EOB_CONTEXT_NODE            0
 #define ZERO_CONTEXT_NODE           1

vp10/decoder/detokenize.h

@@ -13,8 +13,8 @@
 #define VP9_DECODER_VP9_DETOKENIZE_H_
 
 #include "vpx_dsp/bitreader.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/common/vp9_scan.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/common/scan.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/decoder/dsubexp.c

@@ -10,9 +10,9 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/entropy.h"
 
-#include "vp10/decoder/vp9_dsubexp.h"
+#include "vp10/decoder/dsubexp.h"
 
 static int inv_recenter_nonneg(int v, int m) {
   if (v > 2 * m)

vp10/decoder/dthread.c

@@ -10,9 +10,9 @@
 
 #include "./vpx_config.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/decoder/vp9_dthread.h"
-#include "vp10/decoder/vp9_decoder.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/decoder/dthread.h"
+#include "vp10/decoder/decoder.h"
 
 // #define DEBUG_THREAD
 

vp10/encoder/aq_complexity.c

@@ -11,11 +11,11 @@
 #include <limits.h>
 #include <math.h>
 
-#include "vp10/encoder/vp9_aq_complexity.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/encoder/vp9_segmentation.h"
+#include "vp10/encoder/aq_complexity.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/encoder/segmentation.h"
 
 #define AQ_C_SEGMENTS  5
 #define DEFAULT_AQ2_SEG 3   // Neutral Q segment

vp10/encoder/aq_complexity.h

@@ -16,7 +16,7 @@
 extern "C" {
 #endif
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 
 struct VP9_COMP;
 struct macroblock;

vp10/encoder/aq_cyclicrefresh.c

@@ -11,12 +11,12 @@
 #include <limits.h>
 #include <math.h>
 
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
 
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/seg_common.h"
 
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_segmentation.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/segmentation.h"
 
 struct CYCLIC_REFRESH {
   // Percentage of blocks per frame that are targeted as candidates

vp10/encoder/aq_cyclicrefresh.h

@@ -12,7 +12,7 @@
 #ifndef VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_
 #define VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/encoder/aq_variance.c

@@ -12,14 +12,14 @@
 
 #include "vpx_ports/mem.h"
 
-#include "vp10/encoder/vp9_aq_variance.h"
+#include "vp10/encoder/aq_variance.h"
 
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/seg_common.h"
 
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/common/systemdependent.h"
 
 #define ENERGY_MIN (-4)
 #define ENERGY_MAX (1)

vp10/encoder/aq_variance.h

@@ -12,7 +12,7 @@
 #ifndef VP9_ENCODER_VP9_AQ_VARIANCE_H_
 #define VP9_ENCODER_VP9_AQ_VARIANCE_H_
 
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/encoder/arm/neon/dct_neon.c

@@ -14,7 +14,7 @@
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 #include "vpx_dsp/txfm_common.h"
 
 void vp10_fdct8x8_quant_neon(const int16_t *input, int stride,

vp10/encoder/arm/neon/quantize_neon.c

@@ -14,12 +14,12 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/seg_common.h"
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/rd.h"
 
 void vp10_quantize_fp_neon(const int16_t *coeff_ptr, intptr_t count,
                           int skip_block, const int16_t *zbin_ptr,

vp10/encoder/avg.c

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "./vp10_rtcd.h"
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 #include "vpx_ports/mem.h"
 
 unsigned int vp10_avg_8x8_c(const uint8_t *s, int p) {

vp10/encoder/bitstream.c

@@ -17,22 +17,22 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem_ops.h"
 
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/common/tile_common.h"
 
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_bitstream.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_subexp.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/bitstream.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/subexp.h"
+#include "vp10/encoder/tokenize.h"
 
 static const struct vp10_token intra_mode_encodings[INTRA_MODES] = {
   {0, 1}, {6, 3}, {28, 5}, {30, 5}, {58, 6}, {59, 6}, {126, 7}, {127, 7},

vp10/encoder/bitstream.h

@@ -16,7 +16,7 @@
 extern "C" {
 #endif
 
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 
 void vp10_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size);
 

vp10/encoder/block.h

@@ -11,8 +11,8 @@
 #ifndef VP9_ENCODER_VP9_BLOCK_H_
 #define VP9_ENCODER_VP9_BLOCK_H_
 
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/entropy.h"
 
 #ifdef __cplusplus
 extern "C" {

vp10/encoder/blockiness.c

@@ -11,8 +11,8 @@
 #include "./vp10_rtcd.h"
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_filter.h"
+#include "vp10/common/common.h"
+#include "vp10/common/filter.h"
 #include "vpx/vpx_integer.h"
 #include "vpx_dsp/vpx_convolve.h"
 #include "vpx_dsp/vpx_filter.h"

vp10/encoder/context_tree.c

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/encoder.h"
 
 static const BLOCK_SIZE square[] = {
   BLOCK_8X8,

vp10/encoder/context_tree.h

@@ -11,8 +11,8 @@
 #ifndef VP9_ENCODER_VP9_CONTEXT_TREE_H_
 #define VP9_ENCODER_VP9_CONTEXT_TREE_H_
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/common/blockd.h"
+#include "vp10/encoder/block.h"
 
 struct VP9_COMP;
 struct VP9Common;

vp10/encoder/cost.c

@@ -9,7 +9,7 @@
  */
 #include <assert.h>
 
-#include "vp10/encoder/vp9_cost.h"
+#include "vp10/encoder/cost.h"
 
 const unsigned int vp10_prob_cost[256] = {
   2047, 2047, 1791, 1641, 1535, 1452, 1385, 1328, 1279, 1235, 1196, 1161,

vp10/encoder/dct.c

@@ -15,9 +15,9 @@
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/systemdependent.h"
 #include "vpx_dsp/fwd_txfm.h"
 #include "vpx_ports/mem.h"
 

vp10/encoder/denoiser.c

@@ -13,9 +13,9 @@
 #include "./vpx_dsp_rtcd.h"
 #include "vpx_scale/yv12config.h"
 #include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_denoiser.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/denoiser.h"
 
 /* The VP9 denoiser is a work-in-progress. It currently is only designed to work
  * with speed 6, though it (inexplicably) seems to also work with speed 5 (one

vp10/encoder/denoiser.h

@@ -11,7 +11,7 @@
 #ifndef VP9_ENCODER_DENOISER_H_
 #define VP9_ENCODER_DENOISER_H_
 
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
 #include "vpx_scale/yv12config.h"
 
 #ifdef __cplusplus