From bc0e5dc32df3bd3570935d84de48fcd9eb5fbeda Mon Sep 17 00:00:00 2001 From: Jan-Ivar Bruaroey Date: Sat, 10 Feb 2024 17:39:10 -0500 Subject: [PATCH] Bug 1876843 - Vendor libwebrtc from 034120ea70 Upstream commit: https://webrtc.googlesource.com/src/+/034120ea7060b93aeed96ff5e8476f20d07d4e7a Set isActive to false only when AVAudioSession is set. bug: webrtc:15697 Change-Id: I364fa1f3a444fce70607e7d9338636f720d86aff Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/329342 Commit-Queue: Abby Yeh Reviewed-by: Peter Hanspers Cr-Commit-Position: refs/heads/main@{#41296} --- third_party/libwebrtc/README.moz-ff-commit | 3 +++ third_party/libwebrtc/README.mozilla | 2 ++ .../libwebrtc/sdk/objc/components/audio/RTCAudioSession.mm | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/third_party/libwebrtc/README.moz-ff-commit b/third_party/libwebrtc/README.moz-ff-commit index 98530cccedc2..da29f643979b 100644 --- a/third_party/libwebrtc/README.moz-ff-commit +++ b/third_party/libwebrtc/README.moz-ff-commit @@ -27612,3 +27612,6 @@ c0eac979ca # MOZ_LIBWEBRTC_SRC=/Users/jan-ivar/moz/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh # base of lastest vendoring c03d8b6cf3 +# MOZ_LIBWEBRTC_SRC=/Users/jan-ivar/moz/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh +# base of lastest vendoring +034120ea70 diff --git a/third_party/libwebrtc/README.mozilla b/third_party/libwebrtc/README.mozilla index 881316746859..33250b2fabf9 100644 --- a/third_party/libwebrtc/README.mozilla +++ b/third_party/libwebrtc/README.mozilla @@ -18432,3 +18432,5 @@ libwebrtc updated from /Users/jan-ivar/moz/elm/.moz-fast-forward/moz-libwebrtc c libwebrtc updated from /Users/jan-ivar/moz/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-02-10T22:36:24.337450. # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/jan-ivar/moz/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc libwebrtc updated from /Users/jan-ivar/moz/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-02-10T22:37:27.076521. +# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/jan-ivar/moz/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc +libwebrtc updated from /Users/jan-ivar/moz/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-02-10T22:38:59.734968. diff --git a/third_party/libwebrtc/sdk/objc/components/audio/RTCAudioSession.mm b/third_party/libwebrtc/sdk/objc/components/audio/RTCAudioSession.mm index f6b91d540905..641d2ed8c7bc 100644 --- a/third_party/libwebrtc/sdk/objc/components/audio/RTCAudioSession.mm +++ b/third_party/libwebrtc/sdk/objc/components/audio/RTCAudioSession.mm @@ -399,8 +399,10 @@ ABSL_CONST_INIT thread_local bool mutex_locked = false; // Set isActive and decrement activation count on deactivation // whether or not it succeeded. if (!active) { - self.isActive = active; - [self notifyDidSetActive:active]; + if (shouldSetActive) { + self.isActive = active; + [self notifyDidSetActive:active]; + } [self decrementActivationCount]; } RTCLog(@"Number of current activations: %d", _activationCount.load());