Merge pull request #538 from mstorsjo/use-apple-builtin-define

Use __APPLE__ instead of APPLE_IOS for apple/arm specific features

volvet committed 12 years ago

Commit 7313ecd2 parents 4bbe61a 9586c5911 files · +16 −16Browse files

Showing the changes to codec/processing/src (2 of 11 files). Show all

Unified · Split

2 files

@@ -34,7 +34,7 @@ · 33 unmodified lines
34	.text	34	.text
35	#include "arm_arch_common_macro.S"	35	#include "arm_arch_common_macro.S"
36		36
37	#ifdef APPLE_IOS	37	#ifdef __APPLE__
38	.macro SQR_ADD_16BYTES	38	.macro SQR_ADD_16BYTES
39	vmull.u8 q3, $0, $0	39	vmull.u8 q3, $0, $0
40	vmull.u8 q8, $1, $1	40	vmull.u8 q8, $1, $1

@@ -34,7 +34,7 @@ · 33 unmodified lines
34	.text	34	.text
35	#include "arm_arch_common_macro.S"	35	#include "arm_arch_common_macro.S"
36		36
37	#ifdef APPLE_IOS	37	#ifdef __APPLE__
38		38
39	.macro ABS_SUB_SUM_16BYTES	39	.macro ABS_SUB_SUM_16BYTES
40	vld1.32 {q15}, [$0], $2	40	vld1.32 {q15}, [$0], $2
@@ -160,7 +160,7 @@ vaa_calc_sad_loop1: · 119 unmodified lines
160	WELS_ASM_FUNC_END	160	WELS_ASM_FUNC_END
161		161
162		162
163	#ifdef APPLE_IOS	163	#ifdef __APPLE__
164	.macro SAD_SD_MAD_16BYTES	164	.macro SAD_SD_MAD_16BYTES
165	vld1.32 {q0}, [$0], $2	165	vld1.32 {q0}, [$0], $2
166	vld1.32 {q1}, [$1], $2	166	vld1.32 {q1}, [$1], $2
@@ -314,7 +314,7 @@ vaa_calc_sad_bgd_loop1: · 147 unmodified lines
314	WELS_ASM_FUNC_END	314	WELS_ASM_FUNC_END
315		315
316		316
317	#ifdef APPLE_IOS	317	#ifdef __APPLE__
318	.macro SSD_MUL_SUM_16BYTES_RESET	318	.macro SSD_MUL_SUM_16BYTES_RESET
319	vmull.u8 $3, $0, $0	319	vmull.u8 $3, $0, $0
320	vpaddl.u16 $2, $3	320	vpaddl.u16 $2, $3
@@ -712,7 +712,7 @@ bne vaa_calc_sad_ssd_bgd_height_loop · 391 unmodified lines
712	WELS_ASM_FUNC_END	712	WELS_ASM_FUNC_END
713		713
714		714
715	#ifdef APPLE_IOS	715	#ifdef __APPLE__
716	.macro SAD_VAR_16	716	.macro SAD_VAR_16
717	vld1.8 {q0}, [$0], $2 //load cur_row	717	vld1.8 {q0}, [$0], $2 //load cur_row
718		718
@@ -971,7 +971,7 @@ bne vaa_calc_sad_var_height_loop · 252 unmodified lines
971	WELS_ASM_FUNC_END	971	WELS_ASM_FUNC_END
972		972
973		973
974	#ifdef APPLE_IOS	974	#ifdef __APPLE__
975	.macro SAD_SSD_16	975	.macro SAD_SSD_16
976	SAD_VAR_16 $0, $1, $2, $3	976	SAD_VAR_16 $0, $1, $2, $3
977		977

Keyboard shortcuts