a1e796bc69
Upstream commit: https://webrtc.googlesource.com/src/+/c896e3a5b59e0169e5bc6fcf3dee9dd4a9834b8e Cleanup implemenation of AudioState SetRecording/SetPlayout vs. Add/Remove {Send/Recv}stream So that they behave in the most obvious ways: Set{Recording/Playout} = TRUE - Enables {Recording/Playout} is there are {Send/Recv} streams - Set state variable Set{Recording/Plaout} = FALSE - Disable {Recording/Playout} - Set state variable Add {Send/Recv} stream - Enables {Recording/Playout} if state variable is TRUE - Otherwise does nothing Remove {Send/Recv} stream - Disable {Recording/Playout} if last stream - Otherwise does nothing --- Before this patch the behavior was hard to non obvious, e.g SetRecording(false) followed by SetRecording(true) did not work (same for playout). BUG=b/397376626 Change-Id: I530497d4a46ad73334fcb3d73f4b87264bd18486 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378740 Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org> Commit-Queue: Jonas Oreland <jonaso@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#44025} Differential Revision: https://phabricator.services.mozilla.com/D244036
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
From: Nico Grunbaum <na-g@nostrum.com>
|
|
Date: Thu, 2 May 2024 00:47:00 -0700
|
|
Subject: Bug 1892299 - fix-afaae4e38a - fix adapted_track_source build
|
|
exclusion;r?mjf
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/60304c5d8a86fdecfe7527e75629dbc65fc9cbc1
|
|
---
|
|
media/BUILD.gn | 17 +++++++++++------
|
|
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/media/BUILD.gn b/media/BUILD.gn
|
|
index 655b155c6a..39b31d16ce 100644
|
|
--- a/media/BUILD.gn
|
|
+++ b/media/BUILD.gn
|
|
@@ -55,6 +55,11 @@ rtc_library("rtc_media_base") {
|
|
"base/video_broadcaster.h", # Used downstream
|
|
"base/video_common.h", # Used downstream
|
|
]
|
|
+ if (build_with_mozilla) {
|
|
+ sources -= [
|
|
+ "base/adapted_video_track_source.h",
|
|
+ ]
|
|
+ }
|
|
deps = [
|
|
":adapted_video_track_source",
|
|
":codec",
|
|
@@ -127,12 +132,6 @@ rtc_library("rtc_media_base") {
|
|
"../video/config:encoder_config",
|
|
"//third_party/abseil-cpp/absl/base:core_headers",
|
|
]
|
|
- if (build_with_mozilla) {
|
|
- sources -= [
|
|
- "base/adapted_video_track_source.cc",
|
|
- "base/adapted_video_track_source.h",
|
|
- ]
|
|
- }
|
|
}
|
|
|
|
rtc_library("adapted_video_track_source") {
|
|
@@ -140,6 +139,12 @@ rtc_library("adapted_video_track_source") {
|
|
"base/adapted_video_track_source.cc",
|
|
"base/adapted_video_track_source.h",
|
|
]
|
|
+ if (build_with_mozilla) {
|
|
+ sources -= [
|
|
+ "base/adapted_video_track_source.cc",
|
|
+ "base/adapted_video_track_source.h",
|
|
+ ]
|
|
+ }
|
|
deps = [
|
|
":video_adapter",
|
|
":video_broadcaster",
|