generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use __APPLE__ instead of APPLE_IOS in the arm assembly sources

Browse Source
This commit is contained in:
Martin Storsjö
2014-03-01 01:13:51 +02:00
parent 73ed237d73
commit 9586c59b9e
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codec/common/arm_arch_common_macro.S
View File

@@ -30,7 +30,7 @@
* *
*/ */
#ifdef APPLE_IOS #ifdef __APPLE__
.macro WELS_ASM_FUNC_BEGIN .macro WELS_ASM_FUNC_BEGIN
.align 2 .align 2

4
codec/common/deblocking_neon.S
View File

@@ -35,7 +35,7 @@
#include "arm_arch_common_macro.S" #include "arm_arch_common_macro.S"
#ifdef APPLE_IOS #ifdef __APPLE__
.macro JMP_IF_128BITS_IS_ZERO .macro JMP_IF_128BITS_IS_ZERO
vorr.s16 $2, $0, $1 vorr.s16 $2, $0, $1
vmov r3, r2, $2 vmov r3, r2, $2
@@ -821,7 +821,7 @@ WELS_ASM_FUNC_BEGIN WelsNonZeroCount_neon
vst1.64 {d0-d2}, [r0] vst1.64 {d0-d2}, [r0]
WELS_ASM_FUNC_END WELS_ASM_FUNC_END
#ifdef APPLE_IOS #ifdef __APPLE__
.macro BS_NZC_CHECK .macro BS_NZC_CHECK
vld1.8 {d0,d1}, [$0] vld1.8 {d0,d1}, [$0]
/* Arrenge the input data --- TOP */ /* Arrenge the input data --- TOP */

2
codec/common/mc_neon.S
View File

@@ -34,7 +34,7 @@
.text .text
#include "arm_arch_common_macro.S" #include "arm_arch_common_macro.S"
#ifdef APPLE_IOS #ifdef __APPLE__
.macro AVERAGE_TWO_8BITS .macro AVERAGE_TWO_8BITS
// { // input:dst_d, src_d A and B; working: q13 // { // input:dst_d, src_d A and B; working: q13
vaddl.u8 q13, $2, $1 vaddl.u8 q13, $2, $1

2
codec/decoder/core/arm/block_add_neon.S
View File

@@ -33,7 +33,7 @@
#ifdef HAVE_NEON #ifdef HAVE_NEON
.text .text
#include "arm_arch_common_macro.S" #include "arm_arch_common_macro.S"
#ifdef APPLE_IOS #ifdef __APPLE__
.macro ROW_TRANSFORM_1_STEP .macro ROW_TRANSFORM_1_STEP
// { // input: src_d[0]~[3], output: e_q[0]~[3]; working: $8 $9 // { // input: src_d[0]~[3], output: e_q[0]~[3]; working: $8 $9

2
codec/decoder/core/arm/intra_pred_neon.S
View File

@@ -35,7 +35,7 @@
.text .text
#include "arm_arch_common_macro.S" #include "arm_arch_common_macro.S"
#ifdef APPLE_IOS #ifdef __APPLE__
//Global macro //Global macro
.macro GET_8BYTE_DATA .macro GET_8BYTE_DATA
vld1.8 {$0[0]}, [$1], $2 vld1.8 {$0[0]}, [$1], $2

2
codec/encoder/core/arm/intra_pred_neon.S
View File

@@ -35,7 +35,7 @@
#include "arm_arch_common_macro.S" #include "arm_arch_common_macro.S"
#ifdef APPLE_IOS #ifdef __APPLE__
//Global macro //Global macro
.macro GET_8BYTE_DATA .macro GET_8BYTE_DATA
vld1.8 {$0[0]}, [$1], $2 vld1.8 {$0[0]}, [$1], $2

2
codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S
View File

@@ -35,7 +35,7 @@
#include "arm_arch_common_macro.S" #include "arm_arch_common_macro.S"
#ifdef APPLE_IOS #ifdef __APPLE__
//The data sequence will be used //The data sequence will be used
.macro GET_8BYTE_DATA_L0 .macro GET_8BYTE_DATA_L0
vld1.8 {$0[0]}, [$1], $2 vld1.8 {$0[0]}, [$1], $2

2
codec/encoder/core/arm/reconstruct_neon.S
View File

@@ -34,7 +34,7 @@
.text .text
#include "arm_arch_common_macro.S" #include "arm_arch_common_macro.S"
#ifdef APPLE_IOS #ifdef __APPLE__
.macro LOAD_ALIGNED_DATA_WITH_STRIDE .macro LOAD_ALIGNED_DATA_WITH_STRIDE
// { // input: $0~$3, src*, src_stride // { // input: $0~$3, src*, src_stride
vld1.64 {$0}, [$4,:128], $5 vld1.64 {$0}, [$4,:128], $5

2
codec/processing/src/arm/adaptive_quantization.S
View File

@@ -34,7 +34,7 @@
.text .text
#include "arm_arch_common_macro.S" #include "arm_arch_common_macro.S"
#ifdef APPLE_IOS #ifdef __APPLE__
.macro SQR_ADD_16BYTES .macro SQR_ADD_16BYTES
vmull.u8 q3, $0, $0 vmull.u8 q3, $0, $0
vmull.u8 q8, $1, $1 vmull.u8 q8, $1, $1

10
codec/processing/src/arm/vaa_calc_neon.S
View File

@@ -34,7 +34,7 @@
.text .text
#include "arm_arch_common_macro.S" #include "arm_arch_common_macro.S"
#ifdef APPLE_IOS #ifdef __APPLE__
.macro ABS_SUB_SUM_16BYTES .macro ABS_SUB_SUM_16BYTES
vld1.32 {q15}, [$0], $2 vld1.32 {q15}, [$0], $2
@@ -160,7 +160,7 @@ vaa_calc_sad_loop1:
WELS_ASM_FUNC_END WELS_ASM_FUNC_END
#ifdef APPLE_IOS #ifdef __APPLE__
.macro SAD_SD_MAD_16BYTES .macro SAD_SD_MAD_16BYTES
vld1.32 {q0}, [$0], $2 vld1.32 {q0}, [$0], $2
vld1.32 {q1}, [$1], $2 vld1.32 {q1}, [$1], $2
@@ -314,7 +314,7 @@ vaa_calc_sad_bgd_loop1:
WELS_ASM_FUNC_END WELS_ASM_FUNC_END
#ifdef APPLE_IOS #ifdef __APPLE__
.macro SSD_MUL_SUM_16BYTES_RESET .macro SSD_MUL_SUM_16BYTES_RESET
vmull.u8 $3, $0, $0 vmull.u8 $3, $0, $0
vpaddl.u16 $2, $3 vpaddl.u16 $2, $3
@@ -712,7 +712,7 @@ bne vaa_calc_sad_ssd_bgd_height_loop
WELS_ASM_FUNC_END WELS_ASM_FUNC_END
#ifdef APPLE_IOS #ifdef __APPLE__
.macro SAD_VAR_16 .macro SAD_VAR_16
vld1.8 {q0}, [$0], $2 //load cur_row vld1.8 {q0}, [$0], $2 //load cur_row
@@ -971,7 +971,7 @@ bne vaa_calc_sad_var_height_loop
WELS_ASM_FUNC_END WELS_ASM_FUNC_END
#ifdef APPLE_IOS #ifdef __APPLE__
.macro SAD_SSD_16 .macro SAD_SSD_16
SAD_VAR_16 $0, $1, $2, $3 SAD_VAR_16 $0, $1, $2, $3