Remove vp9_ prefix from vp10 files

Remove the vp9_ prefix from vp10 file names.

Change-Id: I513a211b286a57d6126fc1b0fbfd6405120014f1

diff --git a/vp10/common/vp9_alloccommon.c b/vp10/common/alloccommon.c
similarity index 94%
rename from vp10/common/vp9_alloccommon.c
rename to vp10/common/alloccommon.c
index a5992c25a0e36599172f03248c6cf1d6eff7b54a..e554f100c31f2f555c581218fc0b9aec1cd902f9 100644 (file)
--- a/vp10/common/vp9_alloccommon.c
+++ b/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);

diff --git a/vp10/common/vp9_alloccommon.h b/vp10/common/alloccommon.h
similarity index 100%
rename from vp10/common/vp9_alloccommon.h
rename to vp10/common/alloccommon.h

diff --git a/vp10/common/arm/neon/vp9_iht4x4_add_neon.c b/vp10/common/arm/neon/iht4x4_add_neon.c
similarity index 99%
rename from vp10/common/arm/neon/vp9_iht4x4_add_neon.c
rename to vp10/common/arm/neon/iht4x4_add_neon.c
index 9061dac8346bfd381c683dbe8a6b4c155ec57e5b..bd3e8b30f4098cea0485f1f16bd8b80c90aadc7e 100644 (file)
--- a/vp10/common/arm/neon/vp9_iht4x4_add_neon.c
+++ b/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;

diff --git a/vp10/common/arm/neon/vp9_iht8x8_add_neon.c b/vp10/common/arm/neon/iht8x8_add_neon.c
similarity index 99%
rename from vp10/common/arm/neon/vp9_iht8x8_add_neon.c
rename to vp10/common/arm/neon/iht8x8_add_neon.c
index 9907df782567dab4b2147b3f26e512329c84a396..82d7ccc612ea9cf1c02ac35c94df9e78b2c3e2f9 100644 (file)
--- a/vp10/common/arm/neon/vp9_iht8x8_add_neon.c
+++ b/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;

diff --git a/vp10/common/vp9_blockd.c b/vp10/common/blockd.c
similarity index 99%
rename from vp10/common/vp9_blockd.c
rename to vp10/common/blockd.c
index c96142370b2203878f8abb96bd52e91996e25336..5394b5e0e2c6908b7326fdfc6596b9865275f0bf 100644 (file)
--- a/vp10/common/vp9_blockd.c
+++ b/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) {

diff --git a/vp10/common/vp9_blockd.h b/vp10/common/blockd.h
similarity index 97%
rename from vp10/common/vp9_blockd.h
rename to vp10/common/blockd.h
index c4d98b9cedfbb0a089cbb89bca95adbfd6cd1786..6173a962535acf06264832c2c739e4c279f5a984 100644 (file)
--- a/vp10/common/vp9_blockd.h
+++ 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" {

diff --git a/vp10/common/vp9_common.h b/vp10/common/common.h
similarity index 97%
rename from vp10/common/vp9_common.h
rename to vp10/common/common.h
index 9ef03a79a18492c907c3e8b0111c2100ad11982d..cccf7c2298f2a738872bc55f84cf710ab7398b69 100644 (file)
--- a/vp10/common/vp9_common.h
+++ b/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" {

diff --git a/vp10/common/vp9_common_data.c b/vp10/common/common_data.c
similarity index 90%
rename from vp10/common/vp9_common_data.c
rename to vp10/common/common_data.c
index 2abe2c345887215bea60e3948a701f94bb7a473d..e8055550db8bad5606d83aa09abf908f598a885e 100644 (file)
--- a/vp10/common/vp9_common_data.c
+++ b/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"
 
 

diff --git a/vp10/common/vp9_common_data.h b/vp10/common/common_data.h
similarity index 99%
rename from vp10/common/vp9_common_data.h
rename to vp10/common/common_data.h
index 5b29d2832f2a96fc7bc88a4ce957386ef2451df8..0fe1298333df582ddf5fe326528edd72f59ff6a6 100644 (file)
--- a/vp10/common/vp9_common_data.h
+++ b/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

diff --git a/vp10/common/vp9_debugmodes.c b/vp10/common/debugmodes.c
similarity index 97%
rename from vp10/common/vp9_debugmodes.c
rename to vp10/common/debugmodes.c
index d4858eaaea5b5cd93e67212e3916fba2818744e5..4c927d8d7444324451d6269801ebda4afbbd4958 100644 (file)
--- a/vp10/common/vp9_debugmodes.c
+++ b/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);

diff --git a/vp10/common/vp9_entropy.c b/vp10/common/entropy.c
similarity index 99%
rename from vp10/common/vp9_entropy.c
rename to vp10/common/entropy.c
index 2277cdacc69a06c119583c945bde4a210cba2add..ab1f0b26ef5191095723a48acf28ac4714a7c286 100644 (file)
--- a/vp10/common/vp9_entropy.c
+++ b/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"
 

diff --git a/vp10/common/vp9_entropy.h b/vp10/common/entropy.h
similarity index 99%
rename from vp10/common/vp9_entropy.h
rename to vp10/common/entropy.h
index 7859ace63a7dd4ebb001c2439251b5d15e0024d4..e95d8c4182fccfdbec703189239b226206860647 100644 (file)
--- a/vp10/common/vp9_entropy.h
+++ b/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" {

diff --git a/vp10/common/vp9_entropymode.c b/vp10/common/entropymode.c
similarity index 99%
rename from vp10/common/vp9_entropymode.c
rename to vp10/common/entropymode.c
index a19554aff3ca37c896db92b4a99cc57b6910ddae..cd68d5b861b88cef5efce9cab9fb800a5ea590be 100644 (file)
--- a/vp10/common/vp9_entropymode.c
+++ b/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

diff --git a/vp10/common/vp9_entropymode.h b/vp10/common/entropymode.h
similarity index 97%
rename from vp10/common/vp9_entropymode.h
rename to vp10/common/entropymode.h
index 79fb7b914915754c879f7e9e857ee43e7fa6de6e..391dcf32f744f246597153e5ac63b056586b5a40 100644 (file)
--- a/vp10/common/vp9_entropymode.h
+++ b/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

diff --git a/vp10/common/vp9_entropymv.c b/vp10/common/entropymv.c
similarity index 99%
rename from vp10/common/vp9_entropymv.c
rename to vp10/common/entropymv.c
index 6db282b6ccd4416aa2717a24988bc7b0a943c596..3d765a62588c6508350ced12d17efdc260d3c3bd 100644 (file)
--- a/vp10/common/vp9_entropymv.c
+++ b/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

diff --git a/vp10/common/vp9_entropymv.h b/vp10/common/entropymv.h
similarity index 99%
rename from vp10/common/vp9_entropymv.h
rename to vp10/common/entropymv.h
index b03a5fbf13fa4db7c63f117bbd63d3542d3bfe90..a6c12d14cbc6b088bbd255b8b2796fe3c447c01e 100644 (file)
--- a/vp10/common/vp9_entropymv.h
+++ b/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" {

diff --git a/vp10/common/vp9_enums.h b/vp10/common/enums.h
similarity index 100%
rename from vp10/common/vp9_enums.h
rename to vp10/common/enums.h

diff --git a/vp10/common/vp9_filter.c b/vp10/common/filter.c
similarity index 98%
rename from vp10/common/vp9_filter.c
rename to vp10/common/filter.c
index 97eb82f9b063810bab91be5756473c2c86bf055d..dda279f132ec4d8b340b0eed2d894e76206180a8 100644 (file)
--- a/vp10/common/vp9_filter.c
+++ b/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]) = {

diff --git a/vp10/common/vp9_filter.h b/vp10/common/filter.h
similarity index 100%
rename from vp10/common/vp9_filter.h
rename to vp10/common/filter.h

diff --git a/vp10/common/vp9_frame_buffers.c b/vp10/common/frame_buffers.c
similarity index 98%
rename from vp10/common/vp9_frame_buffers.c
rename to vp10/common/frame_buffers.c
index d200577f9ada33a19c2a4cb33219286476029b43..794c80fde39ada3c80ce11cd86b424eb40e80990 100644 (file)
--- a/vp10/common/vp9_frame_buffers.c
+++ b/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) {

diff --git a/vp10/common/vp9_frame_buffers.h b/vp10/common/frame_buffers.h
similarity index 100%
rename from vp10/common/vp9_frame_buffers.h
rename to vp10/common/frame_buffers.h

diff --git a/vp10/common/vp9_idct.c b/vp10/common/idct.c
similarity index 99%
rename from vp10/common/vp9_idct.c
rename to vp10/common/idct.c
index 09537eead38a849a83d5209d4e5a1984a6352eed..4eff7d108933ece293051e2028045411879027a5 100644 (file)
--- a/vp10/common/vp9_idct.c
+++ b/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"
 

diff --git a/vp10/common/vp9_idct.h b/vp10/common/idct.h
similarity index 97%
rename from vp10/common/vp9_idct.h
rename to vp10/common/idct.h
index ea2b09fc7cce2fc4fa39dc2734d0a9e9e722caa3..496917ebbd47b023b3e805c3618a5e3091735b1c 100644 (file)
--- a/vp10/common/vp9_idct.h
+++ b/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"

diff --git a/vp10/common/vp9_loopfilter.c b/vp10/common/loopfilter.c
similarity index 99%
rename from vp10/common/vp9_loopfilter.c
rename to vp10/common/loopfilter.c
index 0233ae0864469d1381122879862b97fa7fc268f2..40b6d760fbddbe3cfa2a955539d004a97ad89118 100644 (file)
--- a/vp10/common/vp9_loopfilter.c
+++ b/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

diff --git a/vp10/common/vp9_loopfilter.h b/vp10/common/loopfilter.h
similarity index 98%
rename from vp10/common/vp9_loopfilter.h
rename to vp10/common/loopfilter.h
index 97abdfb13f0c5667dd6ae5609f8c0e06bd8f4179..a26fe6b654aac4200d15669fee69f1689f84150c 100644 (file)
--- a/vp10/common/vp9_loopfilter.h
+++ b/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" {

diff --git a/vp10/common/vp9_mfqe.c b/vp10/common/mfqe.c
similarity index 99%
rename from vp10/common/vp9_mfqe.c
rename to vp10/common/mfqe.c
index 5a65d44c41520edc3cdd2b9a6357130a1c6474f3..49a3c76433b4b306d869438e721ed5f35c7717af 100644 (file)
--- a/vp10/common/vp9_mfqe.c
+++ b/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

diff --git a/vp10/common/vp9_mfqe.h b/vp10/common/mfqe.h
similarity index 100%
rename from vp10/common/vp9_mfqe.h
rename to vp10/common/mfqe.h

diff --git a/vp10/common/mips/dspr2/vp9_itrans16_dspr2.c b/vp10/common/mips/dspr2/itrans16_dspr2.c
similarity index 96%
rename from vp10/common/mips/dspr2/vp9_itrans16_dspr2.c
rename to vp10/common/mips/dspr2/itrans16_dspr2.c
index 58a95f7c9e5dba1d1920140ae89c60502b930849..3d1bd3d906d60328475ed0821a0ea30dea4fd4d9 100644 (file)
--- a/vp10/common/mips/dspr2/vp9_itrans16_dspr2.c
+++ b/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"

diff --git a/vp10/common/mips/dspr2/vp9_itrans4_dspr2.c b/vp10/common/mips/dspr2/itrans4_dspr2.c
similarity index 96%
rename from vp10/common/mips/dspr2/vp9_itrans4_dspr2.c
rename to vp10/common/mips/dspr2/itrans4_dspr2.c
index 626f7ff6695d2cdb57345490d8c0f81a9fdfb6ee..5249287b85ecdd3238ec49a9cfd0e2499670724c 100644 (file)
--- a/vp10/common/mips/dspr2/vp9_itrans4_dspr2.c
+++ b/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"

diff --git a/vp10/common/mips/dspr2/vp9_itrans8_dspr2.c b/vp10/common/mips/dspr2/itrans8_dspr2.c
similarity index 97%
rename from vp10/common/mips/dspr2/vp9_itrans8_dspr2.c
rename to vp10/common/mips/dspr2/itrans8_dspr2.c
index a5ff2fe1fb8dacf74f31295e0e7eb033728c5d31..b25b93aee0552fe86e62c88775e4645766f9d7d7 100644 (file)
--- a/vp10/common/mips/dspr2/vp9_itrans8_dspr2.c
+++ b/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"

diff --git a/vp10/common/mips/msa/vp9_idct16x16_msa.c b/vp10/common/mips/msa/idct16x16_msa.c
similarity index 98%
rename from vp10/common/mips/msa/vp9_idct16x16_msa.c
rename to vp10/common/mips/msa/idct16x16_msa.c
index 1778991bd426d76c348446baeb1353eac2c2fd3b..a89e41b3dd93af0d83ca5ba590049e43719008b8 100644 (file)
--- a/vp10/common/mips/msa/vp9_idct16x16_msa.c
+++ b/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,

diff --git a/vp10/common/mips/msa/vp9_idct4x4_msa.c b/vp10/common/mips/msa/idct4x4_msa.c
similarity index 98%
rename from vp10/common/mips/msa/vp9_idct4x4_msa.c
rename to vp10/common/mips/msa/idct4x4_msa.c
index 16566fedf58d03bc96ab9dda0424bd8d1126c3cc..866f321ab77a8ac522bc84ba81176c0f4df633ed 100644 (file)
--- a/vp10/common/mips/msa/vp9_idct4x4_msa.c
+++ b/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,

diff --git a/vp10/common/mips/msa/vp9_idct8x8_msa.c b/vp10/common/mips/msa/idct8x8_msa.c
similarity index 98%
rename from vp10/common/mips/msa/vp9_idct8x8_msa.c
rename to vp10/common/mips/msa/idct8x8_msa.c
index 77c9e805ad9d90330346533e4c0f3944530af56b..726af4e9ec3a330585b35614caf9ecb151f89198 100644 (file)
--- a/vp10/common/mips/msa/vp9_idct8x8_msa.c
+++ b/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,

diff --git a/vp10/common/mips/msa/vp9_mfqe_msa.c b/vp10/common/mips/msa/mfqe_msa.c
similarity index 99%
rename from vp10/common/mips/msa/vp9_mfqe_msa.c
rename to vp10/common/mips/msa/mfqe_msa.c
index c446cda7c04ac77378e05133e11b4e5c71b119ae..3a593a1a1c977a68dcf6f01e86a98638c596c705 100644 (file)
--- a/vp10/common/mips/msa/vp9_mfqe_msa.c
+++ b/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,

diff --git a/vp10/common/vp9_mv.h b/vp10/common/mv.h
similarity index 97%
rename from vp10/common/vp9_mv.h
rename to vp10/common/mv.h
index 5b3f804fd81a5cadd2128b8a797c0abe6ccc556e..62b77b838d8f8849f72561f27c57ed01614f11b3 100644 (file)
--- a/vp10/common/vp9_mv.h
+++ b/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" {

diff --git a/vp10/common/vp9_mvref_common.c b/vp10/common/mvref_common.c
similarity index 99%
rename from vp10/common/vp9_mvref_common.c
rename to vp10/common/mvref_common.c
index ea47f8c1c6d9108cc2b3a381e28e140a9f85a72b..d8c150742afa6292772a7c1d65d1099ea1adb652 100644 (file)
--- a/vp10/common/vp9_mvref_common.c
+++ b/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.

diff --git a/vp10/common/vp9_mvref_common.h b/vp10/common/mvref_common.h
similarity index 99%
rename from vp10/common/vp9_mvref_common.h
rename to vp10/common/mvref_common.h
index e5125498ea33f4462791b53c05f54544c8d747ac..cdd0f3c6771c69bc98b5230e5a9b1216636dab16 100644 (file)
--- a/vp10/common/vp9_mvref_common.h
+++ b/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" {

diff --git a/vp10/common/vp9_onyxc_int.h b/vp10/common/onyxc_int.h
similarity index 97%
rename from vp10/common/vp9_onyxc_int.h
rename to vp10/common/onyxc_int.h
index 58dcea9d12f0c8f264a9ca925a0fc1e3a854aa23..8d3074c6a16baee24a004ba57787e7aea5c52cbd 100644 (file)
--- a/vp10/common/vp9_onyxc_int.h
+++ b/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

diff --git a/vp10/common/vp9_postproc.c b/vp10/common/postproc.c
similarity index 99%
rename from vp10/common/vp9_postproc.c
rename to vp10/common/postproc.c
index 97b597d0c2eb6395b24516e35b01615a869f79a7..25e1da88c82ea124012c2bba51afc199c9642eda 100644 (file)
--- a/vp10/common/vp9_postproc.c
+++ b/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[] = {

diff --git a/vp10/common/vp9_postproc.h b/vp10/common/postproc.h
similarity index 92%
rename from vp10/common/vp9_postproc.h
rename to vp10/common/postproc.h
index 212d37b00225fdad1db60bcae21674b7d3b932f1..14ef876ada1dcae39e3ca59695748e1754a33cf7 100644 (file)
--- a/vp10/common/vp9_postproc.h
+++ b/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" {

diff --git a/vp10/common/vp9_ppflags.h b/vp10/common/ppflags.h
similarity index 100%
rename from vp10/common/vp9_ppflags.h
rename to vp10/common/ppflags.h

diff --git a/vp10/common/vp9_pred_common.c b/vp10/common/pred_common.c
similarity index 99%
rename from vp10/common/vp9_pred_common.c
rename to vp10/common/pred_common.c
index 022035099d3e7f0d394f65f6be548c7bd6b3629d..1b60a094e3cea7e2468a05e5c8658265a694df30 100644 (file)
--- a/vp10/common/vp9_pred_common.c
+++ b/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) {

diff --git a/vp10/common/vp9_pred_common.h b/vp10/common/pred_common.h
similarity index 98%
rename from vp10/common/vp9_pred_common.h
rename to vp10/common/pred_common.h
index fbd597af05586cb2448ee56a4da12c7ab34ed27b..69b42e335b313001d840f630cb29de06a45cacad 100644 (file)
--- a/vp10/common/vp9_pred_common.h
+++ b/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" {

diff --git a/vp10/common/vp9_quant_common.c b/vp10/common/quant_common.c
similarity index 99%
rename from vp10/common/vp9_quant_common.c
rename to vp10/common/quant_common.c
index bb30836d7393097eba5e62077e4ef667d77c25d8..edf73940110ca3c581b587deecd74a1145d4c270 100644 (file)
--- a/vp10/common/vp9_quant_common.c
+++ b/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,

diff --git a/vp10/common/vp9_quant_common.h b/vp10/common/quant_common.h
similarity index 96%
rename from vp10/common/vp9_quant_common.h
rename to vp10/common/quant_common.h
index 9e53dda8f9ff29d4add5ec5bf6132b9927de69a7..d44b132d0a2cbeb3d65808173bf254abd738d2a2 100644 (file)
--- a/vp10/common/vp9_quant_common.h
+++ b/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" {

diff --git a/vp10/common/vp9_reconinter.c b/vp10/common/reconinter.c
similarity index 98%
rename from vp10/common/vp9_reconinter.c
rename to vp10/common/reconinter.c
index 9562ccf64a28eef23159c2628dd53acd11cc83ee..c9e46e07661794a80b0b4de9a1ff05b5c9b445ce 100644 (file)
--- a/vp10/common/vp9_reconinter.c
+++ b/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,

diff --git a/vp10/common/vp9_reconinter.h b/vp10/common/reconinter.h
similarity index 99%
rename from vp10/common/vp9_reconinter.h
rename to vp10/common/reconinter.h
index 671dc6394f06c4fca7cd961de36d3aaf2d0cb4cf..d9f3ab5a800cc8a0a2dffb143a7ed2444eeef6da 100644 (file)
--- a/vp10/common/vp9_reconinter.h
+++ b/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"
 

diff --git a/vp10/common/vp9_reconintra.c b/vp10/common/reconintra.c
similarity index 99%
rename from vp10/common/vp9_reconintra.c
rename to vp10/common/reconintra.c
index 309b1b9e37fe4bf8347a9763fc46231b4c94b46b..c58da59ae512ac5873508df3e0ae3c969539b156 100644 (file)
--- a/vp10/common/vp9_reconintra.c
+++ b/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,

diff --git a/vp10/common/vp9_reconintra.h b/vp10/common/reconintra.h
similarity index 96%
rename from vp10/common/vp9_reconintra.h
rename to vp10/common/reconintra.h
index eb305e242a80a17210c03668a1394786d912715d..0b3891a3c1bbc50a8aa4e8e5a24a656978a5e8ff 100644 (file)
--- a/vp10/common/vp9_reconintra.h
+++ b/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" {

diff --git a/vp10/common/vp9_scale.c b/vp10/common/scale.c
similarity index 98%
rename from vp10/common/vp9_scale.c
rename to vp10/common/scale.c
index 0783028015aa6d0f1ffd1f5aef13acd87a368be3..ce6062c19501386951ae269b04d70fe0ced6b884 100644 (file)
--- a/vp10/common/vp9_scale.c
+++ b/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) {

diff --git a/vp10/common/vp9_scale.h b/vp10/common/scale.h
similarity index 98%
rename from vp10/common/vp9_scale.h
rename to vp10/common/scale.h
index 6bbd1eb5371ff33e4708994398331f96d234c3ab..5e5e7d09edac7d36f5fdfb42b39d6721a52c6703 100644 (file)
--- a/vp10/common/vp9_scale.h
+++ b/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

diff --git a/vp10/common/vp9_scan.c b/vp10/common/scan.c
similarity index 99%
rename from vp10/common/vp9_scan.c
rename to vp10/common/scan.c
index cdea0a5ccb5bf6b5fde2552ff359ddd9600b08c7..7217f6d045926ae85c87bccf785506078e5363eb 100644 (file)
--- a/vp10/common/vp9_scan.c
+++ b/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,

diff --git a/vp10/common/vp9_scan.h b/vp10/common/scan.h
similarity index 95%
rename from vp10/common/vp9_scan.h
rename to vp10/common/scan.h
index 89d0ed78d0c45f1f96b317bd99edc0f84af317ff..cf93c09eceb978817d0eac4ccaaecd4ca918ab94 100644 (file)
--- a/vp10/common/vp9_scan.h
+++ b/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" {

diff --git a/vp10/common/vp9_seg_common.c b/vp10/common/seg_common.c
similarity index 92%
rename from vp10/common/vp9_seg_common.c
rename to vp10/common/seg_common.c
index 8a6ab1c3f5dec8daa55f6137f3a49e591c912f03..1bf09b9a0f97542f0c5f7ca242758dab06988f47 100644 (file)
--- a/vp10/common/vp9_seg_common.c
+++ b/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 };
 

diff --git a/vp10/common/vp9_seg_common.h b/vp10/common/seg_common.h
similarity index 100%
rename from vp10/common/vp9_seg_common.h
rename to vp10/common/seg_common.h

diff --git a/vp10/common/vp9_systemdependent.h b/vp10/common/systemdependent.h
similarity index 100%
rename from vp10/common/vp9_systemdependent.h
rename to vp10/common/systemdependent.h

diff --git a/vp10/common/vp9_textblit.c b/vp10/common/textblit.c
similarity index 98%
rename from vp10/common/vp9_textblit.c
rename to vp10/common/textblit.c
index 42f47a6d6a0c3d2afbabf8aaefce46ec65acfd0b..2e8811ea50a15f7d580c7d3748f7b3777b563d4f 100644 (file)
--- a/vp10/common/vp9_textblit.c
+++ b/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,

diff --git a/vp10/common/vp9_textblit.h b/vp10/common/textblit.h
similarity index 100%
rename from vp10/common/vp9_textblit.h
rename to vp10/common/textblit.h

diff --git a/vp10/common/vp9_thread_common.c b/vp10/common/thread_common.c
similarity index 98%
rename from vp10/common/vp9_thread_common.c
rename to vp10/common/thread_common.c
index e936453d8b6e89eb9a9a5f67e0cd2efefaade090..088589e4dd0ad68a3a5c25c06a43ab53ced19e03 100644 (file)
--- a/vp10/common/vp9_thread_common.c
+++ b/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) {

diff --git a/vp10/common/vp9_thread_common.h b/vp10/common/thread_common.h
similarity index 98%
rename from vp10/common/vp9_thread_common.h
rename to vp10/common/thread_common.h
index a48450d420ce3a25135a66c0178fd9416544ff3b..09f100b10c9f98d4df82b87cbf3559b99d1ca871 100644 (file)
--- a/vp10/common/vp9_thread_common.h
+++ b/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;

diff --git a/vp10/common/vp9_tile_common.c b/vp10/common/tile_common.c
similarity index 96%
rename from vp10/common/vp9_tile_common.c
rename to vp10/common/tile_common.c
index 56840d1f2be3f441d12ed3983d37f0280944cc39..fb7fac66387585b0e9723c9cef30552c5a73524a 100644 (file)
--- a/vp10/common/vp9_tile_common.c
+++ b/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

diff --git a/vp10/common/vp9_tile_common.h b/vp10/common/tile_common.h
similarity index 100%
rename from vp10/common/vp9_tile_common.h
rename to vp10/common/tile_common.h

diff --git a/vp10/common/vp10_rtcd_defs.pl b/vp10/common/vp10_rtcd_defs.pl
index 78cc2d042655ce5f37e0bb12f1178a00e8de536f..6de3bb06b0b44a0dddf342f3586027f4f74ba9ef 100644 (file)
--- a/vp10/common/vp10_rtcd_defs.pl
+++ b/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;
 

diff --git a/vp10/common/x86/vp9_idct_intrin_sse2.c b/vp10/common/x86/idct_intrin_sse2.c
similarity index 100%
rename from vp10/common/x86/vp9_idct_intrin_sse2.c
rename to vp10/common/x86/idct_intrin_sse2.c

diff --git a/vp10/common/x86/vp9_mfqe_sse2.asm b/vp10/common/x86/mfqe_sse2.asm
similarity index 100%
rename from vp10/common/x86/vp9_mfqe_sse2.asm
rename to vp10/common/x86/mfqe_sse2.asm

diff --git a/vp10/common/x86/vp9_postproc_sse2.asm b/vp10/common/x86/postproc_sse2.asm
similarity index 100%
rename from vp10/common/x86/vp9_postproc_sse2.asm
rename to vp10/common/x86/postproc_sse2.asm

diff --git a/vp10/decoder/vp9_decodeframe.c b/vp10/decoder/decodeframe.c
similarity index 99%
rename from vp10/decoder/vp9_decodeframe.c
rename to vp10/decoder/decodeframe.c
index f079e28eaf37991b77fbf34b73c036b77e3c2931..8814f96912bdc9836301d85cc2a943b70f3fb9be 100644 (file)
--- a/vp10/decoder/vp9_decodeframe.c
+++ b/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/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/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/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
 

diff --git a/vp10/decoder/vp9_decodeframe.h b/vp10/decoder/decodeframe.h
similarity index 100%
rename from vp10/decoder/vp9_decodeframe.h
rename to vp10/decoder/decodeframe.h

diff --git a/vp10/decoder/vp9_decodemv.c b/vp10/decoder/decodemv.c
similarity index 98%
rename from vp10/decoder/vp9_decodemv.c
rename to vp10/decoder/decodemv.c
index 0f8c76b54217d7fd2deaf6af33681c4fb6c42444..439b8293773966990ff858169ffb2ebc7730f912 100644 (file)
--- a/vp10/decoder/vp9_decodemv.c
+++ b/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/decoder/vp9_decodemv.h"
-#include "vp10/decoder/vp9_decodeframe.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/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);

diff --git a/vp10/decoder/vp9_decodemv.h b/vp10/decoder/decodemv.h
similarity index 95%
rename from vp10/decoder/vp9_decodemv.h
rename to vp10/decoder/decodemv.h
index bdca0db50b45e42d3752795354ba55e76875952c..8734ccc4b8dd79ff07d3dcb4105dfb860386f15c 100644 (file)
--- a/vp10/decoder/vp9_decodemv.h
+++ b/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" {

diff --git a/vp10/decoder/vp9_decoder.c b/vp10/decoder/decoder.c
similarity index 97%
rename from vp10/decoder/vp9_decoder.c
rename to vp10/decoder/decoder.c
index 5dd364c276b4d2f76bcbdd92986e7208067d32ea..dda5d6cd3b1619b32617940f59c95b067ee0707a 100644 (file)
--- a/vp10/decoder/vp9_decoder.c
+++ b/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;

diff --git a/vp10/decoder/vp9_decoder.h b/vp10/decoder/decoder.h
similarity index 96%
rename from vp10/decoder/vp9_decoder.h
rename to vp10/decoder/decoder.h
index db26f4dd416a003b7853695b82748ccd0e40778b..462a64ebd2214d348628065c29fd34f4845b2f63 100644 (file)
--- a/vp10/decoder/vp9_decoder.h
+++ b/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" {

diff --git a/vp10/decoder/vp9_detokenize.c b/vp10/decoder/detokenize.c
similarity index 97%
rename from vp10/decoder/vp9_detokenize.c
rename to vp10/decoder/detokenize.c
index 5cea0f7d7a06f46637bec0b6fcfa8b99c3702052..2902ece7c2fd045f82e867ef45171f94571f2ca1 100644 (file)
--- a/vp10/decoder/vp9_detokenize.c
+++ b/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

diff --git a/vp10/decoder/vp9_detokenize.h b/vp10/decoder/detokenize.h
similarity index 92%
rename from vp10/decoder/vp9_detokenize.h
rename to vp10/decoder/detokenize.h
index 17aaffea252c57a73645e4f248f2bc26ad98a313..cf752d1d485294ee4e0416039db8656857627391 100644 (file)
--- a/vp10/decoder/vp9_detokenize.h
+++ b/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" {

diff --git a/vp10/decoder/vp9_dsubexp.c b/vp10/decoder/dsubexp.c
similarity index 97%
rename from vp10/decoder/vp9_dsubexp.c
rename to vp10/decoder/dsubexp.c
index 5c82b3144fa7c3ff4a50579288d2cbf9d73dbc1b..dbcdb4964c13756d8aeb4766a8c3cea323c6c5a3 100644 (file)
--- a/vp10/decoder/vp9_dsubexp.c
+++ b/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)

diff --git a/vp10/decoder/vp9_dsubexp.h b/vp10/decoder/dsubexp.h
similarity index 100%
rename from vp10/decoder/vp9_dsubexp.h
rename to vp10/decoder/dsubexp.h

diff --git a/vp10/decoder/vp9_dthread.c b/vp10/decoder/dthread.c
similarity index 98%
rename from vp10/decoder/vp9_dthread.c
rename to vp10/decoder/dthread.c
index 3436dd2f493056847d2c62165e1fdacd955af36d..391613a3dbb9f145872cdf4753734ccbb259cd2e 100644 (file)
--- a/vp10/decoder/vp9_dthread.c
+++ b/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
 

diff --git a/vp10/decoder/vp9_dthread.h b/vp10/decoder/dthread.h
similarity index 100%
rename from vp10/decoder/vp9_dthread.h
rename to vp10/decoder/dthread.h

diff --git a/vp10/encoder/vp9_aq_complexity.c b/vp10/encoder/aq_complexity.c
similarity index 96%
rename from vp10/encoder/vp9_aq_complexity.c
rename to vp10/encoder/aq_complexity.c
index ae9dd86599aa7a9f1b2e8949be5134490f33a995..35ead9577dedb6417260162107eb7396760108a6 100644 (file)
--- a/vp10/encoder/vp9_aq_complexity.c
+++ b/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

diff --git a/vp10/encoder/vp9_aq_complexity.h b/vp10/encoder/aq_complexity.h
similarity index 96%
rename from vp10/encoder/vp9_aq_complexity.h
rename to vp10/encoder/aq_complexity.h
index 43a0fbf188f31bec3ed6c4cf0116b27a0848f66c..9048da629a23f7c87b1897aa49ccb93edfd31f7a 100644 (file)
--- a/vp10/encoder/vp9_aq_complexity.h
+++ b/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;

diff --git a/vp10/encoder/vp9_aq_cyclicrefresh.c b/vp10/encoder/aq_cyclicrefresh.c
similarity index 99%
rename from vp10/encoder/vp9_aq_cyclicrefresh.c
rename to vp10/encoder/aq_cyclicrefresh.c
index 93ca00bc3c491ae78d4137da0ee2e52c7e8c3c92..dcf2ca33c88c1f188e19d3d3e17a1dbe049a34c2 100644 (file)
--- a/vp10/encoder/vp9_aq_cyclicrefresh.c
+++ b/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

diff --git a/vp10/encoder/vp9_aq_cyclicrefresh.h b/vp10/encoder/aq_cyclicrefresh.h
similarity index 99%
rename from vp10/encoder/vp9_aq_cyclicrefresh.h
rename to vp10/encoder/aq_cyclicrefresh.h
index a020f05d395aed98e0fea75087d33a16fe73ac29..3eb6462f93eadd12752a258bfe0fb800a748f12c 100644 (file)
--- a/vp10/encoder/vp9_aq_cyclicrefresh.h
+++ b/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" {

diff --git a/vp10/encoder/vp9_aq_variance.c b/vp10/encoder/aq_variance.c
similarity index 96%
rename from vp10/encoder/vp9_aq_variance.c
rename to vp10/encoder/aq_variance.c
index f8e18ce0251c5b88bde45c074efebbab81e679b8..b88a3fb5fdc7d7e8a9d60ac18fe4441eaa7628f8 100644 (file)
--- a/vp10/encoder/vp9_aq_variance.c
+++ b/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)

diff --git a/vp10/encoder/vp9_aq_variance.h b/vp10/encoder/aq_variance.h
similarity index 95%
rename from vp10/encoder/vp9_aq_variance.h
rename to vp10/encoder/aq_variance.h
index 001e7b4efa29e3ee77fa2c9e4acfa12f679cc982..199493e116b60ccdfd8b502db118f718912bd517 100644 (file)
--- a/vp10/encoder/vp9_aq_variance.h
+++ b/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" {

diff --git a/vp10/encoder/arm/neon/vp9_avg_neon.c b/vp10/encoder/arm/neon/avg_neon.c
similarity index 100%
rename from vp10/encoder/arm/neon/vp9_avg_neon.c
rename to vp10/encoder/arm/neon/avg_neon.c

diff --git a/vp10/encoder/arm/neon/vp9_dct_neon.c b/vp10/encoder/arm/neon/dct_neon.c
similarity index 97%
rename from vp10/encoder/arm/neon/vp9_dct_neon.c
rename to vp10/encoder/arm/neon/dct_neon.c
index c911782509e149436a6a88c31c97d6b5596873f6..b37a2ff3a9fc7d1451c495cbeba21da363de7ae4 100644 (file)
--- a/vp10/encoder/arm/neon/vp9_dct_neon.c
+++ b/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,

diff --git a/vp10/encoder/arm/neon/vp9_error_neon.c b/vp10/encoder/arm/neon/error_neon.c
similarity index 100%
rename from vp10/encoder/arm/neon/vp9_error_neon.c
rename to vp10/encoder/arm/neon/error_neon.c

diff --git a/vp10/encoder/arm/neon/vp9_quantize_neon.c b/vp10/encoder/arm/neon/quantize_neon.c
similarity index 96%
rename from vp10/encoder/arm/neon/vp9_quantize_neon.c
rename to vp10/encoder/arm/neon/quantize_neon.c
index a7dce3742a9950a4520ee3b6fc4edee9fc641309..9354ced69937264e89e3d6872d0d4e7397418986 100644 (file)
--- a/vp10/encoder/arm/neon/vp9_quantize_neon.c
+++ b/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,

diff --git a/vp10/encoder/vp9_avg.c b/vp10/encoder/avg.c
similarity index 99%
rename from vp10/encoder/vp9_avg.c
rename to vp10/encoder/avg.c
index 39e9762b1f9291eac71f99506e7f174134db343d..738c4273d3bbe11ca79d84f9f4e0fcfefc96aff5 100644 (file)
--- a/vp10/encoder/vp9_avg.c
+++ b/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) {

diff --git a/vp10/encoder/vp9_bitstream.c b/vp10/encoder/bitstream.c
similarity index 98%
rename from vp10/encoder/vp9_bitstream.c
rename to vp10/encoder/bitstream.c
index fb2201c7b4286d7c70fffbc2faa33cb1bb165eeb..43fa23513b9f218305cce4c07982aecd23dd0b03 100644 (file)
--- a/vp10/encoder/vp9_bitstream.c
+++ b/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/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/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/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},

diff --git a/vp10/encoder/vp9_bitstream.h b/vp10/encoder/bitstream.h
similarity index 96%
rename from vp10/encoder/vp9_bitstream.h
rename to vp10/encoder/bitstream.h
index 3d73a6e92aed0fb3046b1f1e5b3f8dc31736f9fc..d235c321783cc349497e600f972faf24d4bf8ee3 100644 (file)
--- a/vp10/encoder/vp9_bitstream.h
+++ b/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);
 

diff --git a/vp10/encoder/vp9_block.h b/vp10/encoder/block.h
similarity index 98%
rename from vp10/encoder/vp9_block.h
rename to vp10/encoder/block.h
index 869416dc3ae171987bb41e9eb71807f4fab276c5..423c4d7bda110dec040239d62dedf65bbe059f13 100644 (file)
--- a/vp10/encoder/vp9_block.h
+++ b/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" {

diff --git a/vp10/encoder/vp9_blockiness.c b/vp10/encoder/blockiness.c
similarity index 98%
rename from vp10/encoder/vp9_blockiness.c
rename to vp10/encoder/blockiness.c
index 8312abfc95f768d33313f535d151f102a2ccef5d..da443486e5aeac99ba32a28220f86a22389f29dc 100644 (file)
--- a/vp10/encoder/vp9_blockiness.c
+++ b/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"

diff --git a/vp10/encoder/vp9_context_tree.c b/vp10/encoder/context_tree.c
similarity index 98%
rename from vp10/encoder/vp9_context_tree.c
rename to vp10/encoder/context_tree.c
index 7d623eebdef505c4810dd1ac86a66af4fb583b68..11a7bb3ac0cb33bbb637b9229db376aa6276d88c 100644 (file)
--- a/vp10/encoder/vp9_context_tree.c
+++ b/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,

diff --git a/vp10/encoder/vp9_context_tree.h b/vp10/encoder/context_tree.h
similarity index 97%
rename from vp10/encoder/vp9_context_tree.h
rename to vp10/encoder/context_tree.h
index 9963ed2e7c9532c2eedcd66b1838658d246742e9..fd658700025663036d8e2e59b12c04c96aea2432 100644 (file)
--- a/vp10/encoder/vp9_context_tree.h
+++ b/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;

diff --git a/vp10/encoder/vp9_cost.c b/vp10/encoder/cost.c
similarity index 98%
rename from vp10/encoder/vp9_cost.c
rename to vp10/encoder/cost.c
index 8af22e5911e315f529dd4ce0dbd4d1bee35869a7..aab826322be48dbb71822bd0e75e7076f9e0778b 100644 (file)
--- a/vp10/encoder/vp9_cost.c
+++ b/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,

diff --git a/vp10/encoder/vp9_cost.h b/vp10/encoder/cost.h
similarity index 100%
rename from vp10/encoder/vp9_cost.h
rename to vp10/encoder/cost.h

diff --git a/vp10/encoder/vp9_dct.c b/vp10/encoder/dct.c
similarity index 99%
rename from vp10/encoder/vp9_dct.c
rename to vp10/encoder/dct.c
index 810e422a84288ffe9ffa3a104aac49d8875463c5..0581b1455306f47ec7e7fb6aceee5e712ffa46f7 100644 (file)
--- a/vp10/encoder/vp9_dct.c
+++ b/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"
 

diff --git a/vp10/encoder/vp9_denoiser.c b/vp10/encoder/denoiser.c
similarity index 99%
rename from vp10/encoder/vp9_denoiser.c
rename to vp10/encoder/denoiser.c
index dfc0e47dbb74d2f0e652e2c43ade7ba7381d9eb9..4a79b113163569768e738dc588b66380e1332ea6 100644 (file)
--- a/vp10/encoder/vp9_denoiser.c
+++ b/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

diff --git a/vp10/encoder/vp9_denoiser.h b/vp10/encoder/denoiser.h
similarity index 98%
rename from vp10/encoder/vp9_denoiser.h
rename to vp10/encoder/denoiser.h
index 0016ead10567864dc7741fbf67765667f1a0d197..e543fb05fa06d9966a9b57303026a1018a43dce2 100644 (file)
--- a/vp10/encoder/vp9_denoiser.h
+++ b/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

diff --git a/vp10/encoder/vp9_encodeframe.c b/vp10/encoder/encodeframe.c
similarity index 99%
rename from vp10/encoder/vp9_encodeframe.c
rename to vp10/encoder/encodeframe.c
index dd16d34ec0ef9f9c8a24848b00af90f73d02b66d..bf496ff2f72465aefccd13955d82531388e3c487 100644 (file)
--- a/vp10/encoder/vp9_encodeframe.c
+++ b/vp10/encoder/encodeframe.c
@@ -19,32 +19,32 @@
 #include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_timer.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_mvref_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_systemdependent.h"
-#include "vp10/common/vp9_tile_common.h"
-
-#include "vp10/encoder/vp9_aq_complexity.h"
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_ethread.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_pickmode.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_rdopt.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/mvref_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/systemdependent.h"
+#include "vp10/common/tile_common.h"
+
+#include "vp10/encoder/aq_complexity.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/ethread.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/pickmode.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/rdopt.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/tokenize.h"
 
 static void encode_superblock(VP9_COMP *cpi, ThreadData * td,
                               TOKENEXTRA **t, int output_enabled,

diff --git a/vp10/encoder/vp9_encodeframe.h b/vp10/encoder/encodeframe.h
similarity index 100%
rename from vp10/encoder/vp9_encodeframe.h
rename to vp10/encoder/encodeframe.h

diff --git a/vp10/encoder/vp9_encodemb.c b/vp10/encoder/encodemb.c
similarity index 99%
rename from vp10/encoder/vp9_encodemb.c
rename to vp10/encoder/encodemb.c
index be4ed6cfe73d3e261d28036598e57415f0579ffc..105fac1a855b929179f878d320da294d375776d5 100644 (file)
--- a/vp10/encoder/vp9_encodemb.c
+++ b/vp10/encoder/encodemb.c
@@ -17,15 +17,15 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_scan.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/scan.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/tokenize.h"
 
 struct optimize_ctx {
   ENTROPY_CONTEXT ta[MAX_MB_PLANE][16];

diff --git a/vp10/encoder/vp9_encodemb.h b/vp10/encoder/encodemb.h
similarity index 97%
rename from vp10/encoder/vp9_encodemb.h
rename to vp10/encoder/encodemb.h
index 776b5f4dc655c9d4fffb8556a1f917c859c37573..7914d6fdaf16d5f7739da4632b1f48e259bd0d5d 100644 (file)
--- a/vp10/encoder/vp9_encodemb.h
+++ b/vp10/encoder/encodemb.h
@@ -12,7 +12,7 @@
 #define VP9_ENCODER_VP9_ENCODEMB_H_
 
 #include "./vpx_config.h"
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_encodemv.c b/vp10/encoder/encodemv.c
similarity index 97%
rename from vp10/encoder/vp9_encodemv.c
rename to vp10/encoder/encodemv.c
index 4a1e990a7dc0d0fdb2fab49010dfeb22d1efbab6..90a9857bc7de70aa71925d76eb2937d562e1d165 100644 (file)
--- a/vp10/encoder/vp9_encodemv.c
+++ b/vp10/encoder/encodemv.c
@@ -10,12 +10,12 @@
 
 #include <math.h>
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/systemdependent.h"
 
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encodemv.h"
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encodemv.h"
 
 static struct vp10_token mv_joint_encodings[MV_JOINTS];
 static struct vp10_token mv_class_encodings[MV_CLASSES];

diff --git a/vp10/encoder/vp9_encodemv.h b/vp10/encoder/encodemv.h
similarity index 96%
rename from vp10/encoder/vp9_encodemv.h
rename to vp10/encoder/encodemv.h
index 052f4a738ddd06298b97c4f1aa4f26070de9f4ce..3ac457281bc13c09b5463099e6471b9cf9bc33df 100644 (file)
--- a/vp10/encoder/vp9_encodemv.h
+++ b/vp10/encoder/encodemv.h
@@ -12,7 +12,7 @@
 #ifndef VP9_ENCODER_VP9_ENCODEMV_H_
 #define VP9_ENCODER_VP9_ENCODEMV_H_
 
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_encoder.c b/vp10/encoder/encoder.c
similarity index 99%
rename from vp10/encoder/vp9_encoder.c
rename to vp10/encoder/encoder.c
index a4afca149080ba8503f2cf1797a0ebabbf63db51..358cd5a9d2c7d53630be064b748d3195995bc60a 100644 (file)
--- a/vp10/encoder/vp9_encoder.c
+++ b/vp10/encoder/encoder.c
@@ -22,40 +22,40 @@
 #include "vpx_ports/vpx_timer.h"
 #include "vpx_scale/vpx_scale.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_filter.h"
-#include "vp10/common/vp9_idct.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/filter.h"
+#include "vp10/common/idct.h"
 #if CONFIG_VP9_POSTPROC
-#include "vp10/common/vp9_postproc.h"
+#include "vp10/common/postproc.h"
 #endif
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/common/vp9_tile_common.h"
-
-#include "vp10/encoder/vp9_aq_complexity.h"
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_bitstream.h"
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_ethread.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_mbgraph.h"
-#include "vp10/encoder/vp9_picklpf.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_resize.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_skin_detection.h"
-#include "vp10/encoder/vp9_speed_features.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/common/tile_common.h"
+
+#include "vp10/encoder/aq_complexity.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/bitstream.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/ethread.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/mbgraph.h"
+#include "vp10/encoder/picklpf.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/resize.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/skin_detection.h"
+#include "vp10/encoder/speed_features.h"
 #if CONFIG_INTERNAL_STATS
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
 #endif
-#include "vp10/encoder/vp9_svc_layercontext.h"
-#include "vp10/encoder/vp9_temporal_filter.h"
+#include "vp10/encoder/svc_layercontext.h"
+#include "vp10/encoder/temporal_filter.h"
 
 #define AM_SEGMENT_ID_INACTIVE 7
 #define AM_SEGMENT_ID_ACTIVE 0

diff --git a/vp10/encoder/vp9_encoder.h b/vp10/encoder/encoder.h
similarity index 95%
rename from vp10/encoder/vp9_encoder.h
rename to vp10/encoder/encoder.h
index 3e62aa0877fe3e6e4e2e916a7b630b55bdd19039..53d9303031407adf5c67a07a9b198a0796cb048e 100644 (file)
--- a/vp10/encoder/vp9_encoder.h
+++ b/vp10/encoder/encoder.h
@@ -18,32 +18,32 @@
 #include "vpx/vp8cx.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_ppflags.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_onyxc_int.h"
-
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_lookahead.h"
-#include "vp10/encoder/vp9_mbgraph.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/ppflags.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/onyxc_int.h"
+
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/lookahead.h"
+#include "vp10/encoder/mbgraph.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
 #if CONFIG_INTERNAL_STATS
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
 #endif
-#include "vp10/encoder/vp9_speed_features.h"
-#include "vp10/encoder/vp9_svc_layercontext.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/encoder/speed_features.h"
+#include "vp10/encoder/svc_layercontext.h"
+#include "vp10/encoder/tokenize.h"
 #include "vpx_dsp/variance.h"
 
 #if CONFIG_VP9_TEMPORAL_DENOISING
-#include "vp10/encoder/vp9_denoiser.h"
+#include "vp10/encoder/denoiser.h"
 #endif
 
 #ifdef __cplusplus

diff --git a/vp10/encoder/vp9_ethread.c b/vp10/encoder/ethread.c
similarity index 98%
rename from vp10/encoder/vp9_ethread.c
rename to vp10/encoder/ethread.c
index 6a752be7d69319e6773906141a4e5b7c29e6aa7f..322bd5ac1884ef64108ca1cdfd5094bbd437ca4b 100644 (file)
--- a/vp10/encoder/vp9_ethread.c
+++ b/vp10/encoder/ethread.c
@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_ethread.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/ethread.h"
 
 static void accumulate_rd_opt(ThreadData *td, ThreadData *td_t) {
   int i, j, k, l, m, n;

diff --git a/vp10/encoder/vp9_ethread.h b/vp10/encoder/ethread.h
similarity index 100%
rename from vp10/encoder/vp9_ethread.h
rename to vp10/encoder/ethread.h

diff --git a/vp10/encoder/vp9_extend.c b/vp10/encoder/extend.c
similarity index 99%
rename from vp10/encoder/vp9_extend.c
rename to vp10/encoder/extend.c
index d42998d681efa0c96b51eaf07da1e831f3cc802d..2ffbac0f99361e586d29f88dc0eb9d28c9b089cf 100644 (file)
--- a/vp10/encoder/vp9_extend.c
+++ b/vp10/encoder/extend.c
@@ -11,8 +11,8 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/encoder/vp9_extend.h"
+#include "vp10/common/common.h"
+#include "vp10/encoder/extend.h"
 
 static void copy_and_extend_plane(const uint8_t *src, int src_pitch,
                                   uint8_t *dst, int dst_pitch,

diff --git a/vp10/encoder/vp9_extend.h b/vp10/encoder/extend.h
similarity index 100%
rename from vp10/encoder/vp9_extend.h
rename to vp10/encoder/extend.h

diff --git a/vp10/encoder/vp9_fastssim.c b/vp10/encoder/fastssim.c
similarity index 99%
rename from vp10/encoder/vp9_fastssim.c
rename to vp10/encoder/fastssim.c
index d5a1e59c8c42c6f82a1adef40c69941b84056869..12625024785ba443205b7df35f76ccbb40056d13 100644 (file)
--- a/vp10/encoder/vp9_fastssim.c
+++ b/vp10/encoder/fastssim.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
 /* TODO(jbb): High bit depth version of this code needed */
 typedef struct fs_level fs_level;
 typedef struct fs_ctx fs_ctx;

diff --git a/vp10/encoder/vp9_firstpass.c b/vp10/encoder/firstpass.c
similarity index 99%
rename from vp10/encoder/vp9_firstpass.c
rename to vp10/encoder/firstpass.c
index e3caa5af77a882c669deeeac34ede36c146b4616..6f95eea044e3b6d33ef39468510257dfd5bb79d6 100644 (file)
--- a/vp10/encoder/vp9_firstpass.c
+++ b/vp10/encoder/firstpass.c
@@ -20,21 +20,21 @@
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_scale/yv12config.h"
 
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h"  // vp10_setup_dst_planes()
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h"  // vp10_setup_dst_planes()
+#include "vp10/common/systemdependent.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/rd.h"
 #include "vpx_dsp/variance.h"
 
 #define OUTPUT_FPF          0

diff --git a/vp10/encoder/vp9_firstpass.h b/vp10/encoder/firstpass.h
similarity index 98%
rename from vp10/encoder/vp9_firstpass.h
rename to vp10/encoder/firstpass.h
index e50a352461f00d05dd01dbb5c3cf43b9e8b8725d..17b930a42fdeebf4356491216fa7f403ef86fa17 100644 (file)
--- a/vp10/encoder/vp9_firstpass.h
+++ b/vp10/encoder/firstpass.h
@@ -11,8 +11,8 @@
 #ifndef VP9_ENCODER_VP9_FIRSTPASS_H_
 #define VP9_ENCODER_VP9_FIRSTPASS_H_
 
-#include "vp10/encoder/vp9_lookahead.h"
-#include "vp10/encoder/vp9_ratectrl.h"
+#include "vp10/encoder/lookahead.h"
+#include "vp10/encoder/ratectrl.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_lookahead.c b/vp10/encoder/lookahead.c
similarity index 97%
rename from vp10/encoder/vp9_lookahead.c
rename to vp10/encoder/lookahead.c
index 1922a35b17bd622476aa71135a042a8f83d1e301..5a76336573699294118a0b091402a1b6cc1d02a9 100644 (file)
--- a/vp10/encoder/vp9_lookahead.c
+++ b/vp10/encoder/lookahead.c
@@ -12,11 +12,11 @@
 
 #include "./vpx_config.h"
 
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_lookahead.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/lookahead.h"
 
 /* Return the buffer at the given absolute index and increment the index */
 static struct lookahead_entry *pop(struct lookahead_ctx *ctx,

diff --git a/vp10/encoder/vp9_lookahead.h b/vp10/encoder/lookahead.h
similarity index 100%
rename from vp10/encoder/vp9_lookahead.h
rename to vp10/encoder/lookahead.h

diff --git a/vp10/encoder/vp9_mbgraph.c b/vp10/encoder/mbgraph.c
similarity index 98%
rename from vp10/encoder/vp9_mbgraph.c
rename to vp10/encoder/mbgraph.c
index f7f1f011334ce8a7a97a497f63af188b96d48096..f676dd7daa4fef26031df86950ce5cc034712480 100644 (file)
--- a/vp10/encoder/vp9_mbgraph.c
+++ b/vp10/encoder/mbgraph.c
@@ -14,12 +14,12 @@
 #include "./vpx_dsp_rtcd.h"
 
 #include "vpx_mem/vpx_mem.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/systemdependent.h"
 
 
 static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi,

diff --git a/vp10/encoder/vp9_mbgraph.h b/vp10/encoder/mbgraph.h
similarity index 100%
rename from vp10/encoder/vp9_mbgraph.h
rename to vp10/encoder/mbgraph.h

diff --git a/vp10/encoder/vp9_mcomp.c b/vp10/encoder/mcomp.c
similarity index 99%
rename from vp10/encoder/vp9_mcomp.c
rename to vp10/encoder/mcomp.c
index 6e22d8fe031685a51b5d3c0ae6ea59a11cdc314e..0daa0ee0eb9750d30e3dcec9def834aec5ce44bf 100644 (file)
--- a/vp10/encoder/vp9_mcomp.c
+++ b/vp10/encoder/mcomp.c
@@ -18,11 +18,11 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_reconinter.h"
+#include "vp10/common/common.h"
+#include "vp10/common/reconinter.h"
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_mcomp.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/mcomp.h"
 
 // #define NEW_DIAMOND_SEARCH
 

diff --git a/vp10/encoder/vp9_mcomp.h b/vp10/encoder/mcomp.h
similarity index 99%
rename from vp10/encoder/vp9_mcomp.h
rename to vp10/encoder/mcomp.h
index 5af4ab0711157318e3491256df8e932c7fe40b08..3fe9f6c95d361a1bd6172d3f00054626c81fa146 100644 (file)
--- a/vp10/encoder/vp9_mcomp.h
+++ b/vp10/encoder/mcomp.h
@@ -12,7 +12,7 @@
 #ifndef VP9_ENCODER_VP9_MCOMP_H_
 #define VP9_ENCODER_VP9_MCOMP_H_
 
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
 #include "vpx_dsp/variance.h"
 
 #ifdef __cplusplus

diff --git a/vp10/encoder/mips/msa/vp9_avg_msa.c b/vp10/encoder/mips/msa/avg_msa.c
similarity index 100%
rename from vp10/encoder/mips/msa/vp9_avg_msa.c
rename to vp10/encoder/mips/msa/avg_msa.c

diff --git a/vp10/encoder/mips/msa/vp9_error_msa.c b/vp10/encoder/mips/msa/error_msa.c
similarity index 100%
rename from vp10/encoder/mips/msa/vp9_error_msa.c
rename to vp10/encoder/mips/msa/error_msa.c

diff --git a/vp10/encoder/mips/msa/vp9_fdct16x16_msa.c b/vp10/encoder/mips/msa/fdct16x16_msa.c
similarity index 99%
rename from vp10/encoder/mips/msa/vp9_fdct16x16_msa.c
rename to vp10/encoder/mips/msa/fdct16x16_msa.c
index c031ab6894f57294bec4666b4dd07906cd355480..d78fc6473e766ca32b8957324c5fd73726d51259 100644 (file)
--- a/vp10/encoder/mips/msa/vp9_fdct16x16_msa.c
+++ b/vp10/encoder/mips/msa/fdct16x16_msa.c
@@ -10,8 +10,8 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
-#include "vp10/encoder/mips/msa/vp9_fdct_msa.h"
+#include "vp10/common/enums.h"
+#include "vp10/encoder/mips/msa/fdct_msa.h"
 #include "vpx_dsp/mips/fwd_txfm_msa.h"
 
 static void fadst16_cols_step1_msa(const int16_t *input, int32_t stride,

diff --git a/vp10/encoder/mips/msa/vp9_fdct4x4_msa.c b/vp10/encoder/mips/msa/fdct4x4_msa.c
similarity index 97%
rename from vp10/encoder/mips/msa/vp9_fdct4x4_msa.c
rename to vp10/encoder/mips/msa/fdct4x4_msa.c
index e06bf724e1caa41855041ef88b61d5de7c03fbe3..37269f0a43a8f739f663681eebb475e190ef2ce2 100644 (file)
--- a/vp10/encoder/mips/msa/vp9_fdct4x4_msa.c
+++ b/vp10/encoder/mips/msa/fdct4x4_msa.c
@@ -10,8 +10,8 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
-#include "vp10/encoder/mips/msa/vp9_fdct_msa.h"
+#include "vp10/common/enums.h"
+#include "vp10/encoder/mips/msa/fdct_msa.h"
 
 void vp10_fwht4x4_msa(const int16_t *input, int16_t *output,
                      int32_t src_stride) {

diff --git a/vp10/encoder/mips/msa/vp9_fdct8x8_msa.c b/vp10/encoder/mips/msa/fdct8x8_msa.c
similarity index 96%
rename from vp10/encoder/mips/msa/vp9_fdct8x8_msa.c
rename to vp10/encoder/mips/msa/fdct8x8_msa.c
index cf89daabb718713cba02e25be26b9a65295b6968..4283eb946cad51f3b1aaf6af623a99b50f039103 100644 (file)
--- a/vp10/encoder/mips/msa/vp9_fdct8x8_msa.c
+++ b/vp10/encoder/mips/msa/fdct8x8_msa.c
@@ -10,8 +10,8 @@
 
 #include <assert.h>
 
-#include "vp10/common/vp9_enums.h"
-#include "vp10/encoder/mips/msa/vp9_fdct_msa.h"
+#include "vp10/common/enums.h"
+#include "vp10/encoder/mips/msa/fdct_msa.h"
 
 void vp10_fht8x8_msa(const int16_t *input, int16_t *output, int32_t stride,
                     int32_t tx_type) {

diff --git a/vp10/encoder/mips/msa/vp9_fdct_msa.h b/vp10/encoder/mips/msa/fdct_msa.h
similarity index 100%
rename from vp10/encoder/mips/msa/vp9_fdct_msa.h
rename to vp10/encoder/mips/msa/fdct_msa.h

diff --git a/vp10/encoder/mips/msa/vp9_temporal_filter_msa.c b/vp10/encoder/mips/msa/temporal_filter_msa.c
similarity index 100%
rename from vp10/encoder/mips/msa/vp9_temporal_filter_msa.c
rename to vp10/encoder/mips/msa/temporal_filter_msa.c

diff --git a/vp10/encoder/vp9_picklpf.c b/vp10/encoder/picklpf.c
similarity index 96%
rename from vp10/encoder/vp9_picklpf.c
rename to vp10/encoder/picklpf.c
index b03437c396de5e80fa877aabc5cf73cc34827243..f5139b01f0b0b69be59dfe1dba548d906d6c9e37 100644 (file)
--- a/vp10/encoder/vp9_picklpf.c
+++ b/vp10/encoder/picklpf.c
@@ -16,13 +16,13 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_quant_common.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/quant_common.h"
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_picklpf.h"
-#include "vp10/encoder/vp9_quantize.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/picklpf.h"
+#include "vp10/encoder/quantize.h"
 
 static int get_max_filter_level(const VP9_COMP *cpi) {
   if (cpi->oxcf.pass == 2) {

diff --git a/vp10/encoder/vp9_picklpf.h b/vp10/encoder/picklpf.h
similarity index 95%
rename from vp10/encoder/vp9_picklpf.h
rename to vp10/encoder/picklpf.h
index 500fd688852b9787d0003fc3ed12374ea88d0a2c..ad45f7c746d0710863338cbecc4cd3d55262abac 100644 (file)
--- a/vp10/encoder/vp9_picklpf.h
+++ b/vp10/encoder/picklpf.h
@@ -16,7 +16,7 @@
 extern "C" {
 #endif
 
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 
 struct yv12_buffer_config;
 struct VP9_COMP;

diff --git a/vp10/encoder/vp9_pickmode.c b/vp10/encoder/pickmode.c
similarity index 99%
rename from vp10/encoder/vp9_pickmode.c
rename to vp10/encoder/pickmode.c
index 1dcb1e7747a4805601a628ad9b06889332cf9bcb..61dc9364bffd5f57e2d8b5075aad6f95904337ff 100644 (file)
--- a/vp10/encoder/vp9_pickmode.c
+++ b/vp10/encoder/pickmode.c
@@ -19,19 +19,19 @@
 #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_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_scan.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_pickmode.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/common.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/scan.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/pickmode.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
 
 typedef struct {
   uint8_t *data;

diff --git a/vp10/encoder/vp9_pickmode.h b/vp10/encoder/pickmode.h
similarity index 97%
rename from vp10/encoder/vp9_pickmode.h
rename to vp10/encoder/pickmode.h
index 5ee56b1d76575af99be30af7b75702afc42790c9..b15127de8e75f65c2e031f03e8b21245933b215e 100644 (file)
--- a/vp10/encoder/vp9_pickmode.h
+++ b/vp10/encoder/pickmode.h
@@ -11,7 +11,7 @@
 #ifndef VP9_ENCODER_VP9_PICKMODE_H_
 #define VP9_ENCODER_VP9_PICKMODE_H_
 
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_psnrhvs.c b/vp10/encoder/psnrhvs.c
similarity index 99%
rename from vp10/encoder/vp9_psnrhvs.c
rename to vp10/encoder/psnrhvs.c
index 828171c46985b67c31a07b256cee0f4a258ad8dc..c91cbc19ac4d323ad6b16bc66ecbaf7de4b711a4 100644 (file)
--- a/vp10/encoder/vp9_psnrhvs.c
+++ b/vp10/encoder/psnrhvs.c
@@ -17,7 +17,7 @@
 #include "./vpx_config.h"
 #include "./vp10_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
 
 #if !defined(M_PI)
 # define M_PI (3.141592653589793238462643)

diff --git a/vp10/encoder/vp9_quantize.c b/vp10/encoder/quantize.c
similarity index 98%
rename from vp10/encoder/vp9_quantize.c
rename to vp10/encoder/quantize.c
index 35ff8096cd9f5efd8e7beedefb663037e0f8b716..4c99e537a7e9fb8309e0e4c43b031e1d033e013d 100644 (file)
--- a/vp10/encoder/vp9_quantize.c
+++ b/vp10/encoder/quantize.c
@@ -13,12 +13,12 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/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_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs,
                        int skip_block,

diff --git a/vp10/encoder/vp9_quantize.h b/vp10/encoder/quantize.h
similarity index 98%
rename from vp10/encoder/vp9_quantize.h
rename to vp10/encoder/quantize.h
index fc7b64e0401ae72d0a24832b90ca389c3f3653d0..462b155d18a573ab85edeb1dd81bcc932a358209 100644 (file)
--- a/vp10/encoder/vp9_quantize.h
+++ b/vp10/encoder/quantize.h
@@ -12,7 +12,7 @@
 #define VP9_ENCODER_VP9_QUANTIZE_H_
 
 #include "./vpx_config.h"
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_ratectrl.c b/vp10/encoder/ratectrl.c
similarity index 99%
rename from vp10/encoder/vp9_ratectrl.c
rename to vp10/encoder/ratectrl.c
index 02f6f24f0a7c8e9f0426a74e069c0c2f512e3b54..a69504e713cd86af6956493c39f11deedc701320 100644 (file)
--- a/vp10/encoder/vp9_ratectrl.c
+++ b/vp10/encoder/ratectrl.c
@@ -18,16 +18,16 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_ratectrl.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/ratectrl.h"
 
 // Max rate target for 1080P and below encodes under normal circumstances
 // (1920 * 1080 / (16 * 16)) * MAX_MB_RATE bits per MB

diff --git a/vp10/encoder/vp9_ratectrl.h b/vp10/encoder/ratectrl.h
similarity index 99%
rename from vp10/encoder/vp9_ratectrl.h
rename to vp10/encoder/ratectrl.h
index e18d199ab63d53dc1cbebc558f6f146894a4c800..28a3d519ac16bb89e32bfddeb1aae0ef967a5555 100644 (file)
--- a/vp10/encoder/vp9_ratectrl.h
+++ b/vp10/encoder/ratectrl.h
@@ -15,7 +15,7 @@
 #include "vpx/vpx_codec.h"
 #include "vpx/vpx_integer.h"
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_rd.c b/vp10/encoder/rd.c
similarity index 96%
rename from vp10/encoder/vp9_rd.c
rename to vp10/encoder/rd.c
index f8f7e123d721aa8849c105dae609a1a1230ee4a1..74a63f95e68d75c9bc51e2dc835c1089e22558c8 100644 (file)
--- a/vp10/encoder/vp9_rd.c
+++ b/vp10/encoder/rd.c
@@ -17,26 +17,26 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/tokenize.h"
 
 #define RD_THRESH_POW      1.25
 #define RD_MULT_EPB_RATIO  64

diff --git a/vp10/encoder/vp9_rd.h b/vp10/encoder/rd.h
similarity index 97%
rename from vp10/encoder/vp9_rd.h
rename to vp10/encoder/rd.h
index 2132db35b14db6e1cd19d90fa4a15dfa08d73a96..8f2d20b9aafda569cfc1edb07240d45a81218279 100644 (file)
--- a/vp10/encoder/vp9_rd.h
+++ b/vp10/encoder/rd.h
@@ -13,10 +13,10 @@
 
 #include <limits.h>
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_context_tree.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/context_tree.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_rdopt.c b/vp10/encoder/rdopt.c
similarity index 99%
rename from vp10/encoder/vp9_rdopt.c
rename to vp10/encoder/rdopt.c
index 284a9d283b4881a38c7cd7c19e20372986742ab4..343d6f23680f0356fb68c57882f372a3a02fed89 100644 (file)
--- a/vp10/encoder/vp9_rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -17,29 +17,29 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.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_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_scan.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_rdopt.h"
-#include "vp10/encoder/vp9_aq_variance.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/scan.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/rdopt.h"
+#include "vp10/encoder/aq_variance.h"
 
 #define LAST_FRAME_MODE_MASK    ((1 << GOLDEN_FRAME) | (1 << ALTREF_FRAME) | \
                                  (1 << INTRA_FRAME))

diff --git a/vp10/encoder/vp9_rdopt.h b/vp10/encoder/rdopt.h
similarity index 96%
rename from vp10/encoder/vp9_rdopt.h
rename to vp10/encoder/rdopt.h
index 8c1e86941e802dad75bfb3d63997cb27258387d2..8047b93c098fc3f498c551c4399fad72f9d510ca 100644 (file)
--- a/vp10/encoder/vp9_rdopt.h
+++ b/vp10/encoder/rdopt.h
@@ -11,10 +11,10 @@
 #ifndef VP9_ENCODER_VP9_RDOPT_H_
 #define VP9_ENCODER_VP9_RDOPT_H_
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_context_tree.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/context_tree.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_resize.c b/vp10/encoder/resize.c
similarity index 99%
rename from vp10/encoder/vp9_resize.c
rename to vp10/encoder/resize.c
index 940370016079de9bac38d7f775fa32696ca7b43f..5e17532a992055a966d263e144f905d37f6aa62e 100644 (file)
--- a/vp10/encoder/vp9_resize.c
+++ b/vp10/encoder/resize.c
@@ -19,8 +19,8 @@
 #include "vpx_dsp/vpx_dsp_common.h"
 #endif  // CONFIG_VP9_HIGHBITDEPTH
 #include "vpx_ports/mem.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/encoder/vp9_resize.h"
+#include "vp10/common/common.h"
+#include "vp10/encoder/resize.h"
 
 #define FILTER_BITS               7
 

diff --git a/vp10/encoder/vp9_resize.h b/vp10/encoder/resize.h
similarity index 100%
rename from vp10/encoder/vp9_resize.h
rename to vp10/encoder/resize.h

diff --git a/vp10/encoder/vp9_segmentation.c b/vp10/encoder/segmentation.c
similarity index 98%
rename from vp10/encoder/vp9_segmentation.c
rename to vp10/encoder/segmentation.c
index 22006d3b02623de963ed8ebf0ed5988359bf1243..86a970288b74ef7682df701349eea56b76692c7c 100644 (file)
--- a/vp10/encoder/vp9_segmentation.c
+++ b/vp10/encoder/segmentation.c
@@ -13,11 +13,11 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/tile_common.h"
 
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_segmentation.h"
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/segmentation.h"
 
 void vp10_enable_segmentation(struct segmentation *seg) {
   seg->enabled = 1;

diff --git a/vp10/encoder/vp9_segmentation.h b/vp10/encoder/segmentation.h
similarity index 95%
rename from vp10/encoder/vp9_segmentation.h
rename to vp10/encoder/segmentation.h
index 056a9f4c58970997e29c97e2dcc5d1e1f1e68de6..85e4fe6e9dc2e6a09f896dd7e8de2c582d1ed275 100644 (file)
--- a/vp10/encoder/vp9_segmentation.h
+++ b/vp10/encoder/segmentation.h
@@ -12,8 +12,8 @@
 #ifndef VP9_ENCODER_VP9_SEGMENTATION_H_
 #define VP9_ENCODER_VP9_SEGMENTATION_H_
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/common/blockd.h"
+#include "vp10/encoder/encoder.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_skin_detection.c b/vp10/encoder/skin_detection.c
similarity index 97%
rename from vp10/encoder/vp9_skin_detection.c
rename to vp10/encoder/skin_detection.c
index f988cb98eb12a63716923a1161d30db17827bfd1..e37ea260caa57f6a64912db5357a0de100340439 100644 (file)
--- a/vp10/encoder/vp9_skin_detection.c
+++ b/vp10/encoder/skin_detection.c
@@ -11,9 +11,9 @@
 #include <limits.h>
 #include <math.h>
 
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_skin_detection.h"
+#include "vp10/common/blockd.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/skin_detection.h"
 
 // Fixed-point skin color model parameters.
 static const int skin_mean[2] = {7463, 9614};                 // q6

diff --git a/vp10/encoder/vp9_skin_detection.h b/vp10/encoder/skin_detection.h
similarity index 96%
rename from vp10/encoder/vp9_skin_detection.h
rename to vp10/encoder/skin_detection.h
index e30437b709a48901242a6144a2d48d2e6d6a263a..acfc8f1195b6234ba9b87ebf9e7a95cab3c2aec6 100644 (file)
--- a/vp10/encoder/vp9_skin_detection.h
+++ b/vp10/encoder/skin_detection.h
@@ -11,7 +11,7 @@
 #ifndef VP9_ENCODER_VP9_SKIN_MAP_H_
 #define VP9_ENCODER_VP9_SKIN_MAP_H_
 
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_speed_features.c b/vp10/encoder/speed_features.c
similarity index 99%
rename from vp10/encoder/vp9_speed_features.c
rename to vp10/encoder/speed_features.c
index aaff47fe38cb0d76cea1fc54c04a08d3155c99b1..b428e31dc18ca6f3542fd0388009c7587924b6b2 100644 (file)
--- a/vp10/encoder/vp9_speed_features.c
+++ b/vp10/encoder/speed_features.c
@@ -10,9 +10,9 @@
 
 #include <limits.h>
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_speed_features.h"
-#include "vp10/encoder/vp9_rdopt.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/speed_features.h"
+#include "vp10/encoder/rdopt.h"
 
 
 // Intra only frames, golden frames (except alt ref overlays) and

diff --git a/vp10/encoder/vp9_speed_features.h b/vp10/encoder/speed_features.h
similarity index 99%
rename from vp10/encoder/vp9_speed_features.h
rename to vp10/encoder/speed_features.h
index d0b1210f826baba1ffce986b5e78238fbf91d54d..32e8a5d7729ef8461882f3dc1205a0259fd5ba5d 100644 (file)
--- a/vp10/encoder/vp9_speed_features.h
+++ b/vp10/encoder/speed_features.h
@@ -11,7 +11,7 @@
 #ifndef VP9_ENCODER_VP9_SPEED_FEATURES_H_
 #define VP9_ENCODER_VP9_SPEED_FEATURES_H_
 
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_ssim.c b/vp10/encoder/ssim.c
similarity index 99%
rename from vp10/encoder/vp9_ssim.c
rename to vp10/encoder/ssim.c
index 3fb77ca73bf3dc7676c4782e0fb06b61c55cf51d..0219621d60d8d7ba769752d917257f84442ad357 100644 (file)
--- a/vp10/encoder/vp9_ssim.c
+++ b/vp10/encoder/ssim.c
@@ -11,7 +11,7 @@
 #include <math.h>
 #include "./vp10_rtcd.h"
 #include "vpx_ports/mem.h"
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
 
 void vp10_ssim_parms_16x16_c(uint8_t *s, int sp, uint8_t *r,
                             int rp, unsigned long *sum_s, unsigned long *sum_r,

diff --git a/vp10/encoder/vp9_ssim.h b/vp10/encoder/ssim.h
similarity index 100%
rename from vp10/encoder/vp9_ssim.h
rename to vp10/encoder/ssim.h

diff --git a/vp10/encoder/vp9_subexp.c b/vp10/encoder/subexp.c
similarity index 98%
rename from vp10/encoder/vp9_subexp.c
rename to vp10/encoder/subexp.c
index 41117bbd81b256c5220ff9d12a361cd697762e2f..fd0b09b6999ccfe2c5d572d5fd895b85cefe157e 100644 (file)
--- a/vp10/encoder/vp9_subexp.c
+++ b/vp10/encoder/subexp.c
@@ -9,10 +9,10 @@
  */
 #include "vpx_dsp/bitwriter.h"
 
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_subexp.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/subexp.h"
 
 #define vp10_cost_upd256  ((int)(vp10_cost_one(upd) - vp10_cost_zero(upd)))
 

diff --git a/vp10/encoder/vp9_subexp.h b/vp10/encoder/subexp.h
similarity index 100%
rename from vp10/encoder/vp9_subexp.h
rename to vp10/encoder/subexp.h

diff --git a/vp10/encoder/vp9_svc_layercontext.c b/vp10/encoder/svc_layercontext.c
similarity index 99%
rename from vp10/encoder/vp9_svc_layercontext.c
rename to vp10/encoder/svc_layercontext.c
index 616202d2ece4ac07a7f483cd9f9548be80ecb381..321ae83968eb5cca39c6f6b7dbbe3cf5c3118842 100644 (file)
--- a/vp10/encoder/vp9_svc_layercontext.c
+++ b/vp10/encoder/svc_layercontext.c
@@ -10,9 +10,9 @@
 
 #include <math.h>
 
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_svc_layercontext.h"
-#include "vp10/encoder/vp9_extend.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/svc_layercontext.h"
+#include "vp10/encoder/extend.h"
 
 #define SMALL_FRAME_FB_IDX 7
 #define SMALL_FRAME_WIDTH  16

diff --git a/vp10/encoder/vp9_svc_layercontext.h b/vp10/encoder/svc_layercontext.h
similarity index 98%
rename from vp10/encoder/vp9_svc_layercontext.h
rename to vp10/encoder/svc_layercontext.h
index 9564de69dcf935c189f7b7b7392b934d76786d2c..41cb9e69bed16bc9a997a11d0c20be9b05ec7508 100644 (file)
--- a/vp10/encoder/vp9_svc_layercontext.h
+++ b/vp10/encoder/svc_layercontext.h
@@ -13,7 +13,7 @@
 
 #include "vpx/vpx_encoder.h"
 
-#include "vp10/encoder/vp9_ratectrl.h"
+#include "vp10/encoder/ratectrl.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_temporal_filter.c b/vp10/encoder/temporal_filter.c
similarity index 98%
rename from vp10/encoder/vp9_temporal_filter.c
rename to vp10/encoder/temporal_filter.c
index 1e5bdf60360c1a06053e14d6251ff4746445404a..82e785496ce0a5d0fb4f711fd4094af511fdd4c1 100644 (file)
--- a/vp10/encoder/vp9_temporal_filter.c
+++ b/vp10/encoder/temporal_filter.c
@@ -11,19 +11,19 @@
 #include <math.h>
 #include <limits.h>
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_temporal_filter.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/temporal_filter.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_timer.h"

diff --git a/vp10/encoder/vp9_temporal_filter.h b/vp10/encoder/temporal_filter.h
similarity index 100%
rename from vp10/encoder/vp9_temporal_filter.h
rename to vp10/encoder/temporal_filter.h

diff --git a/vp10/encoder/vp9_tokenize.c b/vp10/encoder/tokenize.c
similarity index 99%
rename from vp10/encoder/vp9_tokenize.c
rename to vp10/encoder/tokenize.c
index eb3c74ff3b03c78b785237e08460fcc4c46102d8..2df9c46a36e5f0361243694e61ff61215bed4830 100644 (file)
--- a/vp10/encoder/vp9_tokenize.c
+++ b/vp10/encoder/tokenize.c
@@ -15,14 +15,14 @@
 
 #include "vpx_mem/vpx_mem.h"
 
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_scan.h"
-#include "vp10/common/vp9_seg_common.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/scan.h"
+#include "vp10/common/seg_common.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/tokenize.h"
 
 static const TOKENVALUE dct_cat_lt_10_value_tokens[] = {
   {9, 63}, {9, 61}, {9, 59}, {9, 57}, {9, 55}, {9, 53}, {9, 51}, {9, 49},

diff --git a/vp10/encoder/vp9_tokenize.h b/vp10/encoder/tokenize.h
similarity index 96%
rename from vp10/encoder/vp9_tokenize.h
rename to vp10/encoder/tokenize.h
index 82544b473746e87bef31f9fdb7a9b6e321121043..1e8df82a5dbaa8923d0b541e05a2827519364f5d 100644 (file)
--- a/vp10/encoder/vp9_tokenize.h
+++ b/vp10/encoder/tokenize.h
@@ -11,10 +11,10 @@
 #ifndef VP9_ENCODER_VP9_TOKENIZE_H_
 #define VP9_ENCODER_VP9_TOKENIZE_H_
 
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/entropy.h"
 
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_treewriter.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/treewriter.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/encoder/vp9_treewriter.c b/vp10/encoder/treewriter.c
similarity index 97%
rename from vp10/encoder/vp9_treewriter.c
rename to vp10/encoder/treewriter.c
index 025d7225ae8f3d49205743926d22a298faea5d5f..1f42f32a11e6f15911c08357f12213393d6bc774 100644 (file)
--- a/vp10/encoder/vp9_treewriter.c
+++ b/vp10/encoder/treewriter.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vp10/encoder/vp9_treewriter.h"
+#include "vp10/encoder/treewriter.h"
 
 static void tree2tok(struct vp10_token *tokens, const vpx_tree_index *tree,
                      int i, int v, int l) {

diff --git a/vp10/encoder/vp9_treewriter.h b/vp10/encoder/treewriter.h
similarity index 100%
rename from vp10/encoder/vp9_treewriter.h
rename to vp10/encoder/treewriter.h

diff --git a/vp10/encoder/x86/vp9_avg_intrin_sse2.c b/vp10/encoder/x86/avg_intrin_sse2.c
similarity index 100%
rename from vp10/encoder/x86/vp9_avg_intrin_sse2.c
rename to vp10/encoder/x86/avg_intrin_sse2.c

diff --git a/vp10/encoder/x86/vp9_dct_mmx.asm b/vp10/encoder/x86/dct_mmx.asm
similarity index 100%
rename from vp10/encoder/x86/vp9_dct_mmx.asm
rename to vp10/encoder/x86/dct_mmx.asm

diff --git a/vp10/encoder/x86/vp9_dct_sse2.c b/vp10/encoder/x86/dct_sse2.c
similarity index 100%
rename from vp10/encoder/x86/vp9_dct_sse2.c
rename to vp10/encoder/x86/dct_sse2.c

diff --git a/vp10/encoder/x86/vp9_dct_ssse3.c b/vp10/encoder/x86/dct_ssse3.c
similarity index 100%
rename from vp10/encoder/x86/vp9_dct_ssse3.c
rename to vp10/encoder/x86/dct_ssse3.c

diff --git a/vp10/encoder/x86/vp9_dct_ssse3_x86_64.asm b/vp10/encoder/x86/dct_ssse3_x86_64.asm
similarity index 100%
rename from vp10/encoder/x86/vp9_dct_ssse3_x86_64.asm
rename to vp10/encoder/x86/dct_ssse3_x86_64.asm

diff --git a/vp10/encoder/x86/vp9_denoiser_sse2.c b/vp10/encoder/x86/denoiser_sse2.c
similarity index 99%
rename from vp10/encoder/x86/vp9_denoiser_sse2.c
rename to vp10/encoder/x86/denoiser_sse2.c
index 723681c40e89c4d37efd866a96c77950e2148f4a..047974ef808680bad7f453fada7e28491c630a7f 100644 (file)
--- a/vp10/encoder/x86/vp9_denoiser_sse2.c
+++ b/vp10/encoder/x86/denoiser_sse2.c
@@ -15,9 +15,9 @@
 
 #include "vpx_ports/emmintrin_compat.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"
 #include "vpx_mem/vpx_mem.h"
 
 // Compute the sum of all pixel differences of this MB.

diff --git a/vp10/encoder/x86/vp9_error_intrin_avx2.c b/vp10/encoder/x86/error_intrin_avx2.c
similarity index 100%
rename from vp10/encoder/x86/vp9_error_intrin_avx2.c
rename to vp10/encoder/x86/error_intrin_avx2.c

diff --git a/vp10/encoder/x86/vp9_error_sse2.asm b/vp10/encoder/x86/error_sse2.asm
similarity index 100%
rename from vp10/encoder/x86/vp9_error_sse2.asm
rename to vp10/encoder/x86/error_sse2.asm

diff --git a/vp10/encoder/x86/vp9_highbd_block_error_intrin_sse2.c b/vp10/encoder/x86/highbd_block_error_intrin_sse2.c
similarity index 98%
rename from vp10/encoder/x86/vp9_highbd_block_error_intrin_sse2.c
rename to vp10/encoder/x86/highbd_block_error_intrin_sse2.c
index f57fefc4066d01fa469d2b260635a7e75e5c38d2..6b4cf50994cadde4c61bc6bdaf2fc06339b85e73 100644 (file)
--- a/vp10/encoder/x86/vp9_highbd_block_error_intrin_sse2.c
+++ b/vp10/encoder/x86/highbd_block_error_intrin_sse2.c
@@ -11,7 +11,7 @@
 #include <emmintrin.h>
 #include <stdio.h>
 
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
 
 int64_t vp10_highbd_block_error_sse2(tran_low_t *coeff, tran_low_t *dqcoeff,
                                     intptr_t block_size, int64_t *ssz,

diff --git a/vp10/encoder/x86/vp9_quantize_sse2.c b/vp10/encoder/x86/quantize_sse2.c
similarity index 100%
rename from vp10/encoder/x86/vp9_quantize_sse2.c
rename to vp10/encoder/x86/quantize_sse2.c

diff --git a/vp10/encoder/x86/vp9_quantize_ssse3_x86_64.asm b/vp10/encoder/x86/quantize_ssse3_x86_64.asm
similarity index 100%
rename from vp10/encoder/x86/vp9_quantize_ssse3_x86_64.asm
rename to vp10/encoder/x86/quantize_ssse3_x86_64.asm

diff --git a/vp10/encoder/x86/vp9_ssim_opt_x86_64.asm b/vp10/encoder/x86/ssim_opt_x86_64.asm
similarity index 100%
rename from vp10/encoder/x86/vp9_ssim_opt_x86_64.asm
rename to vp10/encoder/x86/ssim_opt_x86_64.asm

diff --git a/vp10/encoder/x86/vp9_temporal_filter_apply_sse2.asm b/vp10/encoder/x86/temporal_filter_apply_sse2.asm
similarity index 100%
rename from vp10/encoder/x86/vp9_temporal_filter_apply_sse2.asm
rename to vp10/encoder/x86/temporal_filter_apply_sse2.asm

diff --git a/vp10/vp10_common.mk b/vp10/vp10_common.mk
index 587e1750c53b77197028a9d7143b0dc8f957d7b8..c0f5ae98a40b855e594c8766e31a62f9d3bc65a8 100644 (file)
--- a/vp10/vp10_common.mk
+++ b/vp10/vp10_common.mk
@@ -10,87 +10,87 @@
 
 VP10_COMMON_SRCS-yes += vp10_common.mk
 VP10_COMMON_SRCS-yes += vp10_iface_common.h
-VP10_COMMON_SRCS-yes += common/vp9_ppflags.h
-VP10_COMMON_SRCS-yes += common/vp9_alloccommon.c
-VP10_COMMON_SRCS-yes += common/vp9_blockd.c
-VP10_COMMON_SRCS-yes += common/vp9_debugmodes.c
-VP10_COMMON_SRCS-yes += common/vp9_entropy.c
-VP10_COMMON_SRCS-yes += common/vp9_entropymode.c
-VP10_COMMON_SRCS-yes += common/vp9_entropymv.c
-VP10_COMMON_SRCS-yes += common/vp9_frame_buffers.c
-VP10_COMMON_SRCS-yes += common/vp9_frame_buffers.h
-VP10_COMMON_SRCS-yes += common/vp9_idct.c
-VP10_COMMON_SRCS-yes += common/vp9_alloccommon.h
-VP10_COMMON_SRCS-yes += common/vp9_blockd.h
-VP10_COMMON_SRCS-yes += common/vp9_common.h
-VP10_COMMON_SRCS-yes += common/vp9_entropy.h
-VP10_COMMON_SRCS-yes += common/vp9_entropymode.h
-VP10_COMMON_SRCS-yes += common/vp9_entropymv.h
-VP10_COMMON_SRCS-yes += common/vp9_enums.h
-VP10_COMMON_SRCS-yes += common/vp9_filter.h
-VP10_COMMON_SRCS-yes += common/vp9_filter.c
-VP10_COMMON_SRCS-yes += common/vp9_idct.h
-VP10_COMMON_SRCS-yes += common/vp9_loopfilter.h
-VP10_COMMON_SRCS-yes += common/vp9_thread_common.h
-VP10_COMMON_SRCS-yes += common/vp9_mv.h
-VP10_COMMON_SRCS-yes += common/vp9_onyxc_int.h
-VP10_COMMON_SRCS-yes += common/vp9_pred_common.h
-VP10_COMMON_SRCS-yes += common/vp9_pred_common.c
-VP10_COMMON_SRCS-yes += common/vp9_quant_common.h
-VP10_COMMON_SRCS-yes += common/vp9_reconinter.h
-VP10_COMMON_SRCS-yes += common/vp9_reconintra.h
+VP10_COMMON_SRCS-yes += common/ppflags.h
+VP10_COMMON_SRCS-yes += common/alloccommon.c
+VP10_COMMON_SRCS-yes += common/blockd.c
+VP10_COMMON_SRCS-yes += common/debugmodes.c
+VP10_COMMON_SRCS-yes += common/entropy.c
+VP10_COMMON_SRCS-yes += common/entropymode.c
+VP10_COMMON_SRCS-yes += common/entropymv.c
+VP10_COMMON_SRCS-yes += common/frame_buffers.c
+VP10_COMMON_SRCS-yes += common/frame_buffers.h
+VP10_COMMON_SRCS-yes += common/idct.c
+VP10_COMMON_SRCS-yes += common/alloccommon.h
+VP10_COMMON_SRCS-yes += common/blockd.h
+VP10_COMMON_SRCS-yes += common/common.h
+VP10_COMMON_SRCS-yes += common/entropy.h
+VP10_COMMON_SRCS-yes += common/entropymode.h
+VP10_COMMON_SRCS-yes += common/entropymv.h
+VP10_COMMON_SRCS-yes += common/enums.h
+VP10_COMMON_SRCS-yes += common/filter.h
+VP10_COMMON_SRCS-yes += common/filter.c
+VP10_COMMON_SRCS-yes += common/idct.h
+VP10_COMMON_SRCS-yes += common/loopfilter.h
+VP10_COMMON_SRCS-yes += common/thread_common.h
+VP10_COMMON_SRCS-yes += common/mv.h
+VP10_COMMON_SRCS-yes += common/onyxc_int.h
+VP10_COMMON_SRCS-yes += common/pred_common.h
+VP10_COMMON_SRCS-yes += common/pred_common.c
+VP10_COMMON_SRCS-yes += common/quant_common.h
+VP10_COMMON_SRCS-yes += common/reconinter.h
+VP10_COMMON_SRCS-yes += common/reconintra.h
 VP10_COMMON_SRCS-yes += common/vp10_rtcd.c
 VP10_COMMON_SRCS-yes += common/vp10_rtcd_defs.pl
-VP10_COMMON_SRCS-yes += common/vp9_scale.h
-VP10_COMMON_SRCS-yes += common/vp9_scale.c
-VP10_COMMON_SRCS-yes += common/vp9_seg_common.h
-VP10_COMMON_SRCS-yes += common/vp9_seg_common.c
-VP10_COMMON_SRCS-yes += common/vp9_systemdependent.h
-VP10_COMMON_SRCS-yes += common/vp9_textblit.h
-VP10_COMMON_SRCS-yes += common/vp9_tile_common.h
-VP10_COMMON_SRCS-yes += common/vp9_tile_common.c
-VP10_COMMON_SRCS-yes += common/vp9_loopfilter.c
-VP10_COMMON_SRCS-yes += common/vp9_thread_common.c
-VP10_COMMON_SRCS-yes += common/vp9_mvref_common.c
-VP10_COMMON_SRCS-yes += common/vp9_mvref_common.h
-VP10_COMMON_SRCS-yes += common/vp9_quant_common.c
-VP10_COMMON_SRCS-yes += common/vp9_reconinter.c
-VP10_COMMON_SRCS-yes += common/vp9_reconintra.c
-VP10_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/vp9_textblit.c
-VP10_COMMON_SRCS-yes += common/vp9_common_data.c
-VP10_COMMON_SRCS-yes += common/vp9_common_data.h
-VP10_COMMON_SRCS-yes += common/vp9_scan.c
-VP10_COMMON_SRCS-yes += common/vp9_scan.h
+VP10_COMMON_SRCS-yes += common/scale.h
+VP10_COMMON_SRCS-yes += common/scale.c
+VP10_COMMON_SRCS-yes += common/seg_common.h
+VP10_COMMON_SRCS-yes += common/seg_common.c
+VP10_COMMON_SRCS-yes += common/systemdependent.h
+VP10_COMMON_SRCS-yes += common/textblit.h
+VP10_COMMON_SRCS-yes += common/tile_common.h
+VP10_COMMON_SRCS-yes += common/tile_common.c
+VP10_COMMON_SRCS-yes += common/loopfilter.c
+VP10_COMMON_SRCS-yes += common/thread_common.c
+VP10_COMMON_SRCS-yes += common/mvref_common.c
+VP10_COMMON_SRCS-yes += common/mvref_common.h
+VP10_COMMON_SRCS-yes += common/quant_common.c
+VP10_COMMON_SRCS-yes += common/reconinter.c
+VP10_COMMON_SRCS-yes += common/reconintra.c
+VP10_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/textblit.c
+VP10_COMMON_SRCS-yes += common/common_data.c
+VP10_COMMON_SRCS-yes += common/common_data.h
+VP10_COMMON_SRCS-yes += common/scan.c
+VP10_COMMON_SRCS-yes += common/scan.h
 
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_postproc.h
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_postproc.c
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_mfqe.h
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_mfqe.c
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/postproc.h
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/postproc.c
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/mfqe.h
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/mfqe.c
 ifeq ($(CONFIG_VP9_POSTPROC),yes)
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_mfqe_sse2.asm
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_postproc_sse2.asm
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/mfqe_sse2.asm
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm
 endif
 
 ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_itrans4_dspr2.c
-VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_itrans8_dspr2.c
-VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/vp9_itrans16_dspr2.c
+VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/itrans4_dspr2.c
+VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/itrans8_dspr2.c
+VP10_COMMON_SRCS-$(HAVE_DSPR2)  += common/mips/dspr2/itrans16_dspr2.c
 endif
 
 # common (msa)
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_idct4x4_msa.c
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_idct8x8_msa.c
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_idct16x16_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct4x4_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct8x8_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct16x16_msa.c
 
 ifeq ($(CONFIG_VP9_POSTPROC),yes)
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_mfqe_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/mfqe_msa.c
 endif
 
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_idct_intrin_sse2.c
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idct_intrin_sse2.c
 
 ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_iht4x4_add_neon.c
-VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_iht8x8_add_neon.c
+VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/iht4x4_add_neon.c
+VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/iht8x8_add_neon.c
 endif
 
 $(eval $(call rtcd_h_template,vp10_rtcd,vp10/common/vp10_rtcd_defs.pl))

diff --git a/vp10/vp10_cx_iface.c b/vp10/vp10_cx_iface.c
index 3709c1a639b4d539e0ecda87a31eec4e4dbefd04..b3557574a6308457877c5cae4572f86f996948fc 100644 (file)
--- a/vp10/vp10_cx_iface.c
+++ b/vp10/vp10_cx_iface.c
@@ -16,9 +16,9 @@
 #include "vpx_ports/vpx_once.h"
 #include "vpx/internal/vpx_codec_internal.h"
 #include "./vpx_version.h"
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
 #include "vpx/vp8cx.h"
-#include "vp10/encoder/vp9_firstpass.h"
+#include "vp10/encoder/firstpass.h"
 #include "vp10/vp10_iface_common.h"
 
 struct vp10_extracfg {

diff --git a/vp10/vp10_dx_iface.c b/vp10/vp10_dx_iface.c
index ec439429a5328e9db7a8cd4ed26b8eed4d7048b3..9be2bf705fd0d18264c4803965f8280fb382d88b 100644 (file)
--- a/vp10/vp10_dx_iface.c
+++ b/vp10/vp10_dx_iface.c
@@ -20,11 +20,11 @@
 #include "vpx_dsp/bitreader_buffer.h"
 #include "vpx_util/vpx_thread.h"
 
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_frame_buffers.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/frame_buffers.h"
 
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/decoder/vp9_decodeframe.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/decoder/decodeframe.h"
 
 #include "vp10/vp10_iface_common.h"
 

diff --git a/vp10/vp10cx.mk b/vp10/vp10cx.mk
index 84b6cd35966dc6513153e9cac0632ae1a67df8b7..d6846b2574f435370b4348c141b3388065ec8bdd 100644 (file)
--- a/vp10/vp10cx.mk
+++ b/vp10/vp10cx.mk
@@ -17,126 +17,126 @@ VP10_CX_SRCS_REMOVE-no  += $(VP10_COMMON_SRCS_REMOVE-no)
 
 VP10_CX_SRCS-yes += vp10_cx_iface.c
 
-VP10_CX_SRCS-yes += encoder/vp9_avg.c
-VP10_CX_SRCS-yes += encoder/vp9_bitstream.c
-VP10_CX_SRCS-yes += encoder/vp9_context_tree.c
-VP10_CX_SRCS-yes += encoder/vp9_context_tree.h
-VP10_CX_SRCS-yes += encoder/vp9_cost.h
-VP10_CX_SRCS-yes += encoder/vp9_cost.c
-VP10_CX_SRCS-yes += encoder/vp9_dct.c
-VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.c
-VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.h
-VP10_CX_SRCS-yes += encoder/vp9_encodeframe.c
-VP10_CX_SRCS-yes += encoder/vp9_encodeframe.h
-VP10_CX_SRCS-yes += encoder/vp9_encodemb.c
-VP10_CX_SRCS-yes += encoder/vp9_encodemv.c
-VP10_CX_SRCS-yes += encoder/vp9_ethread.h
-VP10_CX_SRCS-yes += encoder/vp9_ethread.c
-VP10_CX_SRCS-yes += encoder/vp9_extend.c
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_fastssim.c
-VP10_CX_SRCS-yes += encoder/vp9_firstpass.c
-VP10_CX_SRCS-yes += encoder/vp9_block.h
-VP10_CX_SRCS-yes += encoder/vp9_bitstream.h
-VP10_CX_SRCS-yes += encoder/vp9_encodemb.h
-VP10_CX_SRCS-yes += encoder/vp9_encodemv.h
-VP10_CX_SRCS-yes += encoder/vp9_extend.h
-VP10_CX_SRCS-yes += encoder/vp9_firstpass.h
-VP10_CX_SRCS-yes += encoder/vp9_lookahead.c
-VP10_CX_SRCS-yes += encoder/vp9_lookahead.h
-VP10_CX_SRCS-yes += encoder/vp9_mcomp.h
-VP10_CX_SRCS-yes += encoder/vp9_encoder.h
-VP10_CX_SRCS-yes += encoder/vp9_quantize.h
-VP10_CX_SRCS-yes += encoder/vp9_ratectrl.h
-VP10_CX_SRCS-yes += encoder/vp9_rd.h
-VP10_CX_SRCS-yes += encoder/vp9_rdopt.h
-VP10_CX_SRCS-yes += encoder/vp9_pickmode.h
-VP10_CX_SRCS-yes += encoder/vp9_svc_layercontext.h
-VP10_CX_SRCS-yes += encoder/vp9_tokenize.h
-VP10_CX_SRCS-yes += encoder/vp9_treewriter.h
-VP10_CX_SRCS-yes += encoder/vp9_mcomp.c
-VP10_CX_SRCS-yes += encoder/vp9_encoder.c
-VP10_CX_SRCS-yes += encoder/vp9_picklpf.c
-VP10_CX_SRCS-yes += encoder/vp9_picklpf.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_psnrhvs.c
-VP10_CX_SRCS-yes += encoder/vp9_quantize.c
-VP10_CX_SRCS-yes += encoder/vp9_ratectrl.c
-VP10_CX_SRCS-yes += encoder/vp9_rd.c
-VP10_CX_SRCS-yes += encoder/vp9_rdopt.c
-VP10_CX_SRCS-yes += encoder/vp9_pickmode.c
-VP10_CX_SRCS-yes += encoder/vp9_segmentation.c
-VP10_CX_SRCS-yes += encoder/vp9_segmentation.h
-VP10_CX_SRCS-yes += encoder/vp9_speed_features.c
-VP10_CX_SRCS-yes += encoder/vp9_speed_features.h
-VP10_CX_SRCS-yes += encoder/vp9_subexp.c
-VP10_CX_SRCS-yes += encoder/vp9_subexp.h
-VP10_CX_SRCS-yes += encoder/vp9_svc_layercontext.c
-VP10_CX_SRCS-yes += encoder/vp9_resize.c
-VP10_CX_SRCS-yes += encoder/vp9_resize.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.c
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_blockiness.c
+VP10_CX_SRCS-yes += encoder/avg.c
+VP10_CX_SRCS-yes += encoder/bitstream.c
+VP10_CX_SRCS-yes += encoder/context_tree.c
+VP10_CX_SRCS-yes += encoder/context_tree.h
+VP10_CX_SRCS-yes += encoder/cost.h
+VP10_CX_SRCS-yes += encoder/cost.c
+VP10_CX_SRCS-yes += encoder/dct.c
+VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/denoiser.c
+VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/denoiser.h
+VP10_CX_SRCS-yes += encoder/encodeframe.c
+VP10_CX_SRCS-yes += encoder/encodeframe.h
+VP10_CX_SRCS-yes += encoder/encodemb.c
+VP10_CX_SRCS-yes += encoder/encodemv.c
+VP10_CX_SRCS-yes += encoder/ethread.h
+VP10_CX_SRCS-yes += encoder/ethread.c
+VP10_CX_SRCS-yes += encoder/extend.c
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/fastssim.c
+VP10_CX_SRCS-yes += encoder/firstpass.c
+VP10_CX_SRCS-yes += encoder/block.h
+VP10_CX_SRCS-yes += encoder/bitstream.h
+VP10_CX_SRCS-yes += encoder/encodemb.h
+VP10_CX_SRCS-yes += encoder/encodemv.h
+VP10_CX_SRCS-yes += encoder/extend.h
+VP10_CX_SRCS-yes += encoder/firstpass.h
+VP10_CX_SRCS-yes += encoder/lookahead.c
+VP10_CX_SRCS-yes += encoder/lookahead.h
+VP10_CX_SRCS-yes += encoder/mcomp.h
+VP10_CX_SRCS-yes += encoder/encoder.h
+VP10_CX_SRCS-yes += encoder/quantize.h
+VP10_CX_SRCS-yes += encoder/ratectrl.h
+VP10_CX_SRCS-yes += encoder/rd.h
+VP10_CX_SRCS-yes += encoder/rdopt.h
+VP10_CX_SRCS-yes += encoder/pickmode.h
+VP10_CX_SRCS-yes += encoder/svc_layercontext.h
+VP10_CX_SRCS-yes += encoder/tokenize.h
+VP10_CX_SRCS-yes += encoder/treewriter.h
+VP10_CX_SRCS-yes += encoder/mcomp.c
+VP10_CX_SRCS-yes += encoder/encoder.c
+VP10_CX_SRCS-yes += encoder/picklpf.c
+VP10_CX_SRCS-yes += encoder/picklpf.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/psnrhvs.c
+VP10_CX_SRCS-yes += encoder/quantize.c
+VP10_CX_SRCS-yes += encoder/ratectrl.c
+VP10_CX_SRCS-yes += encoder/rd.c
+VP10_CX_SRCS-yes += encoder/rdopt.c
+VP10_CX_SRCS-yes += encoder/pickmode.c
+VP10_CX_SRCS-yes += encoder/segmentation.c
+VP10_CX_SRCS-yes += encoder/segmentation.h
+VP10_CX_SRCS-yes += encoder/speed_features.c
+VP10_CX_SRCS-yes += encoder/speed_features.h
+VP10_CX_SRCS-yes += encoder/subexp.c
+VP10_CX_SRCS-yes += encoder/subexp.h
+VP10_CX_SRCS-yes += encoder/svc_layercontext.c
+VP10_CX_SRCS-yes += encoder/resize.c
+VP10_CX_SRCS-yes += encoder/resize.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/blockiness.c
 
-VP10_CX_SRCS-yes += encoder/vp9_tokenize.c
-VP10_CX_SRCS-yes += encoder/vp9_treewriter.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_variance.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_variance.h
-VP10_CX_SRCS-yes += encoder/vp9_aq_cyclicrefresh.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_cyclicrefresh.h
-VP10_CX_SRCS-yes += encoder/vp9_aq_complexity.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_complexity.h
-VP10_CX_SRCS-yes += encoder/vp9_skin_detection.c
-VP10_CX_SRCS-yes += encoder/vp9_skin_detection.h
+VP10_CX_SRCS-yes += encoder/tokenize.c
+VP10_CX_SRCS-yes += encoder/treewriter.c
+VP10_CX_SRCS-yes += encoder/aq_variance.c
+VP10_CX_SRCS-yes += encoder/aq_variance.h
+VP10_CX_SRCS-yes += encoder/aq_cyclicrefresh.c
+VP10_CX_SRCS-yes += encoder/aq_cyclicrefresh.h
+VP10_CX_SRCS-yes += encoder/aq_complexity.c
+VP10_CX_SRCS-yes += encoder/aq_complexity.h
+VP10_CX_SRCS-yes += encoder/skin_detection.c
+VP10_CX_SRCS-yes += encoder/skin_detection.h
 ifeq ($(CONFIG_VP9_POSTPROC),yes)
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.c
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c
 endif
-VP10_CX_SRCS-yes += encoder/vp9_temporal_filter.c
-VP10_CX_SRCS-yes += encoder/vp9_temporal_filter.h
-VP10_CX_SRCS-yes += encoder/vp9_mbgraph.c
-VP10_CX_SRCS-yes += encoder/vp9_mbgraph.h
+VP10_CX_SRCS-yes += encoder/temporal_filter.c
+VP10_CX_SRCS-yes += encoder/temporal_filter.h
+VP10_CX_SRCS-yes += encoder/mbgraph.c
+VP10_CX_SRCS-yes += encoder/mbgraph.h
 
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_avg_intrin_sse2.c
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_quantize_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/avg_intrin_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.c
 ifeq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_highbd_block_error_intrin_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/highbd_block_error_intrin_sse2.c
 endif
 
 ifeq ($(CONFIG_USE_X86INC),yes)
-VP10_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_dct_mmx.asm
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm
+VP10_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/error_sse2.asm
 endif
 
 ifeq ($(ARCH_X86_64),yes)
 ifeq ($(CONFIG_USE_X86INC),yes)
-VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3_x86_64.asm
-VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3_x86_64.asm
+VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3_x86_64.asm
+VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/dct_ssse3_x86_64.asm
 endif
 endif
-VP10_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt_x86_64.asm
+VP10_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt_x86_64.asm
 
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c
-VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.c
+VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/dct_ssse3.c
 
 ifeq ($(CONFIG_VP9_TEMPORAL_DENOISING),yes)
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_denoiser_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/denoiser_sse2.c
 endif
 
-VP10_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_error_intrin_avx2.c
+VP10_CX_SRCS-$(HAVE_AVX2) += encoder/x86/error_intrin_avx2.c
 
 ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_dct_neon.c
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_error_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/dct_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/error_neon.c
 endif
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_avg_neon.c
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_quantize_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/avg_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/quantize_neon.c
 
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_avg_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_error_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct4x4_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct8x8_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct16x16_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct_msa.h
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_temporal_filter_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/avg_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/error_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct4x4_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct8x8_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct16x16_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct_msa.h
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/temporal_filter_msa.c
 
 VP10_CX_SRCS-yes := $(filter-out $(VP10_CX_SRCS_REMOVE-yes),$(VP10_CX_SRCS-yes))

diff --git a/vp10/vp10dx.mk b/vp10/vp10dx.mk
index e24f2ca79cf1576d9d604ce5b54b21729188a023..fce6d0d7d74552e32d59150a5333e5d36c93adc8 100644 (file)
--- a/vp10/vp10dx.mk
+++ b/vp10/vp10dx.mk
@@ -17,17 +17,17 @@ VP10_DX_SRCS_REMOVE-no  += $(VP10_COMMON_SRCS_REMOVE-no)
 
 VP10_DX_SRCS-yes += vp10_dx_iface.c
 
-VP10_DX_SRCS-yes += decoder/vp9_decodemv.c
-VP10_DX_SRCS-yes += decoder/vp9_decodeframe.c
-VP10_DX_SRCS-yes += decoder/vp9_decodeframe.h
-VP10_DX_SRCS-yes += decoder/vp9_detokenize.c
-VP10_DX_SRCS-yes += decoder/vp9_decodemv.h
-VP10_DX_SRCS-yes += decoder/vp9_detokenize.h
-VP10_DX_SRCS-yes += decoder/vp9_dthread.c
-VP10_DX_SRCS-yes += decoder/vp9_dthread.h
-VP10_DX_SRCS-yes += decoder/vp9_decoder.c
-VP10_DX_SRCS-yes += decoder/vp9_decoder.h
-VP10_DX_SRCS-yes += decoder/vp9_dsubexp.c
-VP10_DX_SRCS-yes += decoder/vp9_dsubexp.h
+VP10_DX_SRCS-yes += decoder/decodemv.c
+VP10_DX_SRCS-yes += decoder/decodeframe.c
+VP10_DX_SRCS-yes += decoder/decodeframe.h
+VP10_DX_SRCS-yes += decoder/detokenize.c
+VP10_DX_SRCS-yes += decoder/decodemv.h
+VP10_DX_SRCS-yes += decoder/detokenize.h
+VP10_DX_SRCS-yes += decoder/dthread.c
+VP10_DX_SRCS-yes += decoder/dthread.h
+VP10_DX_SRCS-yes += decoder/decoder.c
+VP10_DX_SRCS-yes += decoder/decoder.h
+VP10_DX_SRCS-yes += decoder/dsubexp.c
+VP10_DX_SRCS-yes += decoder/dsubexp.h
 
 VP10_DX_SRCS-yes := $(filter-out $(VP10_DX_SRCS_REMOVE-yes),$(VP10_DX_SRCS-yes))