Remove vp8 in local symbols.

For non-static functions, change the prefix to vp9_. For static functions,
remove the prefix. Also fix some comments, remove unused code or unused
function prototypes.

Change-Id: I1f8be05362f66060fe421c3d4c9a906fdf835de5

5 files changed, 31 insertions, 31 deletions

diff --git a/vp8/encoder/x86/mcomp_x86.h b/vp8/encoder/x86/mcomp_x86.h
index ea8d1dcf1..cde954550 100644
--- a/vp8/encoder/x86/mcomp_x86.h
+++ b/vp8/encoder/x86/mcomp_x86.h
@@ -15,14 +15,14 @@
 #if HAVE_SSE3
 #if !CONFIG_RUNTIME_CPU_DETECT
 
-#undef  vp8_search_full_search
-#define vp8_search_full_search vp9_full_search_sadx3
+#undef  vp9_search_full_search
+#define vp9_search_full_search vp9_full_search_sadx3
 
-#undef  vp8_search_refining_search
-#define vp8_search_refining_search vp9_refining_search_sadx4
+#undef  vp9_search_refining_search
+#define vp9_search_refining_search vp9_refining_search_sadx4
 
-#undef  vp8_search_diamond_search
-#define vp8_search_diamond_search vp9_diamond_search_sadx4
+#undef  vp9_search_diamond_search
+#define vp9_search_diamond_search vp9_diamond_search_sadx4
 
 #endif
 #endif
@@ -30,8 +30,8 @@
 #if HAVE_SSE4_1
 #if !CONFIG_RUNTIME_CPU_DETECT
 
-#undef  vp8_search_full_search
-#define vp8_search_full_search vp9_full_search_sadx8
+#undef  vp9_search_full_search
+#define vp9_search_full_search vp9_full_search_sadx8
 
 #endif
 #endif
diff --git a/vp8/encoder/x86/quantize_x86.h b/vp8/encoder/x86/quantize_x86.h
index 33d3a13c5..6946e7e29 100644
--- a/vp8/encoder/x86/quantize_x86.h
+++ b/vp8/encoder/x86/quantize_x86.h
@@ -26,8 +26,8 @@
 extern prototype_quantize_block(vp9_regular_quantize_b_sse2);
 #if !CONFIG_RUNTIME_CPU_DETECT
 
-#undef vp8_quantize_quantb
-#define vp8_quantize_quantb vp9_regular_quantize_b_sse2
+#undef vp9_quantize_quantb
+#define vp9_quantize_quantb vp9_regular_quantize_b_sse2
 #endif /* !CONFIG_RUNTIME_CPU_DETECT */
 
 #endif /* HAVE_SSE2 */
@@ -38,8 +38,8 @@ extern prototype_quantize_block(vp9_regular_quantize_b_sse4);
 
 #if !CONFIG_RUNTIME_CPU_DETECT
 
-#undef vp8_quantize_quantb
-#define vp8_quantize_quantb vp9_regular_quantize_b_sse4
+#undef vp9_quantize_quantb
+#define vp9_quantize_quantb vp9_regular_quantize_b_sse4
 
 #endif /* !CONFIG_RUNTIME_CPU_DETECT */
 
diff --git a/vp8/encoder/x86/temporal_filter_x86.h b/vp8/encoder/x86/temporal_filter_x86.h
index c72c27ba1..8fae2200d 100644
--- a/vp8/encoder/x86/temporal_filter_x86.h
+++ b/vp8/encoder/x86/temporal_filter_x86.h
@@ -9,8 +9,8 @@
  */
 
 
-#ifndef __INC_VP8_TEMPORAL_FILTER_X86_H
-#define __INC_VP8_TEMPORAL_FILTER_X86_H
+#ifndef __INC_TEMPORAL_FILTER_X86_H
+#define __INC_TEMPORAL_FILTER_X86_H
 
 #if HAVE_SSE2
 extern prototype_apply(vp9_temporal_filter_apply_sse2);
@@ -24,4 +24,4 @@ extern prototype_apply(vp9_temporal_filter_apply_sse2);
 
 #endif
 
-#endif // __INC_VP8_TEMPORAL_FILTER_X86_H
+#endif // __INC_TEMPORAL_FILTER_X86_H
diff --git a/vp8/encoder/x86/variance_impl_sse2.asm b/vp8/encoder/x86/variance_impl_sse2.asm
index 349687c9e..5b20f3b32 100644
--- a/vp8/encoder/x86/variance_impl_sse2.asm
+++ b/vp8/encoder/x86/variance_impl_sse2.asm
@@ -431,7 +431,7 @@ sym(vp9_filter_block2d_bil_var_sse2):
         lea             rsi,            [GLOBAL(xmm_bi_rd)]  ; rounding
         movdqa          xmm4,           XMMWORD PTR [rsi]
 
-        lea             rcx,            [GLOBAL(vp8_bilinear_filters_sse2)]
+        lea             rcx,            [GLOBAL(bilinear_filters_sse2)]
         movsxd          rax,            dword ptr arg(5)     ; xoffset
 
         cmp             rax,            0                    ; skip first_pass filter if xoffset=0
@@ -726,7 +726,7 @@ sym(vp9_half_horiz_vert_variance8x_h_sse2):
         add             rsi, r8
 %endif
 
-vp8_half_horiz_vert_variance8x_h_1:
+.half_horiz_vert_variance8x_h_1:
 
         movq            xmm1,           QWORD PTR [rsi]     ;
         movq            xmm2,           QWORD PTR [rsi+1]   ;
@@ -754,7 +754,7 @@ vp8_half_horiz_vert_variance8x_h_1:
 %endif
 
         sub             rcx,            1                   ;
-        jnz             vp8_half_horiz_vert_variance8x_h_1     ;
+        jnz             .half_horiz_vert_variance8x_h_1     ;
 
         movdq2q         mm6,            xmm6                ;
         movdq2q         mm7,            xmm7                ;
@@ -840,7 +840,7 @@ sym(vp9_half_horiz_vert_variance16x_h_sse2):
 
         lea             rsi,            [rsi + rax]
 
-vp8_half_horiz_vert_variance16x_h_1:
+.half_horiz_vert_variance16x_h_1:
         movdqu          xmm1,           XMMWORD PTR [rsi]     ;
         movdqu          xmm2,           XMMWORD PTR [rsi+1]   ;
         pavgb           xmm1,           xmm2                ;  xmm1 = avg(xmm1,xmm3) horizontal line i+1
@@ -872,7 +872,7 @@ vp8_half_horiz_vert_variance16x_h_1:
         lea             rdi,            [rdi + rdx]
 
         sub             rcx,            1                   ;
-        jnz             vp8_half_horiz_vert_variance16x_h_1     ;
+        jnz             .half_horiz_vert_variance16x_h_1    ;
 
         pxor        xmm1,           xmm1
         pxor        xmm5,           xmm5
@@ -953,7 +953,7 @@ sym(vp9_half_vert_variance8x_h_sse2):
         movsxd          rax,            dword ptr arg(1) ;ref_pixels_per_line
 
         pxor            xmm0,           xmm0                ;
-vp8_half_vert_variance8x_h_1:
+.half_vert_variance8x_h_1:
         movq            xmm5,           QWORD PTR [rsi]     ;  xmm5 = s0,s1,s2..s8
         movq            xmm3,           QWORD PTR [rsi+rax] ;  xmm3 = s1,s2,s3..s9
 
@@ -977,7 +977,7 @@ vp8_half_vert_variance8x_h_1:
 %endif
 
         sub             rcx,            1                   ;
-        jnz             vp8_half_vert_variance8x_h_1          ;
+        jnz             .half_vert_variance8x_h_1          ;
 
         movdq2q         mm6,            xmm6                ;
         movdq2q         mm7,            xmm7                ;
@@ -1059,7 +1059,7 @@ sym(vp9_half_vert_variance16x_h_sse2):
         lea             rsi,            [rsi + rax          ]
         pxor            xmm0,           xmm0
 
-vp8_half_vert_variance16x_h_1:
+.half_vert_variance16x_h_1:
         movdqu          xmm3,           XMMWORD PTR [rsi]
 
         pavgb           xmm5,           xmm3                ;  xmm5 = avg(xmm1,xmm3)
@@ -1087,7 +1087,7 @@ vp8_half_vert_variance16x_h_1:
         lea             rdi,            [rdi + rdx]
 
         sub             rcx,            1
-        jnz             vp8_half_vert_variance16x_h_1
+        jnz             .half_vert_variance16x_h_1
 
         pxor        xmm1,           xmm1
         pxor        xmm5,           xmm5
@@ -1167,7 +1167,7 @@ sym(vp9_half_horiz_variance8x_h_sse2):
         movsxd          rcx,            dword ptr arg(4) ;Height              ;
 
         pxor            xmm0,           xmm0                ;
-vp8_half_horiz_variance8x_h_1:
+.half_horiz_variance8x_h_1:
         movq            xmm5,           QWORD PTR [rsi]     ;  xmm5 = s0,s1,s2..s8
         movq            xmm3,           QWORD PTR [rsi+1]   ;  xmm3 = s1,s2,s3..s9
 
@@ -1190,7 +1190,7 @@ vp8_half_horiz_variance8x_h_1:
         add             rdi, r9
 %endif
         sub             rcx,            1                   ;
-        jnz             vp8_half_horiz_variance8x_h_1        ;
+        jnz             .half_horiz_variance8x_h_1          ;
 
         movdq2q         mm6,            xmm6                ;
         movdq2q         mm7,            xmm7                ;
@@ -1270,7 +1270,7 @@ sym(vp9_half_horiz_variance16x_h_sse2):
 
         pxor            xmm0,           xmm0                ;
 
-vp8_half_horiz_variance16x_h_1:
+.half_horiz_variance16x_h_1:
         movdqu          xmm5,           XMMWORD PTR [rsi]     ;  xmm5 = s0,s1,s2..s15
         movdqu          xmm3,           XMMWORD PTR [rsi+1]   ;  xmm3 = s1,s2,s3..s16
 
@@ -1297,7 +1297,7 @@ vp8_half_horiz_variance16x_h_1:
         lea             rdi,            [rdi + rdx]
 
         sub             rcx,            1                   ;
-        jnz             vp8_half_horiz_variance16x_h_1        ;
+        jnz             .half_horiz_variance16x_h_1         ;
 
         pxor        xmm1,           xmm1
         pxor        xmm5,           xmm5
@@ -1348,7 +1348,7 @@ align 16
 xmm_bi_rd:
     times 8 dw 64
 align 16
-vp8_bilinear_filters_sse2:
+bilinear_filters_sse2:
     dw 128, 128, 128, 128, 128, 128, 128, 128,  0,  0,  0,  0,  0,  0,  0,  0
     dw 120, 120, 120, 120, 120, 120, 120, 120,  8,  8,  8,  8,  8,  8,  8,  8
     dw 112, 112, 112, 112, 112, 112, 112, 112, 16, 16, 16, 16, 16, 16, 16, 16
diff --git a/vp8/encoder/x86/variance_impl_ssse3.asm b/vp8/encoder/x86/variance_impl_ssse3.asm
index ca1a57196..30c75a6ae 100644
--- a/vp8/encoder/x86/variance_impl_ssse3.asm
+++ b/vp8/encoder/x86/variance_impl_ssse3.asm
@@ -43,7 +43,7 @@ sym(vp9_filter_block2d_bil_var_ssse3):
         pxor            xmm6,           xmm6
         pxor            xmm7,           xmm7
 
-        lea             rcx,            [GLOBAL(vp8_bilinear_filters_ssse3)]
+        lea             rcx,            [GLOBAL(bilinear_filters_ssse3)]
         movsxd          rax,            dword ptr arg(5)     ; xoffset
 
         cmp             rax,            0                    ; skip first_pass filter if xoffset=0
@@ -353,7 +353,7 @@ align 16
 xmm_bi_rd:
     times 8 dw 64
 align 16
-vp8_bilinear_filters_ssse3:
+bilinear_filters_ssse3:
     times 8 db 128, 0
     times 8 db 120, 8
     times 8 db 112, 16