Nico Grunbaum
f611f04f29
Upstream commit: https://webrtc.googlesource.com/src/+/5d46eb3670bfa46bf12bfc56e93e41a009d84e53 Remove rusty base64 implementation This demonstration of rust is no longer needed. Bug: webrtc:416446214 Change-Id: I683234691c9d9527a0aa562519caadcb6a6a6964 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/470000 Commit-Queue: Evan Shrubsole <eshr@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47645}
79 lines
1.9 KiB
Diff
79 lines
1.9 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Mon, 12 Dec 2022 15:47:00 +0000
|
|
Subject: Bug 1451394 - Expose mac camera capture backend in .gn and switch it
|
|
to gecko libyuv. r=webrtc-reviewers,mjf
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D163682
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b0658888969395dca938597783c8a377b9bea209
|
|
---
|
|
BUILD.gn | 4 ++++
|
|
sdk/BUILD.gn | 6 ++++++
|
|
2 files changed, 10 insertions(+)
|
|
|
|
diff --git a/BUILD.gn b/BUILD.gn
|
|
index 4ed38ce6de..e373a8c45b 100644
|
|
--- a/BUILD.gn
|
|
+++ b/BUILD.gn
|
|
@@ -629,6 +629,10 @@ if (!build_with_chromium) {
|
|
]
|
|
}
|
|
|
|
+ if (build_with_mozilla && is_mac) {
|
|
+ deps += [ "sdk:videocapture_objc" ]
|
|
+ }
|
|
+
|
|
if (rtc_enable_protobuf) {
|
|
deps += [ "logging:rtc_event_log_proto" ]
|
|
}
|
|
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
|
|
index d726ee67ae..20ebf06fe9 100644
|
|
--- a/sdk/BUILD.gn
|
|
+++ b/sdk/BUILD.gn
|
|
@@ -566,6 +566,7 @@ if (is_ios || is_mac) {
|
|
}
|
|
}
|
|
|
|
+ if (!build_with_mozilla) {
|
|
rtc_library("videosource_objc") {
|
|
sources = [
|
|
"objc/api/peerconnection/RTCVideoSource+Private.h",
|
|
@@ -594,6 +595,7 @@ if (is_ios || is_mac) {
|
|
":used_from_extension",
|
|
]
|
|
}
|
|
+ }
|
|
|
|
rtc_library("videoframebuffer_objc") {
|
|
visibility = [ "*" ]
|
|
@@ -626,6 +628,7 @@ if (is_ios || is_mac) {
|
|
]
|
|
}
|
|
|
|
+ if (!build_with_mozilla) {
|
|
rtc_library("metal_objc") {
|
|
visibility = [ "*" ]
|
|
allow_poison = [
|
|
@@ -688,6 +691,7 @@ if (is_ios || is_mac) {
|
|
":videoframebuffer_objc",
|
|
]
|
|
}
|
|
+ }
|
|
|
|
rtc_library("videocapture_objc") {
|
|
visibility = [ "*" ]
|
|
@@ -716,6 +720,7 @@ if (is_ios || is_mac) {
|
|
]
|
|
}
|
|
|
|
+ if (!build_with_mozilla) {
|
|
rtc_library("videocodec_objc") {
|
|
visibility = [ "*" ]
|
|
configs += [ "..:no_global_constructors" ]
|
|
@@ -1841,5 +1846,6 @@ if (is_ios || is_mac) {
|
|
"VideoToolbox.framework",
|
|
]
|
|
}
|
|
+ }
|
|
}
|
|
}
|