shithub: openh264

Download patch

ref: 9586c59b9eb183f6b1e884b730bf037f9c10511a
parent: 73ed237d732916bfe78b7c8cce62ff4c4e1f62c2
author: Martin Storsjö <[email protected]>
date: Fri Feb 28 20:13:51 EST 2014 

Use __APPLE__ instead of APPLE_IOS in the arm assembly sources


--- a/codec/common/arm_arch_common_macro.S
+++ b/codec/common/arm_arch_common_macro.S
@@ -30,7 +30,7 @@
  *
  */
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 
 .macro WELS_ASM_FUNC_BEGIN
 .align 2
--- a/codec/common/deblocking_neon.S
+++ b/codec/common/deblocking_neon.S
@@ -35,7 +35,7 @@
 
 #include "arm_arch_common_macro.S"
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 .macro	JMP_IF_128BITS_IS_ZERO
     vorr.s16	$2, $0, $1
     vmov		r3, r2, $2
@@ -821,7 +821,7 @@
     vst1.64	{d0-d2}, [r0]
 WELS_ASM_FUNC_END
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 .macro BS_NZC_CHECK
     vld1.8   {d0,d1}, [$0]
     /* Arrenge the input data --- TOP */
--- a/codec/common/mc_neon.S
+++ b/codec/common/mc_neon.S
@@ -34,7 +34,7 @@
 .text
 #include "arm_arch_common_macro.S"
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 .macro	AVERAGE_TWO_8BITS
 //	{	// input:dst_d, src_d A and B; working: q13
     vaddl.u8	q13, $2, $1
--- a/codec/decoder/core/arm/block_add_neon.S
+++ b/codec/decoder/core/arm/block_add_neon.S
@@ -33,7 +33,7 @@
 #ifdef HAVE_NEON
 .text
 #include "arm_arch_common_macro.S"
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 
 .macro	ROW_TRANSFORM_1_STEP
 //	{	//	input: src_d[0]~[3], output: e_q[0]~[3]; working: $8 $9
--- a/codec/decoder/core/arm/intra_pred_neon.S
+++ b/codec/decoder/core/arm/intra_pred_neon.S
@@ -35,7 +35,7 @@
 .text
 #include "arm_arch_common_macro.S"
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 //Global macro
 .macro GET_8BYTE_DATA
 	vld1.8 {$0[0]}, [$1], $2
--- a/codec/encoder/core/arm/intra_pred_neon.S
+++ b/codec/encoder/core/arm/intra_pred_neon.S
@@ -35,7 +35,7 @@
 
 #include "arm_arch_common_macro.S"
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 //Global macro
 .macro GET_8BYTE_DATA
 	vld1.8 {$0[0]}, [$1], $2
--- a/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S
+++ b/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S
@@ -35,7 +35,7 @@
 #include "arm_arch_common_macro.S"
 
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
  //The data sequence will be used
 .macro GET_8BYTE_DATA_L0
 	vld1.8 {$0[0]}, [$1], $2
--- a/codec/encoder/core/arm/reconstruct_neon.S
+++ b/codec/encoder/core/arm/reconstruct_neon.S
@@ -34,7 +34,7 @@
 .text
 #include "arm_arch_common_macro.S"
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 .macro	LOAD_ALIGNED_DATA_WITH_STRIDE
 //	{	//	input: $0~$3, src*, src_stride
     vld1.64	{$0}, [$4,:128], $5
--- a/codec/processing/src/arm/adaptive_quantization.S
+++ b/codec/processing/src/arm/adaptive_quantization.S
@@ -34,7 +34,7 @@
 .text
 #include "arm_arch_common_macro.S"
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 .macro SQR_ADD_16BYTES
 	vmull.u8 q3, $0, $0
 	vmull.u8 q8, $1, $1
--- a/codec/processing/src/arm/vaa_calc_neon.S
+++ b/codec/processing/src/arm/vaa_calc_neon.S
@@ -34,7 +34,7 @@
 .text
 #include "arm_arch_common_macro.S"
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 
 .macro ABS_SUB_SUM_16BYTES
 	vld1.32 {q15}, [$0], $2
@@ -160,7 +160,7 @@
 WELS_ASM_FUNC_END
 
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 .macro  SAD_SD_MAD_16BYTES
 	vld1.32 {q0}, [$0], $2
 	vld1.32 {q1}, [$1], $2
@@ -314,7 +314,7 @@
 WELS_ASM_FUNC_END
 
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 .macro  SSD_MUL_SUM_16BYTES_RESET
 	vmull.u8 $3, $0, $0
 	vpaddl.u16 $2, $3
@@ -712,7 +712,7 @@
 WELS_ASM_FUNC_END
 
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 .macro SAD_VAR_16
 	vld1.8 {q0}, [$0], $2 //load cur_row
 
@@ -971,7 +971,7 @@
 WELS_ASM_FUNC_END
 
 
-#ifdef APPLE_IOS
+#ifdef __APPLE__
 .macro SAD_SSD_16
 	SAD_VAR_16 $0, $1, $2, $3