Diff
Modified: trunk/Source/WebCore/ChangeLog (215241 => 215242)
--- trunk/Source/WebCore/ChangeLog 2017-04-11 18:25:42 UTC (rev 215241)
+++ trunk/Source/WebCore/ChangeLog 2017-04-11 18:27:01 UTC (rev 215242)
@@ -1,3 +1,35 @@
+2017-04-11 Eric Carlson <[email protected]>
+
+ [MediaStream] Set correct audio session category when capturing audio
+ https://bugs.webkit.org/show_bug.cgi?id=170736
+ <rdar://problem/31559405>
+
+ Reviewed by Jer Noble.
+
+ No new tests yet, filed bug 170737.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::MediaStream): Initialize m_mediaSession.
+ (WebCore::MediaStream::statusDidChange): Call canProduceAudioChanged.
+ (WebCore::MediaStream::mediaType): New. Return MediaStreamCapturingAudio when actively
+ capturing audio.
+ (WebCore::MediaStream::presentationType):
+ (WebCore::MediaStream::characteristics):
+ (WebCore::MediaStream::mayResumePlayback):
+ (WebCore::MediaStream::suspendPlayback):
+ (WebCore::MediaStream::sourceApplicationIdentifier):
+ (WebCore::MediaStream::canProduceAudio):
+ * Modules/mediastream/MediaStream.h:
+
+ * platform/audio/PlatformMediaSession.h: Add MediaStreamCapturingAudio.
+ * platform/audio/PlatformMediaSessionManager.cpp:
+ (WebCore::PlatformMediaSessionManager::has): Adjust assert for MediaStreamCapturingAudio.
+ (WebCore::PlatformMediaSessionManager::count): Ditto.
+ * platform/audio/cocoa/MediaSessionManagerCocoa.cpp:
+ (PlatformMediaSessionManager::updateSessionState): Set small preferred buffer size when
+ capturing audio. Set audio session category to PlayAndRecord whenever there is a media
+ stream that is capturing audio.
+
2017-04-11 Yusuke Suzuki <[email protected]>
[WebCore][JSC] ResourceUsageData.{timeOfNextEdenCollection,timeOfNextFullCollection} should be MonotonicTime
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (215241 => 215242)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-04-11 18:25:42 UTC (rev 215241)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-04-11 18:27:01 UTC (rev 215242)
@@ -33,9 +33,11 @@
#include "Document.h"
#include "Event.h"
#include "EventNames.h"
+#include "Frame.h"
#include "Logging.h"
#include "MediaStreamRegistry.h"
#include "MediaStreamTrackEvent.h"
+#include "NetworkingContext.h"
#include "Page.h"
#include "RealtimeMediaSource.h"
#include "URL.h"
@@ -75,6 +77,7 @@
: ContextDestructionObserver(&context)
, m_private(MediaStreamPrivate::create(createTrackPrivateVector(tracks)))
, m_activityEventTimer(*this, &MediaStream::activityEventTimerFired)
+ , m_mediaSession(PlatformMediaSession::create(*this))
{
// This constructor preserves MediaStreamTrack instances and must be used by calls originating
// from the _javascript_ MediaStream constructor.
@@ -94,6 +97,7 @@
: ContextDestructionObserver(&context)
, m_private(WTFMove(streamPrivate))
, m_activityEventTimer(*this, &MediaStream::activityEventTimerFired)
+ , m_mediaSession(PlatformMediaSession::create(*this))
{
setIsActive(m_private->active());
if (document()->page() && document()->page()->isMediaCaptureMuted())
@@ -342,6 +346,8 @@
void MediaStream::statusDidChange()
{
+ m_mediaSession->canProduceAudioChanged();
+
if (Document* document = this->document()) {
if (m_isActive)
document->setHasActiveMediaStreamTrack();
@@ -423,6 +429,63 @@
return downcast<Document>(scriptExecutionContext());
}
+PlatformMediaSession::MediaType MediaStream::mediaType() const
+{
+ // We only need to override the type when capturing audio, HTMLMediaElement and/or WebAudio
+ // will do the right thing when a stream is attached to a media element or an audio context.
+ if (m_private->hasAudio() && m_private->isProducingData() && m_private->hasCaptureAudioSource())
+ return PlatformMediaSession::MediaStreamCapturingAudio;
+
+ return PlatformMediaSession::None;
+}
+
+PlatformMediaSession::MediaType MediaStream::presentationType() const
+{
+ return mediaType();
+}
+
+PlatformMediaSession::CharacteristicsFlags MediaStream::characteristics() const
+{
+ PlatformMediaSession::CharacteristicsFlags state = PlatformMediaSession::HasNothing;
+
+ if (!m_private->isProducingData())
+ return state;
+
+ if (m_private->hasAudio())
+ state |= PlatformMediaSession::HasAudio;
+
+ if (m_private->hasVideo())
+ state |= PlatformMediaSession::HasVideo;
+
+ return state;
+}
+
+void MediaStream::mayResumePlayback(bool)
+{
+ // FIXME: should a media stream pay attention to this directly, or only when attached to a media element?
+}
+
+void MediaStream::suspendPlayback()
+{
+ // FIXME: should a media stream pay attention to this directly, or only when attached to a media element?
+}
+
+String MediaStream::sourceApplicationIdentifier() const
+{
+ Document* document = this->document();
+ if (document && document->frame()) {
+ if (NetworkingContext* networkingContext = document->frame()->loader().networkingContext())
+ return networkingContext->sourceApplicationIdentifier();
+ }
+
+ return emptyString();
+}
+
+bool MediaStream::canProduceAudio() const
+{
+ return !muted() && active() && m_private->hasAudio() && m_private->isProducingData();
+}
+
} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (215241 => 215242)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2017-04-11 18:25:42 UTC (rev 215241)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2017-04-11 18:27:01 UTC (rev 215242)
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2011 Google Inc. All rights reserved.
* Copyright (C) 2011, 2015 Ericsson AB. All rights reserved.
- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
* Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
*
* Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,7 @@
#include "MediaProducer.h"
#include "MediaStreamPrivate.h"
#include "MediaStreamTrack.h"
+#include "PlatformMediaSession.h"
#include "ScriptWrappable.h"
#include "Timer.h"
#include "URLRegistry.h"
@@ -55,6 +56,7 @@
, public MediaStreamPrivate::Observer
, private MediaProducer
, private MediaCanStartListener
+ , private PlatformMediaSessionClient
, public RefCounted<MediaStream> {
public:
class Observer {
@@ -134,6 +136,20 @@
// MediaCanStartListener
void mediaCanStart(Document&) final;
+ // PlatformMediaSessionClient
+ PlatformMediaSession::MediaType mediaType() const final;
+ PlatformMediaSession::MediaType presentationType() const final;
+ PlatformMediaSession::CharacteristicsFlags characteristics() const final;
+ void mayResumePlayback(bool shouldResume) final;
+ void suspendPlayback() final;
+ bool canReceiveRemoteControlCommands() const final { return false; }
+ void didReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType, const PlatformMediaSession::RemoteCommandArgument*) final { }
+ bool supportsSeeking() const final { return false; }
+ bool shouldOverrideBackgroundPlaybackRestriction(PlatformMediaSession::InterruptionType) const final { return false; }
+ String sourceApplicationIdentifier() const final;
+ bool canProduceAudio() const final;
+ const Document* hostingDocument() const final { return document(); }
+
bool internalAddTrack(Ref<MediaStreamTrack>&&, StreamModifier);
bool internalRemoveTrack(const String&, StreamModifier);
@@ -154,6 +170,7 @@
Vector<Ref<Event>> m_scheduledActivityEvents;
Vector<Observer*> m_observers;
+ std::unique_ptr<PlatformMediaSession> m_mediaSession;
bool m_isActive { false };
bool m_isMuted { true };
Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.h (215241 => 215242)
--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2017-04-11 18:25:42 UTC (rev 215241)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2017-04-11 18:27:01 UTC (rev 215242)
@@ -58,6 +58,7 @@
VideoAudio,
Audio,
WebAudio,
+ MediaStreamCapturingAudio,
};
MediaType mediaType() const;
MediaType presentationType() const;
Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (215241 => 215242)
--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2017-04-11 18:25:42 UTC (rev 215241)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2017-04-11 18:27:01 UTC (rev 215242)
@@ -73,7 +73,7 @@
bool PlatformMediaSessionManager::has(PlatformMediaSession::MediaType type) const
{
- ASSERT(type >= PlatformMediaSession::None && type <= PlatformMediaSession::WebAudio);
+ ASSERT(type >= PlatformMediaSession::None && type <= PlatformMediaSession::MediaStreamCapturingAudio);
return anyOfSessions([type] (PlatformMediaSession& session, size_t) {
return session.mediaType() == type;
@@ -96,7 +96,7 @@
int PlatformMediaSessionManager::count(PlatformMediaSession::MediaType type) const
{
- ASSERT(type >= PlatformMediaSession::None && type <= PlatformMediaSession::WebAudio);
+ ASSERT(type >= PlatformMediaSession::None && type <= PlatformMediaSession::MediaStreamCapturingAudio);
int count = 0;
for (auto* session : m_sessions) {
Modified: trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.cpp (215241 => 215242)
--- trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.cpp 2017-04-11 18:25:42 UTC (rev 215241)
+++ trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.cpp 2017-04-11 18:27:01 UTC (rev 215242)
@@ -42,7 +42,7 @@
{
LOG(Media, "PlatformMediaSessionManager::updateSessionState() - types: Video(%d), Audio(%d), WebAudio(%d)", count(PlatformMediaSession::Video), count(PlatformMediaSession::Audio), count(PlatformMediaSession::WebAudio));
- if (has(PlatformMediaSession::WebAudio))
+ if (has(PlatformMediaSession::WebAudio) || has(PlatformMediaSession::MediaStreamCapturingAudio))
AudioSession::sharedSession().setPreferredBufferSize(kWebAudioBufferSize);
else if ((has(PlatformMediaSession::Video) || has(PlatformMediaSession::Audio)) && Settings::lowPowerVideoAudioBufferSizeEnabled()) {
// FIXME: <http://webkit.org/b/116725> Figure out why enabling the code below
@@ -62,14 +62,19 @@
return;
bool hasAudioMediaType = false;
- bool hasAudibleAudioOrVideoMediaType = anyOfSessions([this, hasAudioMediaType] (PlatformMediaSession& session, size_t) mutable {
+ bool hasAudibleAudioOrVideoMediaType = false;
+ bool hasAudioCapture = anyOfSessions([this, hasAudioMediaType, hasAudibleAudioOrVideoMediaType] (PlatformMediaSession& session, size_t) mutable {
auto type = session.mediaType();
if (type == PlatformMediaSession::VideoAudio || type == PlatformMediaSession::Audio || type == PlatformMediaSession::WebAudio)
hasAudioMediaType = true;
- return (type == PlatformMediaSession::VideoAudio || type == PlatformMediaSession::Audio) && session.canProduceAudio();
+ if ((type == PlatformMediaSession::VideoAudio || type == PlatformMediaSession::Audio) && session.canProduceAudio())
+ hasAudibleAudioOrVideoMediaType = true;
+ return (type == PlatformMediaSession::MediaStreamCapturingAudio);
});
- if (hasAudibleAudioOrVideoMediaType)
+ if (hasAudioCapture)
+ AudioSession::sharedSession().setCategory(AudioSession::PlayAndRecord);
+ else if (hasAudibleAudioOrVideoMediaType)
AudioSession::sharedSession().setCategory(AudioSession::MediaPlayback);
else if (hasAudioMediaType)
AudioSession::sharedSession().setCategory(AudioSession::AmbientSound);
Modified: trunk/Source/WebCore/testing/Internals.cpp (215241 => 215242)
--- trunk/Source/WebCore/testing/Internals.cpp 2017-04-11 18:25:42 UTC (rev 215241)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-04-11 18:27:01 UTC (rev 215242)
@@ -3201,6 +3201,8 @@
return PlatformMediaSession::VideoAudio;
if (equalLettersIgnoringASCIICase(mediaTypeString, "webaudio"))
return PlatformMediaSession::WebAudio;
+ if (equalLettersIgnoringASCIICase(mediaTypeString, "mediastreamcapturingaudio"))
+ return PlatformMediaSession::MediaStreamCapturingAudio;
return PlatformMediaSession::None;
}
Modified: trunk/Source/WebKit2/ChangeLog (215241 => 215242)
--- trunk/Source/WebKit2/ChangeLog 2017-04-11 18:25:42 UTC (rev 215241)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-11 18:27:01 UTC (rev 215242)
@@ -1,3 +1,14 @@
+2017-04-11 Eric Carlson <[email protected]>
+
+ [MediaStream] Set correct audio session category when capturing audio
+ https://bugs.webkit.org/show_bug.cgi?id=170736
+ <rdar://problem/31559405>
+
+ Reviewed by Jer Noble.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::isPlayingMediaDidChange):
+
2017-04-11 Youenn Fablet <[email protected]>
Activate WebRTC data channel tests for WK1
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (215241 => 215242)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-04-11 18:25:42 UTC (rev 215241)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-04-11 18:27:01 UTC (rev 215242)
@@ -6446,7 +6446,7 @@
if (state == m_mediaState)
return;
- WebCore::MediaProducer::MediaStateFlags activeCaptureMask = WebCore::MediaProducer::HasActiveAudioCaptureDevice | WebCore::MediaProducer::HasActiveVideoCaptureDevice;
+ WebCore::MediaProducer::MediaStateFlags activeCaptureMask = WebCore::MediaProducer::HasActiveAudioCaptureDevice | WebCore::MediaProducer::HasActiveVideoCaptureDevice | WebCore::MediaProducer::HasMutedAudioCaptureDevice | WebCore::MediaProducer::HasMutedVideoCaptureDevice;
#if ENABLE(MEDIA_STREAM)
WebCore::MediaProducer::MediaStateFlags oldMediaStateHasActiveCapture = m_mediaState & activeCaptureMask;
WebCore::MediaProducer::MediaStateFlags newMediaStateHasActiveCapture = state & activeCaptureMask;
