Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add RTCYUVHelper for iOS and MacOS #107

Merged
merged 5 commits into from
Jun 28, 2024
Merged

Add RTCYUVHelper for iOS and MacOS #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23e231d
feat: add libyuv helper for iOS and MacOS
evdokimovs Jun 27, 2024
2edae0c
refactor: fix patch
evdokimovs Jun 27, 2024
5e8b2f3
refactor: fix build
evdokimovs Jun 27, 2024
369427d
refactor: fix patch
evdokimovs Jun 28, 2024
ece3f70
refactor: return patch for MacOS
evdokimovs Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build/ios/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ package:
patch: common-patch
cd $(SRC_DIR) && \
patch -p2 < $(PATCH_DIR)/enable_ios_scalability_mode.patch && \
patch -p2 < $(PATCH_DIR)/fix_ios_capability.patch
patch -p2 < $(PATCH_DIR)/fix_ios_capability.patch && \
patch -p2 < $(PATCH_DIR)/add_yuv_helper_ios_mac.patch

.PHONY: build
build: patch
Expand Down
2 changes: 2 additions & 0 deletions build/macos-arm64/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ copy: common-copy

.PHONY: patch
patch: common-patch
cd $(SRC_DIR) && \
patch -p2 < $(PATCH_DIR)/add_yuv_helper_ios_mac.patch

.PHONY: build
build: patch
Expand Down
2 changes: 2 additions & 0 deletions build/macos-x64/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ copy: common-copy

.PHONY: patch
patch: common-patch
cd $(SRC_DIR) && \
patch -p2 < $(PATCH_DIR)/add_yuv_helper_ios_mac.patch

.PHONY: build
build: patch
Expand Down
344 changes: 344 additions & 0 deletions patch/add_yuv_helper_ios_mac.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,344 @@
diff --git a/src/sdk/BUILD.gn b/src/sdk/BUILD.gn
index 4fe4bff..e3d2d44 100644
--- a/src/sdk/BUILD.gn
+++ b/src/sdk/BUILD.gn
@@ -146,11 +146,14 @@ if (is_ios || is_mac) {
"objc/helpers/RTCDispatcher.h",
"objc/helpers/RTCDispatcher.m",
"objc/helpers/scoped_cftyperef.h",
+ "objc/helpers/RTCYUVHelper.h",
+ "objc/helpers/RTCYUVHelper.mm",
]

deps = [
":base_objc",
"../rtc_base:checks",
+ "//third_party/libyuv",
]

absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
@@ -1303,6 +1306,7 @@ if (is_ios || is_mac) {
"objc/components/video_frame_buffer/RTCCVPixelBuffer.h",
"objc/helpers/RTCCameraPreviewView.h",
"objc/helpers/RTCDispatcher.h",
+ "objc/helpers/RTCYUVHelper.h",
"objc/helpers/UIDevice+RTCDevice.h",
"objc/api/peerconnection/RTCAudioSource.h",
"objc/api/peerconnection/RTCAudioTrack.h",
@@ -1503,6 +1507,7 @@ if (is_ios || is_mac) {
"objc/components/video_codec/RTCVideoEncoderH264.h",
"objc/components/video_frame_buffer/RTCCVPixelBuffer.h",
"objc/helpers/RTCDispatcher.h",
+ "objc/helpers/RTCYUVHelper.h",
]
if (!build_with_chromium) {
sources += [
diff --git a/src/sdk/objc/helpers/RTCYUVHelper.h b/src/sdk/objc/helpers/RTCYUVHelper.h
new file mode 100644
index 0000000..2e6309c
--- /dev/null
+++ b/src/sdk/objc/helpers/RTCYUVHelper.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import "RTCMacros.h"
+#import "RTCVideoFrame.h"
+
+RTC_OBJC_EXPORT
+@interface RTC_OBJC_TYPE (RTCYUVHelper) : NSObject
+
+- (instancetype)init NS_UNAVAILABLE;
+
++ (void)I420Rotate:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstY:(uint8_t*)dstY
+ dstStrideY:(int)dstStrideY
+ dstU:(uint8_t*)dstU
+ dstStrideU:(int)dstStrideU
+ dstV:(uint8_t*)dstV
+ dstStrideV:(int)dstStrideV
+ width:(int)width
+ width:(int)height
+ mode:(RTCVideoRotation)mode;
+
++ (int)I420ToNV12:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstY:(uint8_t*)dstY
+ dstStrideY:(int)dstStrideY
+ dstUV:(uint8_t*)dstUV
+ dstStrideUV:(int)dstStrideUV
+ width:(int)width
+ width:(int)height;
+
++ (int)I420ToNV21:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstY:(uint8_t*)dstY
+ dstStrideY:(int)dstStrideY
+ dstUV:(uint8_t*)dstUV
+ dstStrideUV:(int)dstStrideUV
+ width:(int)width
+ width:(int)height;
+
++ (int)I420ToARGB:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstARGB:(uint8_t*)dstARGB
+ dstStrideARGB:(int)dstStrideARGB
+ width:(int)width
+ height:(int)height;
+
++ (int)I420ToBGRA:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstBGRA:(uint8_t*)dstBGRA
+ dstStrideBGRA:(int)dstStrideBGRA
+ width:(int)width
+ height:(int)height;
+
++ (int)I420ToABGR:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstABGR:(uint8_t*)dstABGR
+ dstStrideABGR:(int)dstStrideABGR
+ width:(int)width
+ height:(int)height;
+
++ (int)I420ToRGBA:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstRGBA:(uint8_t*)dstRGBA
+ dstStrideRGBA:(int)dstStrideRGBA
+ width:(int)width
+ height:(int)height;
+
++ (int)I420ToRGB24:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstRGB24:(uint8_t*)dstRGB24
+ dstStrideRGB24:(int)dstStrideRGB24
+ width:(int)width
+ height:(int)height;
+
+@end
diff --git a/src/sdk/objc/helpers/RTCYUVHelper.mm b/src/sdk/objc/helpers/RTCYUVHelper.mm
new file mode 100644
index 0000000..3f610ff
--- /dev/null
+++ b/src/sdk/objc/helpers/RTCYUVHelper.mm
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#import "RTCYUVHelper.h"
+
+#include "third_party/libyuv/include/libyuv.h"
+
+@implementation RTC_OBJC_TYPE (RTCYUVHelper)
+
++ (void)I420Rotate:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstY:(uint8_t*)dstY
+ dstStrideY:(int)dstStrideY
+ dstU:(uint8_t*)dstU
+ dstStrideU:(int)dstStrideU
+ dstV:(uint8_t*)dstV
+ dstStrideV:(int)dstStrideV
+ width:(int)width
+ width:(int)height
+ mode:(RTCVideoRotation)mode {
+ libyuv::I420Rotate(srcY,
+ srcStrideY,
+ srcU,
+ srcStrideU,
+ srcV,
+ srcStrideV,
+ dstY,
+ dstStrideY,
+ dstU,
+ dstStrideU,
+ dstV,
+ dstStrideV,
+ width,
+ height,
+ (libyuv::RotationMode)mode);
+}
+
++ (int)I420ToNV12:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstY:(uint8_t*)dstY
+ dstStrideY:(int)dstStrideY
+ dstUV:(uint8_t*)dstUV
+ dstStrideUV:(int)dstStrideUV
+ width:(int)width
+ width:(int)height {
+ return libyuv::I420ToNV12(srcY,
+ srcStrideY,
+ srcU,
+ srcStrideU,
+ srcV,
+ srcStrideV,
+ dstY,
+ dstStrideY,
+ dstUV,
+ dstStrideUV,
+ width,
+ height);
+}
+
++ (int)I420ToNV21:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstY:(uint8_t*)dstY
+ dstStrideY:(int)dstStrideY
+ dstUV:(uint8_t*)dstUV
+ dstStrideUV:(int)dstStrideUV
+ width:(int)width
+ width:(int)height {
+ return libyuv::I420ToNV21(srcY,
+ srcStrideY,
+ srcU,
+ srcStrideU,
+ srcV,
+ srcStrideV,
+ dstY,
+ dstStrideY,
+ dstUV,
+ dstStrideUV,
+ width,
+ height);
+}
+
++ (int)I420ToARGB:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstARGB:(uint8_t*)dstARGB
+ dstStrideARGB:(int)dstStrideARGB
+ width:(int)width
+ height:(int)height {
+ return libyuv::I420ToARGB(
+ srcY, srcStrideY, srcU, srcStrideU, srcV, srcStrideV, dstARGB, dstStrideARGB, width, height);
+}
+
++ (int)I420ToBGRA:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstBGRA:(uint8_t*)dstBGRA
+ dstStrideBGRA:(int)dstStrideBGRA
+ width:(int)width
+ height:(int)height {
+ return libyuv::I420ToBGRA(
+ srcY, srcStrideY, srcU, srcStrideU, srcV, srcStrideV, dstBGRA, dstStrideBGRA, width, height);
+}
+
++ (int)I420ToABGR:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstABGR:(uint8_t*)dstABGR
+ dstStrideABGR:(int)dstStrideABGR
+ width:(int)width
+ height:(int)height {
+ return libyuv::I420ToABGR(
+ srcY, srcStrideY, srcU, srcStrideU, srcV, srcStrideV, dstABGR, dstStrideABGR, width, height);
+}
+
++ (int)I420ToRGBA:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstRGBA:(uint8_t*)dstRGBA
+ dstStrideRGBA:(int)dstStrideRGBA
+ width:(int)width
+ height:(int)height {
+ return libyuv::I420ToRGBA(
+ srcY, srcStrideY, srcU, srcStrideU, srcV, srcStrideV, dstRGBA, dstStrideRGBA, width, height);
+}
+
++ (int)I420ToRGB24:(const uint8_t*)srcY
+ srcStrideY:(int)srcStrideY
+ srcU:(const uint8_t*)srcU
+ srcStrideU:(int)srcStrideU
+ srcV:(const uint8_t*)srcV
+ srcStrideV:(int)srcStrideV
+ dstRGB24:(uint8_t*)dstRGB24
+ dstStrideRGB24:(int)dstStrideRGB24
+ width:(int)width
+ height:(int)height {
+ return libyuv::I420ToRGB24(srcY,
+ srcStrideY,
+ srcU,
+ srcStrideU,
+ srcV,
+ srcStrideV,
+ dstRGB24,
+ dstStrideRGB24,
+ width,
+ height);
+}
+
+@end