From e69b5258fd604e95d39b6eff6ea68e7e6e941d5d Mon Sep 17 00:00:00 2001
From: Jim Bankoski <jimbankoski@google.com>
Date: Thu, 29 Nov 2012 06:53:08 -0800
Subject: [PATCH] fix vp9_vp8 files renamed
Change-Id: I20c426e91ee49666db42e20eb074095ab6b8ec5d
---
vp9/common/x86/{vp9_vp8_asm_stubs.c => vp9_asm_stubs.c} | 0
.../{vp9_vp8_packtokens_armv5.asm => vp9_packtokens_armv5.asm} | 0
...acktokens_mbrow_armv5.asm => vp9_packtokens_mbrow_armv5.asm} | 0
...partitions_armv5.asm => vp9_packtokens_partitions_armv5.asm} | 0
..._fast_quantize_b_armv6.asm => vp9_fast_quantize_b_armv6.asm} | 1 -
.../{vp9_vp8_mse16x16_armv6.asm => vp9_mse16x16_armv6.asm} | 0
.../{vp9_vp8_sad16x16_armv6.asm => vp9_sad16x16_armv6.asm} | 1 -
..._vp8_short_fdct4x4_armv6.asm => vp9_short_fdct4x4_armv6.asm} | 0
.../{vp9_vp8_subtract_armv6.asm => vp9_subtract_armv6.asm} | 1 -
..._vp8_variance16x16_armv6.asm => vp9_variance16x16_armv6.asm} | 1 -
...{vp9_vp8_variance8x8_armv6.asm => vp9_variance8x8_armv6.asm} | 0
...x16_h_armv6.asm => vp9_variance_halfpixvar16x16_h_armv6.asm} | 1 -
...6_hv_armv6.asm => vp9_variance_halfpixvar16x16_hv_armv6.asm} | 0
...x16_v_armv6.asm => vp9_variance_halfpixvar16x16_v_armv6.asm} | 1 -
.../arm/neon/{vp9_vp8_memcpy_neon.asm => vp9_memcpy_neon.asm} | 0
.../neon/{vp9_vp8_mse16x16_neon.asm => vp9_mse16x16_neon.asm} | 0
...p9_vp8_shortwalsh4x4_neon.asm => vp9_shortwalsh4x4_neon.asm} | 0
...ariance16x16_neon.asm => vp9_subpixelvariance16x16_neon.asm} | 0
...iance16x16s_neon.asm => vp9_subpixelvariance16x16s_neon.asm} | 0
...xelvariance8x8_neon.asm => vp9_subpixelvariance8x8_neon.asm} | 0
vp9/vp9_common.mk | 2 +-
21 files changed, 1 insertion(+), 7 deletions(-)
rename vp9/common/x86/{vp9_vp8_asm_stubs.c => vp9_asm_stubs.c} (100%)
rename vp9/encoder/arm/armv5te/{vp9_vp8_packtokens_armv5.asm => vp9_packtokens_armv5.asm} (100%)
rename vp9/encoder/arm/armv5te/{vp9_vp8_packtokens_mbrow_armv5.asm => vp9_packtokens_mbrow_armv5.asm} (100%)
rename vp9/encoder/arm/armv5te/{vp9_vp8_packtokens_partitions_armv5.asm => vp9_packtokens_partitions_armv5.asm} (100%)
rename vp9/encoder/arm/armv6/{vp9_vp8_fast_quantize_b_armv6.asm => vp9_fast_quantize_b_armv6.asm} (99%)
rename vp9/encoder/arm/armv6/{vp9_vp8_mse16x16_armv6.asm => vp9_mse16x16_armv6.asm} (100%)
rename vp9/encoder/arm/armv6/{vp9_vp8_sad16x16_armv6.asm => vp9_sad16x16_armv6.asm} (99%)
rename vp9/encoder/arm/armv6/{vp9_vp8_short_fdct4x4_armv6.asm => vp9_short_fdct4x4_armv6.asm} (100%)
rename vp9/encoder/arm/armv6/{vp9_vp8_subtract_armv6.asm => vp9_subtract_armv6.asm} (99%)
rename vp9/encoder/arm/armv6/{vp9_vp8_variance16x16_armv6.asm => vp9_variance16x16_armv6.asm} (99%)
rename vp9/encoder/arm/armv6/{vp9_vp8_variance8x8_armv6.asm => vp9_variance8x8_armv6.asm} (100%)
rename vp9/encoder/arm/armv6/{vp9_vp8_variance_halfpixvar16x16_h_armv6.asm => vp9_variance_halfpixvar16x16_h_armv6.asm} (99%)
rename vp9/encoder/arm/armv6/{vp9_vp8_variance_halfpixvar16x16_hv_armv6.asm => vp9_variance_halfpixvar16x16_hv_armv6.asm} (100%)
rename vp9/encoder/arm/armv6/{vp9_vp8_variance_halfpixvar16x16_v_armv6.asm => vp9_variance_halfpixvar16x16_v_armv6.asm} (99%)
rename vp9/encoder/arm/neon/{vp9_vp8_memcpy_neon.asm => vp9_memcpy_neon.asm} (100%)
rename vp9/encoder/arm/neon/{vp9_vp8_mse16x16_neon.asm => vp9_mse16x16_neon.asm} (100%)
rename vp9/encoder/arm/neon/{vp9_vp8_shortwalsh4x4_neon.asm => vp9_shortwalsh4x4_neon.asm} (100%)
rename vp9/encoder/arm/neon/{vp9_vp8_subpixelvariance16x16_neon.asm => vp9_subpixelvariance16x16_neon.asm} (100%)
rename vp9/encoder/arm/neon/{vp9_vp8_subpixelvariance16x16s_neon.asm => vp9_subpixelvariance16x16s_neon.asm} (100%)
rename vp9/encoder/arm/neon/{vp9_vp8_subpixelvariance8x8_neon.asm => vp9_subpixelvariance8x8_neon.asm} (100%)
diff --git a/vp9/common/x86/vp9_vp8_asm_stubs.c b/vp9/common/x86/vp9_asm_stubs.c
similarity index 100%
rename from vp9/common/x86/vp9_vp8_asm_stubs.c
rename to vp9/common/x86/vp9_asm_stubs.c
diff --git a/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_armv5.asm b/vp9/encoder/arm/armv5te/vp9_packtokens_armv5.asm
similarity index 100%
rename from vp9/encoder/arm/armv5te/vp9_vp8_packtokens_armv5.asm
rename to vp9/encoder/arm/armv5te/vp9_packtokens_armv5.asm
diff --git a/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_mbrow_armv5.asm b/vp9/encoder/arm/armv5te/vp9_packtokens_mbrow_armv5.asm
similarity index 100%
rename from vp9/encoder/arm/armv5te/vp9_vp8_packtokens_mbrow_armv5.asm
rename to vp9/encoder/arm/armv5te/vp9_packtokens_mbrow_armv5.asm
diff --git a/vp9/encoder/arm/armv5te/vp9_vp8_packtokens_partitions_armv5.asm b/vp9/encoder/arm/armv5te/vp9_packtokens_partitions_armv5.asm
similarity index 100%
rename from vp9/encoder/arm/armv5te/vp9_vp8_packtokens_partitions_armv5.asm
rename to vp9/encoder/arm/armv5te/vp9_packtokens_partitions_armv5.asm
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_fast_quantize_b_armv6.asm b/vp9/encoder/arm/armv6/vp9_fast_quantize_b_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_fast_quantize_b_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_fast_quantize_b_armv6.asm
index bca74391a2..4f75ef5e7c 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_fast_quantize_b_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_fast_quantize_b_armv6.asm
@@ -221,4 +221,3 @@ loop_count
DCD 0x1000000
END
-
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_mse16x16_armv6.asm b/vp9/encoder/arm/armv6/vp9_mse16x16_armv6.asm
similarity index 100%
rename from vp9/encoder/arm/armv6/vp9_vp8_mse16x16_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_mse16x16_armv6.asm
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_sad16x16_armv6.asm b/vp9/encoder/arm/armv6/vp9_sad16x16_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_sad16x16_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_sad16x16_armv6.asm
index 1b4f5cf3b0..4dcceb2bf8 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_sad16x16_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_sad16x16_armv6.asm
@@ -93,4 +93,3 @@ loop
ENDP
END
-
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_short_fdct4x4_armv6.asm b/vp9/encoder/arm/armv6/vp9_short_fdct4x4_armv6.asm
similarity index 100%
rename from vp9/encoder/arm/armv6/vp9_vp8_short_fdct4x4_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_short_fdct4x4_armv6.asm
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_subtract_armv6.asm b/vp9/encoder/arm/armv6/vp9_subtract_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_subtract_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_subtract_armv6.asm
index bb466c4e97..e53c1ed5b6 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_subtract_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_subtract_armv6.asm
@@ -262,4 +262,3 @@ loop
ENDP
END
-
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_variance16x16_armv6.asm b/vp9/encoder/arm/armv6/vp9_variance16x16_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_variance16x16_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_variance16x16_armv6.asm
index 110db30746..aa4727e662 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_variance16x16_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_variance16x16_armv6.asm
@@ -151,4 +151,3 @@ loop
ENDP
END
-
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_variance8x8_armv6.asm b/vp9/encoder/arm/armv6/vp9_variance8x8_armv6.asm
similarity index 100%
rename from vp9/encoder/arm/armv6/vp9_vp8_variance8x8_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_variance8x8_armv6.asm
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_h_armv6.asm b/vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_h_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_h_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_h_armv6.asm
index 7a8cafd3b0..e25436c22e 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_h_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_h_armv6.asm
@@ -179,4 +179,3 @@ c80808080
DCD 0x80808080
END
-
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_hv_armv6.asm b/vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_hv_armv6.asm
similarity index 100%
rename from vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_hv_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_hv_armv6.asm
diff --git a/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_v_armv6.asm b/vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_v_armv6.asm
similarity index 99%
rename from vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_v_armv6.asm
rename to vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_v_armv6.asm
index 0471d3d67c..c1ac5a1cba 100644
--- a/vp9/encoder/arm/armv6/vp9_vp8_variance_halfpixvar16x16_v_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp9_variance_halfpixvar16x16_v_armv6.asm
@@ -181,4 +181,3 @@ c80808080
DCD 0x80808080
END
-
diff --git a/vp9/encoder/arm/neon/vp9_vp8_memcpy_neon.asm b/vp9/encoder/arm/neon/vp9_memcpy_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_memcpy_neon.asm
rename to vp9/encoder/arm/neon/vp9_memcpy_neon.asm
diff --git a/vp9/encoder/arm/neon/vp9_vp8_mse16x16_neon.asm b/vp9/encoder/arm/neon/vp9_mse16x16_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_mse16x16_neon.asm
rename to vp9/encoder/arm/neon/vp9_mse16x16_neon.asm
diff --git a/vp9/encoder/arm/neon/vp9_vp8_shortwalsh4x4_neon.asm b/vp9/encoder/arm/neon/vp9_shortwalsh4x4_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_shortwalsh4x4_neon.asm
rename to vp9/encoder/arm/neon/vp9_shortwalsh4x4_neon.asm
diff --git a/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16_neon.asm b/vp9/encoder/arm/neon/vp9_subpixelvariance16x16_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16_neon.asm
rename to vp9/encoder/arm/neon/vp9_subpixelvariance16x16_neon.asm
diff --git a/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16s_neon.asm b/vp9/encoder/arm/neon/vp9_subpixelvariance16x16s_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_subpixelvariance16x16s_neon.asm
rename to vp9/encoder/arm/neon/vp9_subpixelvariance16x16s_neon.asm
diff --git a/vp9/encoder/arm/neon/vp9_vp8_subpixelvariance8x8_neon.asm b/vp9/encoder/arm/neon/vp9_subpixelvariance8x8_neon.asm
similarity index 100%
rename from vp9/encoder/arm/neon/vp9_vp8_subpixelvariance8x8_neon.asm
rename to vp9/encoder/arm/neon/vp9_subpixelvariance8x8_neon.asm
diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk
index 3e2a2bdc9b..28cbcfd152 100644
--- a/vp9/vp9_common.mk
+++ b/vp9/vp9_common.mk
@@ -83,7 +83,7 @@ VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_idct_x86.h
VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_subpixel_x86.h
VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_loopfilter_x86.h
VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_postproc_x86.h
-VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_vp8_asm_stubs.c
+VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_asm_stubs.c
VP9_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/vp9_loopfilter_x86.c
VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/vp9_postproc.h
VP9_COMMON_SRCS-$(CONFIG_POSTPROC) += common/vp9_postproc.c
--
GitLab