rename files vp10_* to av1_*

Change-Id: I017e3b64d5074ad47fed8cd642fdf366bd475b1b

av1/vp10_common.mk → av1/av1_common.mk

@@ -8,8 +8,8 @@
 ##  be found in the AUTHORS file in the root of the source tree.
 ##
 
-VP10_COMMON_SRCS-yes += vp10_common.mk
-VP10_COMMON_SRCS-yes += vp10_iface_common.h
+VP10_COMMON_SRCS-yes += av1_common.mk
+VP10_COMMON_SRCS-yes += av1_iface_common.h
 VP10_COMMON_SRCS-yes += common/alloccommon.c
 VP10_COMMON_SRCS-yes += common/blockd.c
 VP10_COMMON_SRCS-yes += common/debugmodes.c
@@ -29,8 +29,8 @@ 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/idct.c
-VP10_COMMON_SRCS-yes += common/vp10_inv_txfm.h
-VP10_COMMON_SRCS-yes += common/vp10_inv_txfm.c
+VP10_COMMON_SRCS-yes += common/av1_inv_txfm.h
+VP10_COMMON_SRCS-yes += common/av1_inv_txfm.c
 VP10_COMMON_SRCS-yes += common/loopfilter.h
 VP10_COMMON_SRCS-yes += common/thread_common.h
 VP10_COMMON_SRCS-yes += common/mv.h
@@ -40,8 +40,8 @@ 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/av1_rtcd.c
+VP10_COMMON_SRCS-yes += common/av1_rtcd_defs.pl
 VP10_COMMON_SRCS-yes += common/scale.h
 VP10_COMMON_SRCS-yes += common/scale.c
 VP10_COMMON_SRCS-yes += common/seg_common.h
@@ -58,8 +58,8 @@ VP10_COMMON_SRCS-yes += common/reconintra.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-yes += common/vp10_fwd_txfm.h
-VP10_COMMON_SRCS-yes += common/vp10_fwd_txfm.c
+VP10_COMMON_SRCS-yes += common/av1_fwd_txfm.h
+VP10_COMMON_SRCS-yes += common/av1_fwd_txfm.c
 VP10_COMMON_SRCS-yes += common/clpf.c
 VP10_COMMON_SRCS-yes += common/clpf.h
 ifeq ($(CONFIG_DERING),yes)
@@ -83,16 +83,16 @@ VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct8x8_msa.c
 VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct16x16_msa.c
 
 VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idct_intrin_sse2.c
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp10_fwd_txfm_sse2.c
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp10_fwd_dct32x32_impl_sse2.h
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp10_fwd_txfm_impl_sse2.h
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/av1_fwd_txfm_sse2.c
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/av1_fwd_dct32x32_impl_sse2.h
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/av1_fwd_txfm_impl_sse2.h
 
 ifneq ($(CONFIG_VPX_HIGHBITDEPTH),yes)
 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
 
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp10_inv_txfm_sse2.c
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp10_inv_txfm_sse2.h
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/av1_inv_txfm_sse2.c
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/av1_inv_txfm_sse2.h
 
-$(eval $(call rtcd_h_template,vp10_rtcd,av1/common/vp10_rtcd_defs.pl))
+$(eval $(call rtcd_h_template,av1_rtcd,av1/common/av1_rtcd_defs.pl))

av1/vp10_cx_iface.c → av1/av1_cx_iface.c

@@ -20,7 +20,7 @@
 #include "av1/encoder/encoder.h"
 #include "aom/vp8cx.h"
 #include "av1/encoder/firstpass.h"
-#include "av1/vp10_iface_common.h"
+#include "av1/av1_iface_common.h"
 
 struct vp10_extracfg {
   int cpu_used;  // available cpu percentage in 1/16

av1/vp10_dx_iface.c → av1/av1_dx_iface.c

@@ -28,7 +28,7 @@
 #include "av1/decoder/decoder.h"
 #include "av1/decoder/decodeframe.h"
 
-#include "av1/vp10_iface_common.h"
+#include "av1/av1_iface_common.h"
 
 typedef vpx_codec_stream_info_t vp10_stream_info_t;
 

av1/common/arm/neon/iht4x4_add_neon.c

@@ -12,7 +12,7 @@
 #include <arm_neon.h>
 #include <assert.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_config.h"
 #include "av1/common/common.h"
 

av1/common/arm/neon/iht8x8_add_neon.c

@@ -12,7 +12,7 @@
 #include <arm_neon.h>
 #include <assert.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_config.h"
 #include "av1/common/common.h"
 

av1/common/vp10_fwd_txfm.c → av1/common/av1_fwd_txfm.c

@@ -9,7 +9,7 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#include "av1/common/vp10_fwd_txfm.h"
+#include "av1/common/av1_fwd_txfm.h"
 
 void vp10_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride) {
   // The 2D transform is done with two passes which are actually pretty

av1/common/vp10_inv_txfm.c → av1/common/av1_inv_txfm.c

@@ -11,7 +11,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "av1/common/vp10_inv_txfm.h"
+#include "av1/common/av1_inv_txfm.h"
 
 void vp10_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride) {
   /* 4-point reversible, orthonormal inverse Walsh-Hadamard in 3.5 adds,

av1/common/vp10_rtcd.c → av1/common/av1_rtcd.c

@@ -10,10 +10,10 @@
  */
 #include "./vpx_config.h"
 #define RTCD_C
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "aom_ports/vpx_once.h"
 
-void vp10_rtcd() {
+void av1_rtcd() {
   // TODO(JBB): Remove this once, by insuring that both the encoder and
   // decoder setup functions are protected by once();
   once(setup_rtcd_internal);

av1/common/idct.c

@@ -11,7 +11,7 @@
 
 #include <math.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "av1/common/blockd.h"
 #include "av1/common/idct.h"

av1/common/mips/dspr2/itrans16_dspr2.c

@@ -13,7 +13,7 @@
 #include <stdio.h>
 
 #include "./vpx_config.h"
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "av1/common/common.h"
 #include "av1/common/blockd.h"
 #include "av1/common/idct.h"

av1/common/mips/dspr2/itrans4_dspr2.c

@@ -13,7 +13,7 @@
 #include <stdio.h>
 
 #include "./vpx_config.h"
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "av1/common/common.h"
 #include "av1/common/blockd.h"
 #include "av1/common/idct.h"

av1/common/mips/dspr2/itrans8_dspr2.c

@@ -13,7 +13,7 @@
 #include <stdio.h>
 
 #include "./vpx_config.h"
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "av1/common/common.h"
 #include "av1/common/blockd.h"
 #include "aom_dsp/mips/inv_txfm_dspr2.h"

av1/common/onyxc_int.h

@@ -15,7 +15,7 @@
 #include "./vpx_config.h"
 #include "aom/internal/vpx_codec_internal.h"
 #include "aom_util/vpx_thread.h"
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "av1/common/alloccommon.h"
 #include "av1/common/loopfilter.h"
 #include "av1/common/entropymv.h"

av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h → av1/common/x86/av1_fwd_dct32x32_impl_sse2.h

@@ -11,8 +11,8 @@
 
 #include <emmintrin.h>  // SSE2
 
-#include "./vp10_rtcd.h"
-#include "av1/common/vp10_fwd_txfm.h"
+#include "./av1_rtcd.h"
+#include "av1/common/av1_fwd_txfm.h"
 #include "aom_dsp/txfm_common.h"
 #include "aom_dsp/x86/txfm_common_sse2.h"
 

av1/common/x86/vp10_fwd_txfm_sse2.c → av1/common/x86/av1_fwd_txfm_sse2.c

@@ -229,20 +229,20 @@ void vp10_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output,
 #define FDCT4x4_2D vp10_fdct4x4_sse2
 #define FDCT8x8_2D vp10_fdct8x8_sse2
 #define FDCT16x16_2D vp10_fdct16x16_sse2
-#include "av1/common/x86/vp10_fwd_txfm_impl_sse2.h"
+#include "av1/common/x86/av1_fwd_txfm_impl_sse2.h"
 #undef FDCT4x4_2D
 #undef FDCT8x8_2D
 #undef FDCT16x16_2D
 
 #define FDCT32x32_2D vp10_fdct32x32_rd_sse2
 #define FDCT32x32_HIGH_PRECISION 0
-#include "av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h"
+#include "av1/common/x86/av1_fwd_dct32x32_impl_sse2.h"
 #undef FDCT32x32_2D
 #undef FDCT32x32_HIGH_PRECISION
 
 #define FDCT32x32_2D vp10_fdct32x32_sse2
 #define FDCT32x32_HIGH_PRECISION 1
-#include "av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h"  // NOLINT
+#include "av1/common/x86/av1_fwd_dct32x32_impl_sse2.h"  // NOLINT
 #undef FDCT32x32_2D
 #undef FDCT32x32_HIGH_PRECISION
 #undef DCT_HIGH_BIT_DEPTH
@@ -252,20 +252,20 @@ void vp10_fdct32x32_1_sse2(const int16_t *input, tran_low_t *output,
 #define FDCT4x4_2D vp10_highbd_fdct4x4_sse2
 #define FDCT8x8_2D vp10_highbd_fdct8x8_sse2
 #define FDCT16x16_2D vp10_highbd_fdct16x16_sse2
-#include "av1/common/x86/vp10_fwd_txfm_impl_sse2.h"  // NOLINT
+#include "av1/common/x86/av1_fwd_txfm_impl_sse2.h"  // NOLINT
 #undef FDCT4x4_2D
 #undef FDCT8x8_2D
 #undef FDCT16x16_2D
 
 #define FDCT32x32_2D vp10_highbd_fdct32x32_rd_sse2
 #define FDCT32x32_HIGH_PRECISION 0
-#include "av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h"  // NOLINT
+#include "av1/common/x86/av1_fwd_dct32x32_impl_sse2.h"  // NOLINT
 #undef FDCT32x32_2D
 #undef FDCT32x32_HIGH_PRECISION
 
 #define FDCT32x32_2D vp10_highbd_fdct32x32_sse2
 #define FDCT32x32_HIGH_PRECISION 1
-#include "av1/common/x86/vp10_fwd_dct32x32_impl_sse2.h"  // NOLINT
+#include "av1/common/x86/av1_fwd_dct32x32_impl_sse2.h"  // NOLINT
 #undef FDCT32x32_2D
 #undef FDCT32x32_HIGH_PRECISION
 #undef DCT_HIGH_BIT_DEPTH

av1/common/x86/vp10_inv_txfm_sse2.c → av1/common/x86/av1_inv_txfm_sse2.c

@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#include "./vp10_rtcd.h"
-#include "av1/common/x86/vp10_inv_txfm_sse2.h"
+#include "./av1_rtcd.h"
+#include "av1/common/x86/av1_inv_txfm_sse2.h"
 #include "aom_dsp/x86/txfm_common_sse2.h"
 
 #define RECON_AND_STORE4X4(dest, in_x)                    \

av1/common/x86/vp10_inv_txfm_sse2.h → av1/common/x86/av1_inv_txfm_sse2.h

@@ -15,7 +15,7 @@
 #include <emmintrin.h>  // SSE2
 #include "./vpx_config.h"
 #include "aom/vpx_integer.h"
-#include "av1/common/vp10_inv_txfm.h"
+#include "av1/common/av1_inv_txfm.h"
 
 // perform 8x8 transpose
 static INLINE void array_transpose_8x8(__m128i *in, __m128i *res) {

av1/decoder/decodeframe.c

@@ -12,7 +12,7 @@
 #include <assert.h>
 #include <stdlib.h>  // qsort()
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "./vpx_scale_rtcd.h"
 #include "./vpx_config.h"

av1/decoder/decoder.c

@@ -13,7 +13,7 @@
 #include <limits.h>
 #include <stdio.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "./vpx_scale_rtcd.h"
 
@@ -38,7 +38,7 @@ static void initialize_dec(void) {
   static volatile int init_done = 0;
 
   if (!init_done) {
-    vp10_rtcd();
+    av1_rtcd();
     vpx_dsp_rtcd();
     vpx_scale_rtcd();
     vp10_init_intra_predictors();

av1/encoder/arm/neon/dct_neon.c

@@ -11,7 +11,7 @@
 
 #include <arm_neon.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 

av1/encoder/arm/neon/error_neon.c

@@ -12,7 +12,7 @@
 #include <arm_neon.h>
 #include <assert.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 
 int64_t vp10_block_error_fp_neon(const int16_t *coeff, const int16_t *dqcoeff,
                                  int block_size) {

av1/encoder/blockiness.c

@@ -9,7 +9,7 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 #include "av1/common/common.h"

av1/encoder/dct.c

@@ -12,7 +12,7 @@
 #include <assert.h>
 #include <math.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 

av1/encoder/encodeframe.c

@@ -13,7 +13,7 @@
 #include <math.h>
 #include <stdio.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "./vpx_config.h"
 

av1/encoder/encodemb.c

@@ -9,7 +9,7 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 

av1/encoder/encoder.c

@@ -48,7 +48,7 @@
 #include "av1/encoder/speed_features.h"
 #include "av1/encoder/temporal_filter.h"
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "./vpx_scale_rtcd.h"
 #include "aom/internal/vpx_psnr.h"
@@ -317,7 +317,7 @@ void vp10_initialize_enc(void) {
   static volatile int init_done = 0;
 
   if (!init_done) {
-    vp10_rtcd();
+    av1_rtcd();
     vpx_dsp_rtcd();
     vpx_scale_rtcd();
     vp10_init_intra_predictors();

av1/encoder/mbgraph.c

@@ -11,7 +11,7 @@
 
 #include <limits.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 
 #include "aom_dsp/vpx_dsp_common.h"

av1/encoder/mips/msa/error_msa.c

@@ -9,7 +9,7 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "aom_dsp/mips/macros_msa.h"
 
 #define BLOCK_ERROR_BLOCKSIZE_MSA(BSize)                                     \

av1/encoder/mips/msa/temporal_filter_msa.c

@@ -9,7 +9,7 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "aom_dsp/mips/macros_msa.h"
 
 static void temporal_filter_apply_8size_msa(uint8_t *frm1_ptr, uint32_t stride,

av1/encoder/rd.c

@@ -13,7 +13,7 @@
 #include <math.h>
 #include <stdio.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 
 #include "aom_dsp/vpx_dsp_common.h"
 #include "aom_mem/vpx_mem.h"

av1/encoder/rdopt.c

@@ -12,7 +12,7 @@
 #include <assert.h>
 #include <math.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 
 #include "aom_dsp/vpx_dsp_common.h"

av1/encoder/x86/dct_sse2.c

@@ -12,7 +12,7 @@
 #include <assert.h>
 #include <emmintrin.h>  // SSE2
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "aom_dsp/txfm_common.h"
 #include "aom_dsp/x86/fwd_txfm_sse2.h"

av1/encoder/x86/dct_ssse3.c

@@ -17,7 +17,7 @@
 #endif
 #include <tmmintrin.h>  // SSSE3
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "aom_dsp/x86/inv_txfm_sse2.h"
 #include "aom_dsp/x86/txfm_common_sse2.h"
 

av1/encoder/x86/error_intrin_avx2.c

@@ -11,7 +11,7 @@
 
 #include <immintrin.h>  // AVX2
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "aom/vpx_integer.h"
 
 int64_t vp10_block_error_avx2(const int16_t *coeff, const int16_t *dqcoeff,

av1/encoder/x86/quantize_sse2.c

@@ -12,7 +12,7 @@
 #include <emmintrin.h>
 #include <xmmintrin.h>
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "aom/vpx_integer.h"
 
 void vp10_quantize_fp_sse2(const int16_t* coeff_ptr, intptr_t n_coeffs,

av1/vp10cx.mk

@@ -15,7 +15,7 @@ VP10_CX_SRCS-no  += $(VP10_COMMON_SRCS-no)
 VP10_CX_SRCS_REMOVE-yes += $(VP10_COMMON_SRCS_REMOVE-yes)
 VP10_CX_SRCS_REMOVE-no  += $(VP10_COMMON_SRCS_REMOVE-no)
 
-VP10_CX_SRCS-yes += vp10_cx_iface.c
+VP10_CX_SRCS-yes += av1_cx_iface.c
 
 VP10_CX_SRCS-yes += encoder/bitstream.c
 VP10_CX_SRCS-yes += encoder/context_tree.c

av1/vp10dx.mk

@@ -15,7 +15,7 @@ VP10_DX_SRCS-no  += $(VP10_COMMON_SRCS-no)
 VP10_DX_SRCS_REMOVE-yes += $(VP10_COMMON_SRCS_REMOVE-yes)
 VP10_DX_SRCS_REMOVE-no  += $(VP10_COMMON_SRCS_REMOVE-no)
 
-VP10_DX_SRCS-yes += vp10_dx_iface.c
+VP10_DX_SRCS-yes += av1_dx_iface.c
 
 VP10_DX_SRCS-yes += decoder/decodemv.c
 VP10_DX_SRCS-yes += decoder/decodeframe.c

build/make/Android.mk

@@ -169,7 +169,7 @@ define rtcd_dep_template
 rtcd_dep_template_SRCS := $(addprefix $(LOCAL_PATH)/, $(LOCAL_SRC_FILES))
 rtcd_dep_template_SRCS := $$(rtcd_dep_template_SRCS:.neon=)
 ifeq ($(CONFIG_VP10), yes)
-$$(rtcd_dep_template_SRCS): vp10_rtcd.h
+$$(rtcd_dep_template_SRCS): av1_rtcd.h
 endif
 $$(rtcd_dep_template_SRCS): vpx_scale_rtcd.h
 $$(rtcd_dep_template_SRCS): vpx_dsp_rtcd.h

libs.mk

@@ -56,7 +56,7 @@ CODEC_SRCS-yes += $(addprefix aom_util/,$(call enabled,UTIL_SRCS))
 #  VP10 make file
 ifeq ($(CONFIG_VP10),yes)
   VP10_PREFIX=av1/
-  include $(SRC_PATH_BARE)/$(VP10_PREFIX)vp10_common.mk
+  include $(SRC_PATH_BARE)/$(VP10_PREFIX)av1_common.mk
 endif
 
 ifeq ($(CONFIG_VP10_ENCODER),yes)

test/vp10_inv_txfm_test.cc → test/av1_inv_txfm_test.cc

@@ -14,7 +14,7 @@
 
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "test/acm_random.h"
 #include "test/clear_system_state.h"
@@ -23,7 +23,7 @@
 #include "av1/common/blockd.h"
 #include "av1/common/scan.h"
 #include "aom/vpx_integer.h"
-#include "av1/common/vp10_inv_txfm.h"
+#include "av1/common/av1_inv_txfm.h"
 
 using libaom_test::ACMRandom;
 

test/convolve_test.cc

@@ -13,7 +13,7 @@
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
 #include "./vpx_config.h"
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "test/acm_random.h"
 #include "test/clear_system_state.h"

test/dct16x16_test.cc

@@ -14,7 +14,7 @@
 
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "test/acm_random.h"
 #include "test/clear_system_state.h"

test/dct32x32_test.cc

@@ -14,7 +14,7 @@
 
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 #include "test/acm_random.h"

test/encoder_parms_get_to_decoder.cc

@@ -14,7 +14,7 @@
 #include "test/encode_test_driver.h"
 #include "test/util.h"
 #include "test/y4m_video_source.h"
-#include "av1/vp10_dx_iface.c"
+#include "av1/av1_dx_iface.c"
 
 namespace {
 

test/error_block_test.cc

@@ -15,7 +15,7 @@
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
 #include "./vpx_config.h"
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "test/acm_random.h"
 #include "test/clear_system_state.h"
 #include "test/register_state_check.h"

test/fdct4x4_test.cc

@@ -14,7 +14,7 @@
 
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "test/acm_random.h"
 #include "test/clear_system_state.h"

test/fdct8x8_test.cc

@@ -14,7 +14,7 @@
 
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "test/acm_random.h"
 #include "test/clear_system_state.h"

test/partial_idct_test.cc

@@ -14,7 +14,7 @@
 
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 #include "test/acm_random.h"
 #include "test/clear_system_state.h"

test/subtract_test.cc

@@ -10,7 +10,7 @@
 
 #include "third_party/googletest/src/include/gtest/gtest.h"
 
-#include "./vp10_rtcd.h"
+#include "./av1_rtcd.h"
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 #include "test/acm_random.h"

test/test.mk

@@ -116,8 +116,8 @@ LIBAOM_TEST_SRCS-$(HAVE_SSE2) += denoiser_sse2_test.cc
 endif
 LIBAOM_TEST_SRCS-$(CONFIG_VP10_ENCODER) += arf_freq_test.cc
 
-LIBAOM_TEST_SRCS-yes                    += vp10_inv_txfm_test.cc
-LIBAOM_TEST_SRCS-$(CONFIG_VP10_ENCODER) += vp10_dct_test.cc
+LIBAOM_TEST_SRCS-yes                    += av1_inv_txfm_test.cc
+LIBAOM_TEST_SRCS-$(CONFIG_VP10_ENCODER) += av1_dct_test.cc
 
 endif # VP10
 

test/test_libaom.cc

@@ -17,7 +17,7 @@
 #endif
 extern "C" {
 #if CONFIG_VP10
-extern void vp10_rtcd();
+extern void av1_rtcd();
 #endif  // CONFIG_VP10
 extern void vpx_dsp_rtcd();
 extern void vpx_scale_rtcd();
@@ -55,7 +55,7 @@ int main(int argc, char **argv) {
 // that exercise internal symbols.
 
 #if CONFIG_VP10
-  vp10_rtcd();
+  av1_rtcd();
 #endif  // CONFIG_VP10
   vpx_dsp_rtcd();
   vpx_scale_rtcd();