Commit 57cc35dd authored by John Koleszar's avatar John Koleszar

Merge Duclair release into master branch

Change-Id: Ibf577972e8cd10488d44385ff74f136a07466c0c
parents 2b0aee4b 9951f461
...@@ -671,10 +671,22 @@ process_common_toolchain() { ...@@ -671,10 +671,22 @@ process_common_toolchain() {
case ${toolchain} in case ${toolchain} in
arm*) arm*)
# on arm, isa versions are supersets # on arm, isa versions are supersets
enabled armv7a && soft_enable armv7 ### DEBUG case ${tgt_isa} in
enabled armv7 && soft_enable armv6 armv7)
enabled armv7 || enabled armv6 && soft_enable armv5te soft_enable neon
enabled armv7 || enabled armv6 && soft_enable fast_unaligned soft_enable media
soft_enable edsp
soft_enable fast_unaligned
;;
armv6)
soft_enable media
soft_enable edsp
soft_enable fast_unaligned
;;
armv5te)
soft_enable edsp
;;
esac
asm_conversion_cmd="cat" asm_conversion_cmd="cat"
...@@ -687,10 +699,14 @@ process_common_toolchain() { ...@@ -687,10 +699,14 @@ process_common_toolchain() {
arch_int=${arch_int%%te} arch_int=${arch_int%%te}
check_add_asflags --defsym ARCHITECTURE=${arch_int} check_add_asflags --defsym ARCHITECTURE=${arch_int}
tune_cflags="-mtune=" tune_cflags="-mtune="
if enabled armv7 if [ ${tgt_isa} == "armv7" ]; then
then if enabled neon
check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-ftree-vectorize then
check_add_asflags -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-march=armv7-a check_add_cflags -mfpu=neon #-ftree-vectorize
check_add_asflags -mfpu=neon
fi
check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfloat-abi=softfp
check_add_asflags -mcpu=cortex-a8 -mfloat-abi=softfp #-march=armv7-a
else else
check_add_cflags -march=${tgt_isa} check_add_cflags -march=${tgt_isa}
check_add_asflags -march=${tgt_isa} check_add_asflags -march=${tgt_isa}
...@@ -708,10 +724,14 @@ process_common_toolchain() { ...@@ -708,10 +724,14 @@ process_common_toolchain() {
tune_cflags="--cpu=" tune_cflags="--cpu="
tune_asflags="--cpu=" tune_asflags="--cpu="
if [ -z "${tune_cpu}" ]; then if [ -z "${tune_cpu}" ]; then
if enabled armv7 if [ ${tgt_isa} == "armv7" ]; then
then if enabled neon
check_add_cflags --cpu=Cortex-A8 --fpu=softvfp+vfpv3 then
check_add_asflags --cpu=Cortex-A8 --fpu=softvfp+vfpv3 check_add_cflags --fpu=softvfp+vfpv3
check_add_asflags --fpu=softvfp+vfpv3
fi
check_add_cflags --cpu=Cortex-A8
check_add_asflags --cpu=Cortex-A8
else else
check_add_cflags --cpu=${tgt_isa##armv} check_add_cflags --cpu=${tgt_isa##armv}
check_add_asflags --cpu=${tgt_isa##armv} check_add_asflags --cpu=${tgt_isa##armv}
...@@ -759,8 +779,7 @@ process_common_toolchain() { ...@@ -759,8 +779,7 @@ process_common_toolchain() {
enable pic enable pic
soft_enable realtime_only soft_enable realtime_only
if enabled armv7 if [ ${tgt_isa} == "armv7" ]; then
then
enable runtime_cpu_detect enable runtime_cpu_detect
fi fi
;; ;;
......
...@@ -192,9 +192,9 @@ ARCH_LIST=" ...@@ -192,9 +192,9 @@ ARCH_LIST="
ppc64 ppc64
" "
ARCH_EXT_LIST=" ARCH_EXT_LIST="
armv5te edsp
armv6 media
armv7 neon
mips32 mips32
......
...@@ -26,13 +26,13 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx) ...@@ -26,13 +26,13 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx)
rtcd->flags = flags; rtcd->flags = flags;
/* Override default functions with fastest ones for this CPU. */ /* Override default functions with fastest ones for this CPU. */
#if HAVE_ARMV5TE #if HAVE_EDSP
if (flags & HAS_EDSP) if (flags & HAS_EDSP)
{ {
} }
#endif #endif
#if HAVE_ARMV6 #if HAVE_MEDIA
if (flags & HAS_MEDIA) if (flags & HAS_MEDIA)
{ {
rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_armv6; rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_armv6;
...@@ -71,7 +71,7 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx) ...@@ -71,7 +71,7 @@ void vp8_arch_arm_common_init(VP8_COMMON *ctx)
} }
#endif #endif
#if HAVE_ARMV7 #if HAVE_NEON
if (flags & HAS_NEON) if (flags & HAS_NEON)
{ {
rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_neon; rtcd->subpix.sixtap16x16 = vp8_sixtap_predict16x16_neon;
......
...@@ -13,15 +13,15 @@ ...@@ -13,15 +13,15 @@
#include "vp8/common/dequantize.h" #include "vp8/common/dequantize.h"
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#if HAVE_ARMV7 #if HAVE_NEON
extern void vp8_dequantize_b_loop_neon(short *Q, short *DQC, short *DQ); extern void vp8_dequantize_b_loop_neon(short *Q, short *DQC, short *DQ);
#endif #endif
#if HAVE_ARMV6 #if HAVE_MEDIA
extern void vp8_dequantize_b_loop_v6(short *Q, short *DQC, short *DQ); extern void vp8_dequantize_b_loop_v6(short *Q, short *DQC, short *DQ);
#endif #endif
#if HAVE_ARMV7 #if HAVE_NEON
void vp8_dequantize_b_neon(BLOCKD *d, short *DQC) void vp8_dequantize_b_neon(BLOCKD *d, short *DQC)
{ {
...@@ -32,7 +32,7 @@ void vp8_dequantize_b_neon(BLOCKD *d, short *DQC) ...@@ -32,7 +32,7 @@ void vp8_dequantize_b_neon(BLOCKD *d, short *DQC)
} }
#endif #endif
#if HAVE_ARMV6 #if HAVE_MEDIA
void vp8_dequantize_b_v6(BLOCKD *d, short *DQC) void vp8_dequantize_b_v6(BLOCKD *d, short *DQC)
{ {
short *DQ = d->dqcoeff; short *DQ = d->dqcoeff;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef DEQUANTIZE_ARM_H #ifndef DEQUANTIZE_ARM_H
#define DEQUANTIZE_ARM_H #define DEQUANTIZE_ARM_H
#if HAVE_ARMV6 #if HAVE_MEDIA
extern prototype_dequant_block(vp8_dequantize_b_v6); extern prototype_dequant_block(vp8_dequantize_b_v6);
extern prototype_dequant_idct_add(vp8_dequant_idct_add_v6); extern prototype_dequant_idct_add(vp8_dequant_idct_add_v6);
extern prototype_dequant_idct_add_y_block(vp8_dequant_idct_add_y_block_v6); extern prototype_dequant_idct_add_y_block(vp8_dequant_idct_add_y_block_v6);
...@@ -33,7 +33,7 @@ extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block_v6); ...@@ -33,7 +33,7 @@ extern prototype_dequant_idct_add_uv_block(vp8_dequant_idct_add_uv_block_v6);
#endif #endif
#endif #endif
#if HAVE_ARMV7 #if HAVE_NEON
extern prototype_dequant_block(vp8_dequantize_b_neon); extern prototype_dequant_block(vp8_dequantize_b_neon);
extern prototype_dequant_idct_add(vp8_dequant_idct_add_neon); extern prototype_dequant_idct_add(vp8_dequant_idct_add_neon);
extern prototype_dequant_idct_add_y_block(vp8_dequant_idct_add_y_block_neon); extern prototype_dequant_idct_add_y_block(vp8_dequant_idct_add_y_block_neon);
......
...@@ -86,7 +86,7 @@ extern void vp8_filter_block2d_second_pass_only_armv6 ...@@ -86,7 +86,7 @@ extern void vp8_filter_block2d_second_pass_only_armv6
const short *vp8_filter const short *vp8_filter
); );
#if HAVE_ARMV6 #if HAVE_MEDIA
void vp8_sixtap_predict_armv6 void vp8_sixtap_predict_armv6
( (
unsigned char *src_ptr, unsigned char *src_ptr,
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef IDCT_ARM_H #ifndef IDCT_ARM_H
#define IDCT_ARM_H #define IDCT_ARM_H
#if HAVE_ARMV6 #if HAVE_MEDIA
extern prototype_idct(vp8_short_idct4x4llm_v6_dual); extern prototype_idct(vp8_short_idct4x4llm_v6_dual);
extern prototype_idct_scalar_add(vp8_dc_only_idct_add_v6); extern prototype_idct_scalar_add(vp8_dc_only_idct_add_v6);
extern prototype_second_order(vp8_short_inv_walsh4x4_1_v6); extern prototype_second_order(vp8_short_inv_walsh4x4_1_v6);
...@@ -30,7 +30,7 @@ extern prototype_second_order(vp8_short_inv_walsh4x4_v6); ...@@ -30,7 +30,7 @@ extern prototype_second_order(vp8_short_inv_walsh4x4_v6);
#endif #endif
#endif #endif
#if HAVE_ARMV7 #if HAVE_NEON
extern prototype_idct(vp8_short_idct4x4llm_neon); extern prototype_idct(vp8_short_idct4x4llm_neon);
extern prototype_idct_scalar_add(vp8_dc_only_idct_add_neon); extern prototype_idct_scalar_add(vp8_dc_only_idct_add_neon);
extern prototype_second_order(vp8_short_inv_walsh4x4_1_neon); extern prototype_second_order(vp8_short_inv_walsh4x4_1_neon);
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
#include "vp8/common/loopfilter.h" #include "vp8/common/loopfilter.h"
#include "vp8/common/onyxc_int.h" #include "vp8/common/onyxc_int.h"
#if HAVE_ARMV6 #if HAVE_MEDIA
extern prototype_loopfilter(vp8_loop_filter_horizontal_edge_armv6); extern prototype_loopfilter(vp8_loop_filter_horizontal_edge_armv6);
extern prototype_loopfilter(vp8_loop_filter_vertical_edge_armv6); extern prototype_loopfilter(vp8_loop_filter_vertical_edge_armv6);
extern prototype_loopfilter(vp8_mbloop_filter_horizontal_edge_armv6); extern prototype_loopfilter(vp8_mbloop_filter_horizontal_edge_armv6);
extern prototype_loopfilter(vp8_mbloop_filter_vertical_edge_armv6); extern prototype_loopfilter(vp8_mbloop_filter_vertical_edge_armv6);
#endif #endif
#if HAVE_ARMV7 #if HAVE_NEON
typedef void loopfilter_y_neon(unsigned char *src, int pitch, typedef void loopfilter_y_neon(unsigned char *src, int pitch,
unsigned char blimit, unsigned char limit, unsigned char thresh); unsigned char blimit, unsigned char limit, unsigned char thresh);
typedef void loopfilter_uv_neon(unsigned char *u, int pitch, typedef void loopfilter_uv_neon(unsigned char *u, int pitch,
...@@ -38,8 +38,8 @@ extern loopfilter_uv_neon vp8_mbloop_filter_horizontal_edge_uv_neon; ...@@ -38,8 +38,8 @@ extern loopfilter_uv_neon vp8_mbloop_filter_horizontal_edge_uv_neon;
extern loopfilter_uv_neon vp8_mbloop_filter_vertical_edge_uv_neon; extern loopfilter_uv_neon vp8_mbloop_filter_vertical_edge_uv_neon;
#endif #endif
#if HAVE_ARMV6 #if HAVE_MEDIA
/*ARMV6 loopfilter functions*/ /* ARMV6/MEDIA loopfilter functions*/
/* Horizontal MB filtering */ /* Horizontal MB filtering */
void vp8_loop_filter_mbh_armv6(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr, void vp8_loop_filter_mbh_armv6(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr,
int y_stride, int uv_stride, loop_filter_info *lfi) int y_stride, int uv_stride, loop_filter_info *lfi)
...@@ -113,7 +113,7 @@ void vp8_loop_filter_bvs_armv6(unsigned char *y_ptr, int y_stride, ...@@ -113,7 +113,7 @@ void vp8_loop_filter_bvs_armv6(unsigned char *y_ptr, int y_stride,
} }
#endif #endif
#if HAVE_ARMV7 #if HAVE_NEON
/* NEON loopfilter functions */ /* NEON loopfilter functions */
/* Horizontal MB filtering */ /* Horizontal MB filtering */
void vp8_loop_filter_mbh_neon(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr, void vp8_loop_filter_mbh_neon(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr,
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "vpx_config.h" #include "vpx_config.h"
#if HAVE_ARMV6 #if HAVE_MEDIA
extern prototype_loopfilter_block(vp8_loop_filter_mbv_armv6); extern prototype_loopfilter_block(vp8_loop_filter_mbv_armv6);
extern prototype_loopfilter_block(vp8_loop_filter_bv_armv6); extern prototype_loopfilter_block(vp8_loop_filter_bv_armv6);
extern prototype_loopfilter_block(vp8_loop_filter_mbh_armv6); extern prototype_loopfilter_block(vp8_loop_filter_mbh_armv6);
...@@ -50,9 +50,9 @@ extern prototype_simple_loopfilter(vp8_loop_filter_simple_vertical_edge_armv6); ...@@ -50,9 +50,9 @@ extern prototype_simple_loopfilter(vp8_loop_filter_simple_vertical_edge_armv6);
#define vp8_lf_simple_b_h vp8_loop_filter_bhs_armv6 #define vp8_lf_simple_b_h vp8_loop_filter_bhs_armv6
#endif /* !CONFIG_RUNTIME_CPU_DETECT */ #endif /* !CONFIG_RUNTIME_CPU_DETECT */
#endif /* HAVE_ARMV6 */ #endif /* HAVE_MEDIA */
#if HAVE_ARMV7 #if HAVE_NEON
extern prototype_loopfilter_block(vp8_loop_filter_mbv_neon); extern prototype_loopfilter_block(vp8_loop_filter_mbv_neon);
extern prototype_loopfilter_block(vp8_loop_filter_bv_neon); extern prototype_loopfilter_block(vp8_loop_filter_bv_neon);
extern prototype_loopfilter_block(vp8_loop_filter_mbh_neon); extern prototype_loopfilter_block(vp8_loop_filter_mbh_neon);
...@@ -88,6 +88,6 @@ extern prototype_simple_loopfilter(vp8_loop_filter_bhs_neon); ...@@ -88,6 +88,6 @@ extern prototype_simple_loopfilter(vp8_loop_filter_bhs_neon);
#define vp8_lf_simple_b_h vp8_loop_filter_bhs_neon #define vp8_lf_simple_b_h vp8_loop_filter_bhs_neon
#endif /* !CONFIG_RUNTIME_CPU_DETECT */ #endif /* !CONFIG_RUNTIME_CPU_DETECT */
#endif /* HAVE_ARMV7 */ #endif /* HAVE_NEON */
#endif /* LOOPFILTER_ARM_H */ #endif /* LOOPFILTER_ARM_H */
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef RECON_ARM_H #ifndef RECON_ARM_H
#define RECON_ARM_H #define RECON_ARM_H
#if HAVE_ARMV6 #if HAVE_MEDIA
extern prototype_copy_block(vp8_copy_mem8x8_v6); extern prototype_copy_block(vp8_copy_mem8x8_v6);
extern prototype_copy_block(vp8_copy_mem8x4_v6); extern prototype_copy_block(vp8_copy_mem8x4_v6);
...@@ -34,7 +34,7 @@ extern prototype_intra4x4_predict(vp8_intra4x4_predict_armv6); ...@@ -34,7 +34,7 @@ extern prototype_intra4x4_predict(vp8_intra4x4_predict_armv6);
#endif #endif
#endif #endif
#if HAVE_ARMV7 #if HAVE_NEON
extern prototype_copy_block(vp8_copy_mem8x8_neon); extern prototype_copy_block(vp8_copy_mem8x8_neon);
extern prototype_copy_block(vp8_copy_mem8x4_neon); extern prototype_copy_block(vp8_copy_mem8x4_neon);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vp8/common/recon.h" #include "vp8/common/recon.h"
#if HAVE_ARMV7 #if HAVE_NEON
extern void vp8_build_intra_predictors_mby_neon_func( extern void vp8_build_intra_predictors_mby_neon_func(
unsigned char *y_buffer, unsigned char *y_buffer,
unsigned char *ypred_ptr, unsigned char *ypred_ptr,
...@@ -35,10 +35,7 @@ void vp8_build_intra_predictors_mby_neon(MACROBLOCKD *x) ...@@ -35,10 +35,7 @@ void vp8_build_intra_predictors_mby_neon(MACROBLOCKD *x)
vp8_build_intra_predictors_mby_neon_func(y_buffer, ypred_ptr, y_stride, mode, Up, Left); vp8_build_intra_predictors_mby_neon_func(y_buffer, ypred_ptr, y_stride, mode, Up, Left);
} }
#endif
#if HAVE_ARMV7
extern void vp8_build_intra_predictors_mby_s_neon_func( extern void vp8_build_intra_predictors_mby_s_neon_func(
unsigned char *y_buffer, unsigned char *y_buffer,
unsigned char *ypred_ptr, unsigned char *ypred_ptr,
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef SUBPIXEL_ARM_H #ifndef SUBPIXEL_ARM_H
#define SUBPIXEL_ARM_H #define SUBPIXEL_ARM_H
#if HAVE_ARMV6 #if HAVE_MEDIA
extern prototype_subpixel_predict(vp8_sixtap_predict16x16_armv6); extern prototype_subpixel_predict(vp8_sixtap_predict16x16_armv6);
extern prototype_subpixel_predict(vp8_sixtap_predict8x8_armv6); extern prototype_subpixel_predict(vp8_sixtap_predict8x8_armv6);
extern prototype_subpixel_predict(vp8_sixtap_predict8x4_armv6); extern prototype_subpixel_predict(vp8_sixtap_predict8x4_armv6);
...@@ -49,7 +49,7 @@ extern prototype_subpixel_predict(vp8_bilinear_predict4x4_armv6); ...@@ -49,7 +49,7 @@ extern prototype_subpixel_predict(vp8_bilinear_predict4x4_armv6);
#endif #endif
#endif #endif
#if HAVE_ARMV7 #if HAVE_NEON
extern prototype_subpixel_predict(vp8_sixtap_predict16x16_neon); extern prototype_subpixel_predict(vp8_sixtap_predict16x16_neon);
extern prototype_subpixel_predict(vp8_sixtap_predict8x8_neon); extern prototype_subpixel_predict(vp8_sixtap_predict8x8_neon);
extern prototype_subpixel_predict(vp8_sixtap_predict8x4_neon); extern prototype_subpixel_predict(vp8_sixtap_predict8x4_neon);
......
...@@ -35,7 +35,7 @@ END ...@@ -35,7 +35,7 @@ END
/* add asserts for any offset that is not supported by assembly code */ /* add asserts for any offset that is not supported by assembly code */
/* add asserts for any size that is not supported by assembly code */ /* add asserts for any size that is not supported by assembly code */
#if HAVE_ARMV6 #if HAVE_MEDIA
/* switch case in vp8_intra4x4_predict_armv6 is based on these enumerated values */ /* switch case in vp8_intra4x4_predict_armv6 is based on these enumerated values */
ct_assert(B_DC_PRED, B_DC_PRED == 0); ct_assert(B_DC_PRED, B_DC_PRED == 0);
ct_assert(B_TM_PRED, B_TM_PRED == 1); ct_assert(B_TM_PRED, B_TM_PRED == 1);
...@@ -49,7 +49,7 @@ ct_assert(B_HD_PRED, B_HD_PRED == 8); ...@@ -49,7 +49,7 @@ ct_assert(B_HD_PRED, B_HD_PRED == 8);
ct_assert(B_HU_PRED, B_HU_PRED == 9); ct_assert(B_HU_PRED, B_HU_PRED == 9);
#endif #endif
#if HAVE_ARMV7 #if HAVE_NEON
/* vp8_yv12_extend_frame_borders_neon makes several assumptions based on this */ /* vp8_yv12_extend_frame_borders_neon makes several assumptions based on this */
ct_assert(VP8BORDERINPIXELS_VAL, VP8BORDERINPIXELS == 32) ct_assert(VP8BORDERINPIXELS_VAL, VP8BORDERINPIXELS == 32)
#endif #endif
...@@ -18,19 +18,19 @@ void vp8_arch_arm_decode_init(VP8D_COMP *pbi) ...@@ -18,19 +18,19 @@ void vp8_arch_arm_decode_init(VP8D_COMP *pbi)
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
int flags = pbi->common.rtcd.flags; int flags = pbi->common.rtcd.flags;
#if HAVE_ARMV5TE #if HAVE_EDSP
if (flags & HAS_EDSP) if (flags & HAS_EDSP)
{ {
} }
#endif #endif
#if HAVE_ARMV6 #if HAVE_MEDIA
if (flags & HAS_MEDIA) if (flags & HAS_MEDIA)
{ {
} }
#endif #endif
#if HAVE_ARMV7 #if HAVE_NEON
if (flags & HAS_NEON) if (flags & HAS_NEON)
{ {
} }
......
...@@ -211,7 +211,7 @@ vpx_codec_err_t vp8dx_set_reference(VP8D_COMP *pbi, VP8_REFFRAME ref_frame_flag, ...@@ -211,7 +211,7 @@ vpx_codec_err_t vp8dx_set_reference(VP8D_COMP *pbi, VP8_REFFRAME ref_frame_flag,
} }
/*For ARM NEON, d8-d15 are callee-saved registers, and need to be saved by us.*/ /*For ARM NEON, d8-d15 are callee-saved registers, and need to be saved by us.*/
#if HAVE_ARMV7 #if HAVE_NEON
extern void vp8_push_neon(int64_t *store); extern void vp8_push_neon(int64_t *store);
extern void vp8_pop_neon(int64_t *store); extern void vp8_pop_neon(int64_t *store);
#endif #endif
...@@ -298,7 +298,7 @@ static int swap_frame_buffers (VP8_COMMON *cm) ...@@ -298,7 +298,7 @@ static int swap_frame_buffers (VP8_COMMON *cm)
int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsigned char *source, int64_t time_stamp) int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsigned char *source, int64_t time_stamp)
{ {
#if HAVE_ARMV7 #if HAVE_NEON
int64_t dx_store_reg[8]; int64_t dx_store_reg[8];
#endif #endif
VP8_COMMON *cm = &pbi->common; VP8_COMMON *cm = &pbi->common;
...@@ -387,7 +387,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi ...@@ -387,7 +387,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
return 0; return 0;
} }
#if HAVE_ARMV7 #if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
if (cm->rtcd.flags & HAS_NEON) if (cm->rtcd.flags & HAS_NEON)
#endif #endif
...@@ -400,7 +400,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi ...@@ -400,7 +400,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
if (setjmp(pbi->common.error.jmp)) if (setjmp(pbi->common.error.jmp))
{ {
#if HAVE_ARMV7 #if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
if (cm->rtcd.flags & HAS_NEON) if (cm->rtcd.flags & HAS_NEON)
#endif #endif
...@@ -429,7 +429,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi ...@@ -429,7 +429,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
if (retcode < 0) if (retcode < 0)
{ {
#if HAVE_ARMV7 #if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
if (cm->rtcd.flags & HAS_NEON) if (cm->rtcd.flags & HAS_NEON)
#endif #endif
...@@ -450,7 +450,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi ...@@ -450,7 +450,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
{ {
if (swap_frame_buffers (cm)) if (swap_frame_buffers (cm))
{ {
#if HAVE_ARMV7 #if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
if (cm->rtcd.flags & HAS_NEON) if (cm->rtcd.flags & HAS_NEON)
#endif #endif
...@@ -468,7 +468,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi ...@@ -468,7 +468,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
{ {
if (swap_frame_buffers (cm)) if (swap_frame_buffers (cm))
{ {
#if HAVE_ARMV7 #if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
if (cm->rtcd.flags & HAS_NEON) if (cm->rtcd.flags & HAS_NEON)
#endif #endif
...@@ -558,7 +558,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi ...@@ -558,7 +558,7 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, unsigned long size, const unsi
} }
#endif #endif
#if HAVE_ARMV7 #if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
if (cm->rtcd.flags & HAS_NEON) if (cm->rtcd.flags & HAS_NEON)
#endif #endif
......
...@@ -23,13 +23,13 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi) ...@@ -23,13 +23,13 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
int flags = cpi->common.rtcd.flags; int flags = cpi->common.rtcd.flags;
#if HAVE_ARMV5TE #if HAVE_EDSP
if (flags & HAS_EDSP) if (flags & HAS_EDSP)
{ {
} }
#endif #endif
#if HAVE_ARMV6 #if HAVE_MEDIA
if (flags & HAS_MEDIA) if (flags & HAS_MEDIA)
{ {
cpi->rtcd.variance.sad16x16 = vp8_sad16x16_armv6; cpi->rtcd.variance.sad16x16 = vp8_sad16x16_armv6;
...@@ -74,9 +74,9 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi) ...@@ -74,9 +74,9 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
/*cpi->rtcd.quantize.quantb = vp8_regular_quantize_b;*/ /*cpi->rtcd.quantize.quantb = vp8_regular_quantize_b;*/
cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_armv6; cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_armv6;
} }
#endif #endif /* HAVE_MEDIA */
#if HAVE_ARMV7 #if HAVE_NEON
if (flags & HAS_NEON) if (flags & HAS_NEON)
{ {
cpi->rtcd.variance.sad16x16 = vp8_sad16x16_neon; cpi->rtcd.variance.sad16x16 = vp8_sad16x16_neon;
...@@ -123,10 +123,10 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi) ...@@ -123,10 +123,10 @@ void vp8_arch_arm_encoder_init(VP8_COMP *cpi)
cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_neon; cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_neon;
cpi->rtcd.quantize.fastquantb_pair = vp8_fast_quantize_b_pair_neon; cpi->rtcd.quantize.fastquantb_pair = vp8_fast_quantize_b_pair_neon;
} }
#endif /* HAVE_ARMV7 */ #endif /* HAVE_NEON */
#endif /* CONFIG_RUNTIME_CPU_DETECT */ #endif /* CONFIG_RUNTIME_CPU_DETECT */
#if HAVE_ARMV7 #if HAVE_NEON
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
if (flags & HAS_NEON) if (flags & HAS_NEON)
#endif #endif
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "vpx_config.h" #include "vpx_config.h"
#include "vp8/encoder/dct.h" #include "vp8/encoder/dct.h"
#if HAVE_ARMV6 #if HAVE_MEDIA
void vp8_short_fdct8x4_armv6(short *input, short *output, int pitch) void vp8_short_fdct8x4_armv6(short *input, short *output, int pitch)
{ {
...@@ -19,4 +19,4 @@ void vp8_short_fdct8x4_armv6(short *input, short *output, int pitch) ...@@ -19,4 +19,4 @@ void vp8_short_fdct8x4_armv6(short *input, short *output, int pitch)
vp8_short_fdct4x4_armv6(input + 4, output + 16, pitch); vp8_short_fdct4x4_armv6(input + 4, output + 16, pitch);
}