<!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>[167767] trunk/Source</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/167767">167767</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-04-24 12:04:01 -0700 (Thu, 24 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Manage AudioSession category according to media type
https://bugs.webkit.org/show_bug.cgi?id=132096
Reviewed by Jer Noble.
Source/WebCore:
* WebCore.exp.in: Export setting.
* html/HTMLMediaSession.cpp:
(WebCore::HTMLMediaSession::HTMLMediaSession):
(WebCore::initializeAudioSession): Deleted.
* page/Settings.cpp:
* page/Settings.h:
(WebCore::Settings::setShouldManageAudioSession): New.
(WebCore::Settings::shouldManageAudioSession): Ditto.
* platform/audio/ios/AudioDestinationIOS.cpp:
(WebCore::AudioDestinationIOS::AudioDestinationIOS): Use a MediaSession instead of inheriting
from AudioListener and calling the AudioSession directly.
(WebCore::AudioDestinationIOS::~AudioDestinationIOS): Ditto.
(WebCore::AudioDestinationIOS::start): Notify session.
(WebCore::AudioDestinationIOS::stop): Ditto.
(WebCore::AudioDestinationIOS::beganAudioInterruption): Deleted.
(WebCore::AudioDestinationIOS::endedAudioInterruption): Deleted.
* platform/audio/ios/AudioDestinationIOS.h:
(WebCore::AudioDestinationIOS::mediaType):
(WebCore::AudioDestinationIOS::canReceiveRemoteControlCommands):
(WebCore::AudioDestinationIOS::didReceiveRemoteControlCommand):
(WebCore::AudioDestinationIOS::isPlaying): Deleted.
* platform/audio/ios/AudioSessionIOS.mm:
(WebCore::categoryName): Debug-only logging function.
(WebCore::AudioSession::setCategory): Don't stick with "media" once it is set.
* platform/audio/ios/MediaSessionManagerIOS.mm:
(WebCore::MediaSessionManageriOS::resetRestrictions): Set up restrictions for WebAudio.
(WebCore::MediaSessionManageriOS::updateNowPlayingInfo): Don't set invalid start time.
* platform/audio/mac/MediaSessionManagerMac.cpp:
(MediaSessionManager::updateSessionState): Manage AudioSession.active when WebAudio clients
come and go. Manage AudioSession.category according to the number of WebAudio and
HTMLMediaElement clients.
Source/WebKit/mac:
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]): Tell
WebCore to manage the AudioSession when running in MobileSafari.
Source/WebKit2:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage): Tell WebCore to manage the AudioSession.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSessioncpp">trunk/Source/WebCore/html/HTMLMediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosAudioDestinationIOScpp">trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosAudioDestinationIOSh">trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosAudioSessionIOSmm">trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacMediaSessionManagerMaccpp">trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebCore/ChangeLog 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-04-24 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] Manage AudioSession category according to media type
+ https://bugs.webkit.org/show_bug.cgi?id=132096
+
+ Reviewed by Jer Noble.
+
+ * WebCore.exp.in: Export setting.
+
+ * html/HTMLMediaSession.cpp:
+ (WebCore::HTMLMediaSession::HTMLMediaSession):
+ (WebCore::initializeAudioSession): Deleted.
+
+ * page/Settings.cpp:
+ * page/Settings.h:
+ (WebCore::Settings::setShouldManageAudioSession): New.
+ (WebCore::Settings::shouldManageAudioSession): Ditto.
+
+ * platform/audio/ios/AudioDestinationIOS.cpp:
+ (WebCore::AudioDestinationIOS::AudioDestinationIOS): Use a MediaSession instead of inheriting
+ from AudioListener and calling the AudioSession directly.
+ (WebCore::AudioDestinationIOS::~AudioDestinationIOS): Ditto.
+ (WebCore::AudioDestinationIOS::start): Notify session.
+ (WebCore::AudioDestinationIOS::stop): Ditto.
+ (WebCore::AudioDestinationIOS::beganAudioInterruption): Deleted.
+ (WebCore::AudioDestinationIOS::endedAudioInterruption): Deleted.
+ * platform/audio/ios/AudioDestinationIOS.h:
+ (WebCore::AudioDestinationIOS::mediaType):
+ (WebCore::AudioDestinationIOS::canReceiveRemoteControlCommands):
+ (WebCore::AudioDestinationIOS::didReceiveRemoteControlCommand):
+ (WebCore::AudioDestinationIOS::isPlaying): Deleted.
+
+ * platform/audio/ios/AudioSessionIOS.mm:
+ (WebCore::categoryName): Debug-only logging function.
+ (WebCore::AudioSession::setCategory): Don't stick with "media" once it is set.
+
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (WebCore::MediaSessionManageriOS::resetRestrictions): Set up restrictions for WebAudio.
+ (WebCore::MediaSessionManageriOS::updateNowPlayingInfo): Don't set invalid start time.
+
+ * platform/audio/mac/MediaSessionManagerMac.cpp:
+ (MediaSessionManager::updateSessionState): Manage AudioSession.active when WebAudio clients
+ come and go. Manage AudioSession.category according to the number of WebAudio and
+ HTMLMediaElement clients.
+
</ins><span class="cx"> 2014-04-24 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [New Multicolumn] Client rects don't work with column spans.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -2647,6 +2647,7 @@
</span><span class="cx"> __ZN7WebCore8SVGNames4initEv
</span><span class="cx"> __ZN7WebCore8Settings13gAVKitEnabledE
</span><span class="cx"> __ZN7WebCore8Settings23setNetworkInterfaceNameERKN3WTF6StringE
</span><ins>+__ZN7WebCore8Settings19gManageAudioSessionE
</ins><span class="cx"> __ZN7WebCore8Settings31setAudioSessionCategoryOverrideEj
</span><span class="cx"> __ZN7WebCore8Settings34setNetworkDataUsageTrackingEnabledEb
</span><span class="cx"> __ZN7WebCore8Settings38gShouldOptOutOfNetworkStateObservationE
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.cpp (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSession.cpp 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebCore/html/HTMLMediaSession.cpp 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -69,21 +69,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static void initializeAudioSession()
-{
-#if PLATFORM(IOS)
- static bool wasAudioSessionInitialized;
- if (wasAudioSessionInitialized)
- return;
-
- wasAudioSessionInitialized = true;
- if (!WebCore::applicationIsMobileSafari())
- return;
-
- AudioSession::sharedSession().setCategory(AudioSession::MediaPlayback);
-#endif
-}
-
</del><span class="cx"> std::unique_ptr<HTMLMediaSession> HTMLMediaSession::create(MediaSessionClient& client)
</span><span class="cx"> {
</span><span class="cx"> return std::make_unique<HTMLMediaSession>(client);
</span><span class="lines">@@ -93,7 +78,6 @@
</span><span class="cx"> : MediaSession(client)
</span><span class="cx"> , m_restrictions(NoRestrictions)
</span><span class="cx"> {
</span><del>- initializeAudioSession();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaSession::addBehaviorRestriction(BehaviorRestrictions restriction)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebCore/page/Settings.cpp 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> bool Settings::gNetworkDataUsageTrackingEnabled = false;
</span><span class="cx"> bool Settings::gAVKitEnabled = false;
</span><span class="cx"> bool Settings::gShouldOptOutOfNetworkStateObservation = false;
</span><ins>+bool Settings::gManageAudioSession = false;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // NOTEs
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebCore/page/Settings.h 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -270,6 +270,9 @@
</span><span class="cx">
</span><span class="cx"> static void setShouldOptOutOfNetworkStateObservation(bool flag) { gShouldOptOutOfNetworkStateObservation = flag; }
</span><span class="cx"> static bool shouldOptOutOfNetworkStateObservation() { return gShouldOptOutOfNetworkStateObservation; }
</span><ins>+
+ static void setShouldManageAudioSession(bool flag) { gManageAudioSession = flag; }
+ static bool shouldManageAudioSession() { return gManageAudioSession; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -351,6 +354,7 @@
</span><span class="cx"> static bool gNetworkDataUsageTrackingEnabled;
</span><span class="cx"> static bool gAVKitEnabled;
</span><span class="cx"> static bool gShouldOptOutOfNetworkStateObservation;
</span><ins>+ static bool gManageAudioSession;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static double gHiddenPageDOMTimerAlignmentInterval;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosAudioDestinationIOScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -100,17 +100,11 @@
</span><span class="cx"> : m_outputUnit(0)
</span><span class="cx"> , m_callback(callback)
</span><span class="cx"> , m_renderBus(AudioBus::create(2, kRenderBufferSize, false))
</span><ins>+ , m_mediaSession(MediaSession::create(*this))
</ins><span class="cx"> , m_sampleRate(sampleRate)
</span><span class="cx"> , m_isPlaying(false)
</span><del>- , m_interruptedOnPlayback(false)
</del><span class="cx"> {
</span><del>- AudioSession& session = AudioSession::sharedSession();
- session.addListener(this);
- session.setCategory(AudioSession::AmbientSound);
-
</del><span class="cx"> audioDestinations().add(this);
</span><del>- if (audioDestinations().size() == 1)
- session.setActive(1);
</del><span class="cx">
</span><span class="cx"> // Open and initialize DefaultOutputUnit
</span><span class="cx"> AudioComponent comp;
</span><span class="lines">@@ -148,10 +142,7 @@
</span><span class="cx">
</span><span class="cx"> AudioDestinationIOS::~AudioDestinationIOS()
</span><span class="cx"> {
</span><del>- AudioSession::sharedSession().removeListener(this);
</del><span class="cx"> audioDestinations().remove(this);
</span><del>- if (!audioDestinations().size())
- AudioSession::sharedSession().setActive(0);
</del><span class="cx">
</span><span class="cx"> if (m_outputUnit)
</span><span class="cx"> AudioComponentInstanceDispose(m_outputUnit);
</span><span class="lines">@@ -192,38 +183,30 @@
</span><span class="cx">
</span><span class="cx"> void AudioDestinationIOS::start()
</span><span class="cx"> {
</span><del>- OSStatus result = AudioOutputUnitStart(m_outputUnit);
</del><ins>+ LOG(Media, "AudioDestinationIOS::start");
+ if (!m_mediaSession->clientWillBeginPlayback()) {
+ LOG(Media, " returning because of interruption");
+ return;
+ }
</ins><span class="cx">
</span><ins>+ OSStatus result = AudioOutputUnitStart(m_outputUnit);
</ins><span class="cx"> if (!result)
</span><span class="cx"> m_isPlaying = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AudioDestinationIOS::stop()
</span><span class="cx"> {
</span><del>- OSStatus result = AudioOutputUnitStop(m_outputUnit);
</del><ins>+ LOG(Media, "AudioDestinationIOS::stop");
+ if (!m_mediaSession->clientWillPausePlayback()) {
+ LOG(Media, " returning because of interruption");
+ return;
+ }
</ins><span class="cx">
</span><ins>+ OSStatus result = AudioOutputUnitStop(m_outputUnit);
</ins><span class="cx"> if (!result)
</span><span class="cx"> m_isPlaying = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AudioDestinationIOS::beganAudioInterruption()
-{
- if (!m_isPlaying)
- return;
-
- stop();
- m_interruptedOnPlayback = true;
-}
-
-void AudioDestinationIOS::endedAudioInterruption()
-{
- if (!m_interruptedOnPlayback)
- return;
-
- m_interruptedOnPlayback = false;
- start();
-}
-
</del><span class="cx"> // Pulls on our provider to get rendered audio stream.
</span><span class="cx"> OSStatus AudioDestinationIOS::render(UInt32 numberOfFrames, AudioBufferList* ioData)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosAudioDestinationIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.h (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.h 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebCore/platform/audio/ios/AudioDestinationIOS.h 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "AudioBus.h"
</span><span class="cx"> #include "AudioDestination.h"
</span><span class="cx"> #include "AudioSessionListener.h"
</span><ins>+#include "MediaSession.h"
</ins><span class="cx"> #include <AudioUnit/AudioUnit.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -40,22 +41,27 @@
</span><span class="cx">
</span><span class="cx"> // An AudioDestination using CoreAudio's default output AudioUnit
</span><span class="cx">
</span><del>-class AudioDestinationIOS : public AudioDestination, public AudioSessionListener {
</del><ins>+class AudioDestinationIOS final : public AudioDestination, private MediaSessionClient {
</ins><span class="cx"> public:
</span><span class="cx"> AudioDestinationIOS(AudioIOCallback&, double sampleRate);
</span><span class="cx"> virtual ~AudioDestinationIOS();
</span><span class="cx">
</span><del>- virtual void start();
- virtual void stop();
- bool isPlaying() { return m_isPlaying; }
-
- float sampleRate() const { return m_sampleRate; }
-
</del><span class="cx"> private:
</span><span class="cx"> void configure();
</span><del>- virtual void beganAudioInterruption() override;
- virtual void endedAudioInterruption() override;
</del><span class="cx">
</span><ins>+ // AudioDestination
+ virtual void start() override;
+ virtual void stop() override;
+ virtual bool isPlaying() override { return m_isPlaying; }
+ virtual float sampleRate() const override { return m_sampleRate; }
+
+ // MediaSessionClient
+ virtual MediaSession::MediaType mediaType() const { return MediaSession::WebAudio; }
+ virtual bool canReceiveRemoteControlCommands() const { return false; }
+ virtual void didReceiveRemoteControlCommand(MediaSession::RemoteControlCommandType) { }
+ virtual void pausePlayback() override { stop(); }
+ virtual void resumePlayback() override { start(); }
+
</ins><span class="cx"> // DefaultOutputUnit callback
</span><span class="cx"> static OSStatus inputProc(void* userData, AudioUnitRenderActionFlags*, const AudioTimeStamp*, UInt32 busNumber, UInt32 numberOfFrames, AudioBufferList* ioData);
</span><span class="cx"> static void frameSizeChangedProc(void *inRefCon, AudioUnit inUnit, AudioUnitPropertyID inID, AudioUnitScope inScope, AudioUnitElement inElement);
</span><span class="lines">@@ -67,10 +73,10 @@
</span><span class="cx"> AudioUnit m_outputUnit;
</span><span class="cx"> AudioIOCallback& m_callback;
</span><span class="cx"> RefPtr<AudioBus> m_renderBus;
</span><ins>+ std::unique_ptr<MediaSession> m_mediaSession;
</ins><span class="cx">
</span><span class="cx"> double m_sampleRate;
</span><span class="cx"> bool m_isPlaying;
</span><del>- bool m_interruptedOnPlayback;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosAudioSessionIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(AUDIO_SESSION) && PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import "Logging.h"
</ins><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import <AVFoundation/AVAudioSession.h>
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="lines">@@ -104,6 +105,26 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+
+#if !LOG_DISABLED
+static const char* categoryName(AudioSession::CategoryType category)
+{
+#define CASE(category) case AudioSession::category: return #category
+ switch (category) {
+ CASE(None);
+ CASE(AmbientSound);
+ CASE(SoloAmbientSound);
+ CASE(MediaPlayback);
+ CASE(RecordAudio);
+ CASE(PlayAndRecord);
+ CASE(AudioProcessing);
+ }
+
+ ASSERT_NOT_REACHED();
+ return "";
+}
+#endif
+
</ins><span class="cx"> class AudioSessionPrivate {
</span><span class="cx"> public:
</span><span class="cx"> AudioSessionPrivate(AudioSession*);
</span><span class="lines">@@ -128,18 +149,14 @@
</span><span class="cx">
</span><span class="cx"> void AudioSession::setCategory(CategoryType newCategory)
</span><span class="cx"> {
</span><del>- if (categoryOverride() && categoryOverride() != newCategory)
</del><ins>+ LOG(Media, "AudioSession::setCategory() - category = %s", categoryName(newCategory));
+
+ if (categoryOverride() && categoryOverride() != newCategory) {
+ LOG(Media, "AudioSession::setCategory() - override set, NOT changing");
</ins><span class="cx"> return;
</span><del>-
- if (!categoryOverride()) {
- // If a page plays only WebAudio we set the audio category to "ambient" so it is muted by the ringer switch.
- // However, audio from an HTML5 media element or from a plug-in should always play as "media" so don't change the
- // category once it has already been set to media.
- if (newCategory == AudioSession::AmbientSound && category() == AudioSession::MediaPlayback)
- return;
</del><span class="cx"> }
</span><span class="cx">
</span><del>- NSString* categoryString;
</del><ins>+ NSString *categoryString;
</ins><span class="cx"> switch (newCategory) {
</span><span class="cx"> case AmbientSound:
</span><span class="cx"> categoryString = AVAudioSessionCategoryAmbient;
</span><span class="lines">@@ -171,7 +188,7 @@
</span><span class="cx">
</span><span class="cx"> AudioSession::CategoryType AudioSession::category() const
</span><span class="cx"> {
</span><del>- NSString* categoryString = [[AVAudioSession sharedInstance] category];
</del><ins>+ NSString *categoryString = [[AVAudioSession sharedInstance] category];
</ins><span class="cx"> if ([categoryString isEqual:AVAudioSessionCategoryAmbient])
</span><span class="cx"> return AmbientSound;
</span><span class="cx"> if ([categoryString isEqual:AVAudioSessionCategorySoloAmbient])
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -136,8 +136,15 @@
</span><span class="cx"> addRestriction(MediaSession::Video, ConcurrentPlaybackNotPermitted);
</span><span class="cx"> addRestriction(MediaSession::Video, BackgroundPlaybackNotPermitted);
</span><span class="cx">
</span><ins>+ removeRestriction(MediaSession::Audio, ConcurrentPlaybackNotPermitted);
+ removeRestriction(MediaSession::Audio, BackgroundPlaybackNotPermitted);
+
+ removeRestriction(MediaSession::WebAudio, ConcurrentPlaybackNotPermitted);
+ removeRestriction(MediaSession::WebAudio, BackgroundPlaybackNotPermitted);
+
</ins><span class="cx"> removeRestriction(MediaSession::Audio, MetadataPreloadingNotPermitted);
</span><span class="cx"> removeRestriction(MediaSession::Video, MetadataPreloadingNotPermitted);
</span><ins>+
</ins><span class="cx"> addRestriction(MediaSession::Audio, AutoPreloadingNotPermitted);
</span><span class="cx"> addRestriction(MediaSession::Video, AutoPreloadingNotPermitted);
</span><span class="cx"> }
</span><span class="lines">@@ -193,7 +200,7 @@
</span><span class="cx"> [info setValue:@(duration) forKey:MPMediaItemPropertyPlaybackDuration];
</span><span class="cx">
</span><span class="cx"> double currentTime = currentSession->currentTime();
</span><del>- if (std::isfinite(currentTime))
</del><ins>+ if (std::isfinite(currentTime) && currentTime != MediaPlayer::invalidTime())
</ins><span class="cx"> [info setValue:@(currentTime) forKey:MPNowPlayingInfoPropertyElapsedPlaybackTime];
</span><span class="cx">
</span><span class="cx"> [info setValue:(currentSession->state() == MediaSession::Playing ? @YES : @NO) forKey:MPNowPlayingInfoPropertyPlaybackRate];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacMediaSessionManagerMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -46,12 +46,28 @@
</span><span class="cx">
</span><span class="cx"> if (has(MediaSession::WebAudio))
</span><span class="cx"> AudioSession::sharedSession().setPreferredBufferSize(kWebAudioBufferSize);
</span><del>- // FIXME: <http://webkit.org/b/116725> Figure out why enabling the code below
- // causes media LayoutTests to fail on 10.8.
</del><span class="cx"> #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><del>- else if ((has(MediaSession::Video) || has(MediaSession::Audio)) && Settings::lowPowerVideoAudioBufferSizeEnabled())
</del><ins>+ else if ((has(MediaSession::Video) || has(MediaSession::Audio)) && Settings::lowPowerVideoAudioBufferSizeEnabled()) {
+ // FIXME: <http://webkit.org/b/116725> Figure out why enabling the code below
+ // causes media LayoutTests to fail on 10.8.
</ins><span class="cx"> AudioSession::sharedSession().setPreferredBufferSize(kLowPowerVideoBufferSize);
</span><ins>+ }
</ins><span class="cx"> #endif
</span><ins>+
+#if PLATFORM(IOS)
+ if (has(MediaSession::WebAudio))
+ AudioSession::sharedSession().setActive(true);
+ else
+ AudioSession::sharedSession().setActive(false);
+
+ if (!Settings::shouldManageAudioSession())
+ return;
+
+ if (has(MediaSession::Video) || has(MediaSession::Audio))
+ AudioSession::sharedSession().setCategory(AudioSession::MediaPlayback);
+ else if (has(MediaSession::WebAudio))
+ AudioSession::sharedSession().setCategory(AudioSession::AmbientSound);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // USE(AUDIO_SESSION)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-04-24 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] Manage AudioSession category according to media type
+ https://bugs.webkit.org/show_bug.cgi?id=132096
+
+ Reviewed by Jer Noble.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]): Tell
+ WebCore to manage the AudioSession when running in MobileSafari.
+
</ins><span class="cx"> 2014-04-23 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Apple Dictionary workaround in WebFrameLoaderClient.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -902,6 +902,11 @@
</span><span class="cx">
</span><span class="cx"> Settings::setShouldRespectPriorityInCSSAttributeSetters(shouldRespectPriorityInCSSAttributeSetters());
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ if (applicationIsMobileSafari())
+ Settings::setShouldManageAudioSession(true);
+#endif
+
</ins><span class="cx"> didOneTimeInitialization = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-24 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] Manage AudioSession category according to media type
+ https://bugs.webkit.org/show_bug.cgi?id=132096
+
+ Reviewed by Jer Noble.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage): Tell WebCore to manage the AudioSession.
+
</ins><span class="cx"> 2014-04-24 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [wk2] Provide SPI allowing clients to hand events directly to swipe code, bypassing scrolling
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167766 => 167767)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-24 17:48:28 UTC (rev 167766)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-24 19:04:01 UTC (rev 167767)
</span><span class="lines">@@ -310,6 +310,10 @@
</span><span class="cx"> // 4ms should be adopted project-wide now, https://bugs.webkit.org/show_bug.cgi?id=61214
</span><span class="cx"> Settings::setDefaultMinDOMTimerInterval(0.004);
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ Settings::setShouldManageAudioSession(true);
+#endif
+
</ins><span class="cx"> Page::PageClients pageClients;
</span><span class="cx"> pageClients.chromeClient = new WebChromeClient(this);
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span></span></pre>
</div>
</div>
</body>
</html>