From 0d842d1de3d8ae2d01d5b7ab3de1d0ee98b8c9c7 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Thu, 25 Apr 2024 09:22:37 +0800 Subject: [PATCH 1/3] add PrivacyInfo.xcprivacy to darwin frameworks. --- sdk/BUILD.gn | 9 +++++++++ sdk/objc/PrivacyInfo.xcprivacy | 14 ++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 sdk/objc/PrivacyInfo.xcprivacy diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 2ad8b84f85..877481a642 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -1353,6 +1353,13 @@ if (is_ios || is_mac) { } } + bundle_data("darwin_privacy_info") { + sources = [ + "objc/PrivacyInfo.xcprivacy", + ] + outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ] + } + if (is_ios) { apple_framework_bundle_with_umbrella_header("framework_objc") { info_plist = "objc/Info.plist" @@ -1489,6 +1496,7 @@ if (is_ios || is_mac) { ":videocapture_objc", ":videocodec_objc", ":videotoolbox_objc", + ":darwin_privacy_info", ] if (rtc_ios_macos_use_opengl_rendering) { deps += [ ":opengl_ui_objc" ] @@ -1646,6 +1654,7 @@ if (is_ios || is_mac) { ":desktopcapture_objc", ":videocodec_objc", ":videotoolbox_objc", + ":darwin_privacy_info", ] if (!build_with_chromium) { deps += [ diff --git a/sdk/objc/PrivacyInfo.xcprivacy b/sdk/objc/PrivacyInfo.xcprivacy new file mode 100644 index 0000000000..0eca193ea7 --- /dev/null +++ b/sdk/objc/PrivacyInfo.xcprivacy @@ -0,0 +1,14 @@ + + + + + NSPrivacyTrackingDomains + + NSPrivacyAccessedAPITypes + + NSPrivacyCollectedDataTypes + + NSPrivacyTracking + + + \ No newline at end of file From 2db1f72f3f90f03acf4f9805f82596225abb21fa Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Thu, 25 Apr 2024 09:24:15 +0800 Subject: [PATCH 2/3] Fix some function naming of yuv helper. --- sdk/objc/helpers/RTCYUVHelper.h | 6 +++--- sdk/objc/helpers/RTCYUVHelper.mm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/objc/helpers/RTCYUVHelper.h b/sdk/objc/helpers/RTCYUVHelper.h index 2e6309c034..ec8ce48355 100644 --- a/sdk/objc/helpers/RTCYUVHelper.h +++ b/sdk/objc/helpers/RTCYUVHelper.h @@ -31,7 +31,7 @@ RTC_OBJC_EXPORT dstV:(uint8_t*)dstV dstStrideV:(int)dstStrideV width:(int)width - width:(int)height + height:(int)height mode:(RTCVideoRotation)mode; + (int)I420ToNV12:(const uint8_t*)srcY @@ -45,7 +45,7 @@ RTC_OBJC_EXPORT dstUV:(uint8_t*)dstUV dstStrideUV:(int)dstStrideUV width:(int)width - width:(int)height; + height:(int)height; + (int)I420ToNV21:(const uint8_t*)srcY srcStrideY:(int)srcStrideY @@ -58,7 +58,7 @@ RTC_OBJC_EXPORT dstUV:(uint8_t*)dstUV dstStrideUV:(int)dstStrideUV width:(int)width - width:(int)height; + height:(int)height; + (int)I420ToARGB:(const uint8_t*)srcY srcStrideY:(int)srcStrideY diff --git a/sdk/objc/helpers/RTCYUVHelper.mm b/sdk/objc/helpers/RTCYUVHelper.mm index 3f610ff990..4a39d469da 100644 --- a/sdk/objc/helpers/RTCYUVHelper.mm +++ b/sdk/objc/helpers/RTCYUVHelper.mm @@ -27,7 +27,7 @@ + (void)I420Rotate:(const uint8_t*)srcY dstV:(uint8_t*)dstV dstStrideV:(int)dstStrideV width:(int)width - width:(int)height + height:(int)height mode:(RTCVideoRotation)mode { libyuv::I420Rotate(srcY, srcStrideY, @@ -57,7 +57,7 @@ + (int)I420ToNV12:(const uint8_t*)srcY dstUV:(uint8_t*)dstUV dstStrideUV:(int)dstStrideUV width:(int)width - width:(int)height { + height:(int)height { return libyuv::I420ToNV12(srcY, srcStrideY, srcU, @@ -83,7 +83,7 @@ + (int)I420ToNV21:(const uint8_t*)srcY dstUV:(uint8_t*)dstUV dstStrideUV:(int)dstStrideUV width:(int)width - width:(int)height { + height:(int)height { return libyuv::I420ToNV21(srcY, srcStrideY, srcU, From c216fa5ea32009d4a639e3028b3e3d08c3d36a69 Mon Sep 17 00:00:00 2001 From: cloudwebrtc Date: Thu, 25 Apr 2024 09:27:19 +0800 Subject: [PATCH 3/3] revert changes. --- sdk/BUILD.gn | 9 --------- sdk/objc/PrivacyInfo.xcprivacy | 14 -------------- 2 files changed, 23 deletions(-) delete mode 100644 sdk/objc/PrivacyInfo.xcprivacy diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 877481a642..2ad8b84f85 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -1353,13 +1353,6 @@ if (is_ios || is_mac) { } } - bundle_data("darwin_privacy_info") { - sources = [ - "objc/PrivacyInfo.xcprivacy", - ] - outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ] - } - if (is_ios) { apple_framework_bundle_with_umbrella_header("framework_objc") { info_plist = "objc/Info.plist" @@ -1496,7 +1489,6 @@ if (is_ios || is_mac) { ":videocapture_objc", ":videocodec_objc", ":videotoolbox_objc", - ":darwin_privacy_info", ] if (rtc_ios_macos_use_opengl_rendering) { deps += [ ":opengl_ui_objc" ] @@ -1654,7 +1646,6 @@ if (is_ios || is_mac) { ":desktopcapture_objc", ":videocodec_objc", ":videotoolbox_objc", - ":darwin_privacy_info", ] if (!build_with_chromium) { deps += [ diff --git a/sdk/objc/PrivacyInfo.xcprivacy b/sdk/objc/PrivacyInfo.xcprivacy deleted file mode 100644 index 0eca193ea7..0000000000 --- a/sdk/objc/PrivacyInfo.xcprivacy +++ /dev/null @@ -1,14 +0,0 @@ - - - - - NSPrivacyTrackingDomains - - NSPrivacyAccessedAPITypes - - NSPrivacyCollectedDataTypes - - NSPrivacyTracking - - - \ No newline at end of file