<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[279119] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/279119">279119</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2021-06-22 09:17:45 -0700 (Tue, 22 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Cocoa] iOS device steals BT headphones from other devices during silent playback
https://bugs.webkit.org/show_bug.cgi?id=227227
<rdar://78792479>

Reviewed by Eric Carlson.

Source/WebCore:

Explicitly disable smart routing when WebKit itself does not explicitly activate its AVAudioSession.
The audio session will be implicitly activated even for audio-less or silent media playback, and
this will prevent headsets from being "stolen" when that session is implicitly activated.

* platform/audio/ios/AudioSessionIOS.h:
* platform/audio/ios/AudioSessionIOS.mm:
(WebCore::setEligibleForSmartRouting):
(WebCore::AudioSessionIOS::AudioSessionIOS):
(WebCore::AudioSessionIOS::tryToSetActiveInternal):

Source/WebCore/PAL:

* pal/spi/cocoa/AVFoundationSPI.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALpalspicocoaAVFoundationSPIh">trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosAudioSessionIOSh">trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosAudioSessionIOSmm">trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (279118 => 279119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-22 16:16:18 UTC (rev 279118)
+++ trunk/Source/WebCore/ChangeLog      2021-06-22 16:17:45 UTC (rev 279119)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2021-06-22  Jer Noble  <jer.noble@apple.com>
+
+        [Cocoa] iOS device steals BT headphones from other devices during silent playback
+        https://bugs.webkit.org/show_bug.cgi?id=227227
+        <rdar://78792479>
+
+        Reviewed by Eric Carlson.
+
+        Explicitly disable smart routing when WebKit itself does not explicitly activate its AVAudioSession.
+        The audio session will be implicitly activated even for audio-less or silent media playback, and
+        this will prevent headsets from being "stolen" when that session is implicitly activated.
+
+        * platform/audio/ios/AudioSessionIOS.h:
+        * platform/audio/ios/AudioSessionIOS.mm:
+        (WebCore::setEligibleForSmartRouting):
+        (WebCore::AudioSessionIOS::AudioSessionIOS):
+        (WebCore::AudioSessionIOS::tryToSetActiveInternal):
+
</ins><span class="cx"> 2021-06-22  Rob Buis  <rbuis@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Make rendererIsEverNeeded check less strict
</span></span></pre></div>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (279118 => 279119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog       2021-06-22 16:16:18 UTC (rev 279118)
+++ trunk/Source/WebCore/PAL/ChangeLog  2021-06-22 16:17:45 UTC (rev 279119)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-06-22  Jer Noble  <jer.noble@apple.com>
+
+        [Cocoa] iOS device steals BT headphones from other devices during silent playback
+        https://bugs.webkit.org/show_bug.cgi?id=227227
+        <rdar://78792479>
+
+        Reviewed by Eric Carlson.
+
+        * pal/spi/cocoa/AVFoundationSPI.h:
+
</ins><span class="cx"> 2021-06-20  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [macOS] Rename WKVisualSearchPreviewController to WKQuickLookPreviewController
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalspicocoaAVFoundationSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h (279118 => 279119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h 2021-06-22 16:16:18 UTC (rev 279118)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h    2021-06-22 16:17:45 UTC (rev 279119)
</span><span class="lines">@@ -393,6 +393,8 @@
</span><span class="cx"> @interface AVAudioSession (AVAudioSessionPrivate)
</span><span class="cx"> - (instancetype)initAuxiliarySession;
</span><span class="cx"> @property (readonly) NSString* routingContextUID;
</span><ins>+@property (readonly) BOOL eligibleForBTSmartRoutingConsideration;
+- (BOOL)setEligibleForBTSmartRoutingConsideration:(BOOL)inValue error:(NSError **)outError;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> NS_ASSUME_NONNULL_END
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosAudioSessionIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.h (279118 => 279119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.h        2021-06-22 16:16:18 UTC (rev 279118)
+++ trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.h   2021-06-22 16:17:45 UTC (rev 279119)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">     void endInterruption(MayResume) final;
</span><span class="cx"> 
</span><span class="cx">     AudioSession::CategoryType m_categoryOverride { AudioSession::CategoryType::None };
</span><del>-    RefPtr<WTF::WorkQueue> m_workQueue;
</del><ins>+    Ref<WTF::WorkQueue> m_workQueue;
</ins><span class="cx">     RetainPtr<WebInterruptionObserverHelper> m_interruptionObserverHelper;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosAudioSessionIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm (279118 => 279119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm       2021-06-22 16:16:18 UTC (rev 279118)
+++ trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm  2021-06-22 16:17:45 UTC (rev 279119)
</span><span class="lines">@@ -96,11 +96,34 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+static void setEligibleForSmartRouting(bool eligible)
+{
+    ASSERT(!isMainThread());
+
+    auto *session = [PAL::getAVAudioSessionClass() sharedInstance];
+    if (![session respondsToSelector:@selector(setEligibleForBTSmartRoutingConsideration:error:)]
+        || ![session respondsToSelector:@selector(eligibleForBTSmartRoutingConsideration)])
+        return;
+
+    if (session.eligibleForBTSmartRoutingConsideration == eligible)
+        return;
+
+    NSError *error = nil;
+    if (![session setEligibleForBTSmartRoutingConsideration:eligible error:&error])
+        RELEASE_LOG_ERROR(Media, "failed to set eligible to %d with error: %@", eligible, error.localizedDescription);
+}
+
</ins><span class="cx"> AudioSessionIOS::AudioSessionIOS()
</span><ins>+    : m_workQueue(WorkQueue::create("AudioSession Activation Queue"))
</ins><span class="cx"> {
</span><span class="cx">     BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx">     m_interruptionObserverHelper = adoptNS([[WebInterruptionObserverHelper alloc] initWithCallback:this]);
</span><span class="cx">     END_BLOCK_OBJC_EXCEPTIONS
</span><ins>+
+    m_workQueue->dispatch([] {
+        setEligibleForSmartRouting(false);
+    });
+
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> AudioSessionIOS::~AudioSessionIOS()
</span><span class="lines">@@ -240,9 +263,6 @@
</span><span class="cx"> 
</span><span class="cx"> bool AudioSessionIOS::tryToSetActiveInternal(bool active)
</span><span class="cx"> {
</span><del>-    if (!m_workQueue)
-        m_workQueue = WorkQueue::create("AudioSession Activation Queue");
-
</del><span class="cx">     // We need to deactivate the session on another queue because the AVAudioSessionSetActiveOptionNotifyOthersOnDeactivation option
</span><span class="cx">     // means that AVAudioSession may synchronously unduck previously ducked clients. Activation needs to complete before this method
</span><span class="cx">     // returns, so do it synchronously on the same serial queue.
</span><span class="lines">@@ -250,6 +270,7 @@
</span><span class="cx">         bool success = false;
</span><span class="cx">         m_workQueue->dispatchSync([&success] {
</span><span class="cx">             NSError *error = nil;
</span><ins>+            setEligibleForSmartRouting(true);
</ins><span class="cx">             [[PAL::getAVAudioSessionClass() sharedInstance] setActive:YES withOptions:0 error:&error];
</span><span class="cx">             success = !error;
</span><span class="cx">         });
</span><span class="lines">@@ -259,6 +280,7 @@
</span><span class="cx">     m_workQueue->dispatch([] {
</span><span class="cx">         NSError *error = nil;
</span><span class="cx">         [[PAL::getAVAudioSessionClass() sharedInstance] setActive:NO withOptions:0 error:&error];
</span><ins>+        setEligibleForSmartRouting(false);
</ins><span class="cx">     });
</span><span class="cx"> 
</span><span class="cx">     return true;
</span></span></pre>
</div>
</div>

</body>
</html>