Merge "NEON FDCT updated to match current C code"

diff --combined vp8/encoder/arm/arm_csystemdependent.c
index a6572b3,36791e4..081775b
--- 1/vp8/encoder/arm/arm_csystemdependent.c
--- 2/vp8/encoder/arm/arm_csystemdependent.c
+++ b/vp8/encoder/arm/arm_csystemdependent.c
@@@ -58,10 -58,10 +58,10 @@@ void vp8_arch_arm_encoder_init(VP8_COM
  
          /*cpi->rtcd.variance.get4x4sse_cs          = vp8_get4x4sse_cs_c;*/
  
 -        /*cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_c;
 -        cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_c;*/
 -        cpi->rtcd.fdct.fast4x4                   = vp8_fast_fdct4x4_armv6;
 -        cpi->rtcd.fdct.fast8x4                   = vp8_fast_fdct8x4_armv6;
 +        cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_armv6;
 +        cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_armv6;
 +        cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_armv6;
 +        cpi->rtcd.fdct.fast8x4                   = vp8_short_fdct8x4_armv6;
          cpi->rtcd.fdct.walsh_short4x4            = vp8_short_walsh4x4_armv6;
  
          /*cpi->rtcd.encodemb.berr                  = vp8_block_error_c;
@@@ -107,8 -107,8 +107,8 @@@
  
          cpi->rtcd.fdct.short4x4                  = vp8_short_fdct4x4_neon;
          cpi->rtcd.fdct.short8x4                  = vp8_short_fdct8x4_neon;
-         cpi->rtcd.fdct.fast4x4                   = vp8_fast_fdct4x4_neon;
-         cpi->rtcd.fdct.fast8x4                   = vp8_fast_fdct8x4_neon;
+         cpi->rtcd.fdct.fast4x4                   = vp8_short_fdct4x4_neon;
+         cpi->rtcd.fdct.fast8x4                   = vp8_short_fdct8x4_neon;
          cpi->rtcd.fdct.walsh_short4x4            = vp8_short_walsh4x4_neon;
  
          /*cpi->rtcd.encodemb.berr                  = vp8_block_error_c;

diff --combined vp8/encoder/arm/dct_arm.h
index f94022b,05b807d..db553c4
--- 1/vp8/encoder/arm/dct_arm.h
--- 2/vp8/encoder/arm/dct_arm.h
+++ b/vp8/encoder/arm/dct_arm.h
@@@ -14,24 -14,18 +14,24 @@@
  
  #if HAVE_ARMV6
  extern prototype_fdct(vp8_short_walsh4x4_armv6);
 -extern prototype_fdct(vp8_fast_fdct4x4_armv6);
 -extern prototype_fdct(vp8_fast_fdct8x4_armv6);
 +extern prototype_fdct(vp8_short_fdct4x4_armv6);
 +extern prototype_fdct(vp8_short_fdct8x4_armv6);
  
  #if !CONFIG_RUNTIME_CPU_DETECT
  #undef  vp8_fdct_walsh_short4x4
  #define vp8_fdct_walsh_short4x4 vp8_short_walsh4x4_armv6
  
 +#undef  vp8_fdct_short4x4
 +#define vp8_fdct_short4x4 vp8_short_fdct4x4_armv6
 +
 +#undef  vp8_fdct_short8x4
 +#define vp8_fdct_short8x4 vp8_short_fdct8x4_armv6
 +
  #undef  vp8_fdct_fast4x4
 -#define vp8_fdct_fast4x4 vp8_fast_fdct4x4_armv6
 +#define vp8_fdct_fast4x4 vp8_short_fdct4x4_armv6
  
  #undef  vp8_fdct_fast8x4
 -#define vp8_fdct_fast8x4 vp8_fast_fdct8x4_armv6
 +#define vp8_fdct_fast8x4 vp8_short_fdct8x4_armv6
  #endif
  
  #endif /* HAVE_ARMV6 */
@@@ -51,10 -45,10 +51,10 @@@ extern prototype_fdct(vp8_short_walsh4x
  #define vp8_fdct_short8x4 vp8_short_fdct8x4_neon
  
  #undef  vp8_fdct_fast4x4
- #define vp8_fdct_fast4x4 vp8_fast_fdct4x4_neon
+ #define vp8_fdct_fast4x4 vp8_short_fdct4x4_neon
  
  #undef  vp8_fdct_fast8x4
- #define vp8_fdct_fast8x4 vp8_fast_fdct8x4_neon
+ #define vp8_fdct_fast8x4 vp8_short_fdct8x4_neon
  
  #undef  vp8_fdct_walsh_short4x4
  #define vp8_fdct_walsh_short4x4 vp8_short_walsh4x4_neon

diff --combined vp8/vp8cx_arm.mk
index 4a860f4,ae8b38c..99b2688
--- 1/vp8/vp8cx_arm.mk
--- 2/vp8/vp8cx_arm.mk
+++ b/vp8/vp8cx_arm.mk
@@@ -36,7 -36,7 +36,7 @@@ VP8_CX_SRCS-$(HAVE_ARMV5TE)  += encoder
  #File list for armv6
  # encoder
  VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/arm/armv6/vp8_subtract_armv6$(ASM)
 -VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/arm/armv6/vp8_fast_fdct4x4_armv6$(ASM)
 +VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/arm/armv6/vp8_short_fdct4x4_armv6$(ASM)
  VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/arm/armv6/vp8_fast_quantize_b_armv6$(ASM)
  VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/arm/armv6/vp8_sad16x16_armv6$(ASM)
  VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/arm/armv6/vp8_variance16x16_armv6$(ASM)
@@@ -49,8 -49,6 +49,6 @@@ VP8_CX_SRCS-$(HAVE_ARMV6)  += encoder/a
  
  #File list for neon
  # encoder
- VP8_CX_SRCS-$(HAVE_ARMV7)  += encoder/arm/neon/fastfdct4x4_neon$(ASM)
- VP8_CX_SRCS-$(HAVE_ARMV7)  += encoder/arm/neon/fastfdct8x4_neon$(ASM)
  VP8_CX_SRCS-$(HAVE_ARMV7)  += encoder/arm/neon/fastquantizeb_neon$(ASM)
  VP8_CX_SRCS-$(HAVE_ARMV7)  += encoder/arm/neon/sad8_neon$(ASM)
  VP8_CX_SRCS-$(HAVE_ARMV7)  += encoder/arm/neon/sad16_neon$(ASM)