06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
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 f67e79408d..a760062978 100644
|
|
--- a/BUILD.gn
|
|
+++ b/BUILD.gn
|
|
@@ -632,6 +632,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 e76b68c92e..627e59cfed 100644
|
|
--- a/sdk/BUILD.gn
|
|
+++ b/sdk/BUILD.gn
|
|
@@ -539,6 +539,7 @@ if (is_ios || is_mac) {
|
|
}
|
|
}
|
|
|
|
+ if (!build_with_mozilla) {
|
|
rtc_library("videosource_objc") {
|
|
sources = [
|
|
"objc/api/peerconnection/RTCVideoSource+Private.h",
|
|
@@ -568,6 +569,7 @@ if (is_ios || is_mac) {
|
|
":used_from_extension",
|
|
]
|
|
}
|
|
+ }
|
|
|
|
rtc_library("videoframebuffer_objc") {
|
|
visibility = [ "*" ]
|
|
@@ -600,6 +602,7 @@ if (is_ios || is_mac) {
|
|
]
|
|
}
|
|
|
|
+ if (!build_with_mozilla) {
|
|
rtc_library("metal_objc") {
|
|
visibility = [ "*" ]
|
|
allow_poison = [
|
|
@@ -661,6 +664,7 @@ if (is_ios || is_mac) {
|
|
":videoframebuffer_objc",
|
|
]
|
|
}
|
|
+ }
|
|
|
|
rtc_library("videocapture_objc") {
|
|
visibility = [ "*" ]
|
|
@@ -689,6 +693,7 @@ if (is_ios || is_mac) {
|
|
]
|
|
}
|
|
|
|
+ if (!build_with_mozilla) {
|
|
rtc_library("videocodec_objc") {
|
|
visibility = [ "*" ]
|
|
configs += [ "..:no_global_constructors" ]
|
|
@@ -1781,5 +1786,6 @@ if (is_ios || is_mac) {
|
|
"VideoToolbox.framework",
|
|
]
|
|
}
|
|
+ }
|
|
}
|
|
}
|