From 68d0f46ec056c718f7dc88bdbe707ac32df0b7eb Mon Sep 17 00:00:00 2001 From: Johann Date: Wed, 11 Jan 2017 10:17:14 -0800 Subject: [PATCH] arm idct16x16: remove extra config guards This file is guarded by HAVE_NEON_ASM in the .mk file now. Change-Id: I513a621c234aa90ad52e426c8ed494d8a7d4b74a --- vpx_dsp/arm/idct16x16_neon.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/vpx_dsp/arm/idct16x16_neon.c b/vpx_dsp/arm/idct16x16_neon.c index 47366bcb7..e10d2d544 100644 --- a/vpx_dsp/arm/idct16x16_neon.c +++ b/vpx_dsp/arm/idct16x16_neon.c @@ -35,24 +35,18 @@ void vpx_idct16x16_10_add_neon_pass1(const tran_low_t *input, int16_t *output); void vpx_idct16x16_10_add_neon_pass2(const tran_low_t *src, int16_t *output, int16_t *pass1_output); -#if HAVE_NEON_ASM /* For ARM NEON, d8-d15 are callee-saved registers, and need to be saved. */ extern void vpx_push_neon(int64_t *store); extern void vpx_pop_neon(int64_t *store); -#endif // HAVE_NEON_ASM void vpx_idct16x16_256_add_neon(const tran_low_t *input, uint8_t *dest, int stride) { -#if HAVE_NEON_ASM int64_t store_reg[8]; -#endif int16_t pass1_output[16 * 16] = { 0 }; int16_t row_idct_output[16 * 16] = { 0 }; -#if HAVE_NEON_ASM // save d8-d15 register values. vpx_push_neon(store_reg); -#endif /* Parallel idct on the upper 8 rows */ // First pass processes even elements 0, 2, 4, 6, 8, 10, 12, 14 and save the @@ -99,24 +93,18 @@ void vpx_idct16x16_256_add_neon(const tran_low_t *input, uint8_t *dest, row_idct_output + 8, pass1_output, 1, dest + 8, stride); -#if HAVE_NEON_ASM // restore d8-d15 register values. vpx_pop_neon(store_reg); -#endif } void vpx_idct16x16_10_add_neon(const tran_low_t *input, uint8_t *dest, int stride) { -#if HAVE_NEON_ASM int64_t store_reg[8]; -#endif int16_t pass1_output[16 * 16] = { 0 }; int16_t row_idct_output[16 * 16] = { 0 }; -#if HAVE_NEON_ASM // save d8-d15 register values. vpx_push_neon(store_reg); -#endif /* Parallel idct on the upper 8 rows */ // First pass processes even elements 0, 2, 4, 6, 8, 10, 12, 14 and save the @@ -153,8 +141,6 @@ void vpx_idct16x16_10_add_neon(const tran_low_t *input, uint8_t *dest, row_idct_output + 8, pass1_output, 1, dest + 8, stride); -#if HAVE_NEON_ASM // restore d8-d15 register values. vpx_pop_neon(store_reg); -#endif } -- 2.40.0