Remove vp9_ prefix from vp10 files Remove the vp9_ prefix from vp10 file names. Change-Id: I513a211b286a57d6126fc1b0fbfd6405120014f1
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 ae9dd86..35ead95 100644 --- 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 43a0fbf..9048da6 100644 --- 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 93ca00b..dcf2ca3 100644 --- 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 98% rename from vp10/encoder/vp9_aq_cyclicrefresh.h rename to vp10/encoder/aq_cyclicrefresh.h index a020f05..3eb6462 100644 --- 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 f8e18ce..b88a3fb 100644 --- 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 001e7b4..199493e 100644 --- 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 c911782..b37a2ff 100644 --- 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 a7dce37..9354ced 100644 --- 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 39e9762..738c427 100644 --- 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 fb2201c..43fa235 100644 --- 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/common/entropy.h" +#include "vp10/common/entropymode.h" +#include "vp10/common/entropymv.h" +#include "vp10/common/mvref_common.h" +#include "vp10/common/pred_common.h" +#include "vp10/common/seg_common.h" +#include "vp10/common/systemdependent.h" +#include "vp10/common/tile_common.h" -#include "vp10/encoder/vp9_cost.h" -#include "vp10/encoder/vp9_bitstream.h" -#include "vp10/encoder/vp9_encodemv.h" -#include "vp10/encoder/vp9_mcomp.h" -#include "vp10/encoder/vp9_segmentation.h" -#include "vp10/encoder/vp9_subexp.h" -#include "vp10/encoder/vp9_tokenize.h" +#include "vp10/encoder/cost.h" +#include "vp10/encoder/bitstream.h" +#include "vp10/encoder/encodemv.h" +#include "vp10/encoder/mcomp.h" +#include "vp10/encoder/segmentation.h" +#include "vp10/encoder/subexp.h" +#include "vp10/encoder/tokenize.h" static const struct vp10_token intra_mode_encodings[INTRA_MODES] = { {0, 1}, {6, 3}, {28, 5}, {30, 5}, {58, 6}, {59, 6}, {126, 7}, {127, 7},
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 3d73a6e..d235c32 100644 --- 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 97% rename from vp10/encoder/vp9_block.h rename to vp10/encoder/block.h index 869416d..423c4d7 100644 --- 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 8312abf..da44348 100644 --- 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 7d623ee..11a7bb3 100644 --- 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 9963ed2..fd65870 100644 --- 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 8af22e5..aab8263 100644 --- 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 810e422..0581b14 100644 --- 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 dfc0e47..4a79b11 100644 --- 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 0016ead..e543fb0 100644 --- 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 dd16d34..bf496ff 100644 --- 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/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/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/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 be4ed6c..105fac1 100644 --- 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/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/vp9_encodemb.h" -#include "vp10/encoder/vp9_rd.h" -#include "vp10/encoder/vp9_tokenize.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 776b5f4..7914d6f 100644 --- 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 4a1e990..90a9857 100644 --- 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 052f4a7..3ac4572 100644 --- 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 a4afca1..358cd5a 100644 --- 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/common/reconinter.h" +#include "vp10/common/reconintra.h" +#include "vp10/common/systemdependent.h" +#include "vp10/common/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/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 3e62aa0..53d9303 100644 --- 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/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/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/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 6a752be..322bd5a 100644 --- 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 98% rename from vp10/encoder/vp9_extend.c rename to vp10/encoder/extend.c index d42998d..2ffbac0 100644 --- 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 d5a1e59..1262502 100644 --- 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 e3caa5a..6f95eea 100644 --- 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 e50a352..17b930a 100644 --- 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 1922a35..5a76336 100644 --- 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 f7f1f01..f676dd7 100644 --- 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 6e22d8f..0daa0ee 100644 --- 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 5af4ab0..3fe9f6c 100644 --- 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 c031ab6..d78fc64 100644 --- 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 e06bf72..37269f0 100644 --- 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 cf89daa..4283eb9 100644 --- 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 b03437c..f5139b0 100644 --- 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 500fd68..ad45f7c 100644 --- 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 1dcb1e7..61dc936 100644 --- 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/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/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/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 96% rename from vp10/encoder/vp9_pickmode.h rename to vp10/encoder/pickmode.h index 5ee56b1..b15127d 100644 --- 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 828171c..c91cbc1 100644 --- 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 35ff809..4c99e53 100644 --- 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 fc7b64e..462b155 100644 --- 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 02f6f24..a69504e 100644 --- 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/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/vp9_encodemv.h" -#include "vp10/encoder/vp9_ratectrl.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 e18d199..28a3d51 100644 --- 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 f8f7e12..74a63f9 100644 --- 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/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/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/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 2132db3..8f2d20b 100644 --- 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 284a9d2..343d6f2 100644 --- 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/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/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/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 8c1e869..8047b93 100644 --- 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 9403700..5e17532 100644 --- 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 22006d3..86a9702 100644 --- 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 056a9f4..85e4fe6 100644 --- 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 f988cb9..e37ea26 100644 --- 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 e30437b..acfc8f1 100644 --- 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 aaff47f..b428e31 100644 --- 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 d0b1210..32e8a5d 100644 --- 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 3fb77ca..0219621 100644 --- 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 41117bb..fd0b09b 100644 --- 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 616202d..321ae83 100644 --- 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 9564de6..41cb9e6 100644 --- 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 1e5bdf6..82e7854 100644 --- 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 eb3c74f..2df9c46 100644 --- 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/common/entropy.h" +#include "vp10/common/pred_common.h" +#include "vp10/common/scan.h" +#include "vp10/common/seg_common.h" -#include "vp10/encoder/vp9_cost.h" -#include "vp10/encoder/vp9_encoder.h" -#include "vp10/encoder/vp9_tokenize.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 82544b4..1e8df82 100644 --- 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 025d722..1f42f32 100644 --- 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 723681c..047974e 100644 --- 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 f57fefc..6b4cf50 100644 --- 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