- Revision
- 212696
- Author
- jer.no...@apple.com
- Date
- 2017-02-20 18:35:35 -0800 (Mon, 20 Feb 2017)
Log Message
Local audio-only stream will not trigger playback to begin
https://bugs.webkit.org/show_bug.cgi?id=168412
Reviewed by Youenn Fablet.
Source/WebCore:
Test: fast/mediastream/local-audio-playing-event.html
With video-bearing streams, the first video sample emitted from the stream causes the
readyState to move from HAVE_NOTHING to HAVE_ENOUGH_DATA. Wire up this same behavior for
audio-bearing streams. Add a MediaStreamTrackPrivate::Observer callback method
audioSamplesAvailable(), which gets passed up to MediaPlayerPrivateMediaStreamAVFObjC.
Because this callback may be (and probably will be) called on a background thread, run the
updateReadyState() task in a scheduledDeferredTask().
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::audioSamplesAvailable):
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks):
* platform/mediastream/MediaStreamTrackPrivate.cpp:
(WebCore::MediaStreamTrackPrivate::audioSamplesAvailable):
* platform/mediastream/MediaStreamTrackPrivate.h:
(WebCore::MediaStreamTrackPrivate::Observer::audioSamplesAvailable):
LayoutTests:
* fast/mediastream/local-audio-playing-event-expected.txt: Added.
* fast/mediastream/local-audio-playing-event.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (212695 => 212696)
--- trunk/LayoutTests/ChangeLog 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/LayoutTests/ChangeLog 2017-02-21 02:35:35 UTC (rev 212696)
@@ -1,3 +1,13 @@
+2017-02-20 Jer Noble <jer.no...@apple.com>
+
+ Local audio-only stream will not trigger playback to begin
+ https://bugs.webkit.org/show_bug.cgi?id=168412
+
+ Reviewed by Youenn Fablet.
+
+ * fast/mediastream/local-audio-playing-event-expected.txt: Added.
+ * fast/mediastream/local-audio-playing-event.html: Added.
+
2017-02-20 Zalan Bujtas <za...@apple.com>
Simple line layout: Implement absoluteQuadsForRange.
Added: trunk/LayoutTests/fast/mediastream/local-audio-playing-event-expected.txt (0 => 212696)
--- trunk/LayoutTests/fast/mediastream/local-audio-playing-event-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/local-audio-playing-event-expected.txt 2017-02-21 02:35:35 UTC (rev 212696)
@@ -0,0 +1,3 @@
+
+PASS Local audio playback fires playing event
+
Added: trunk/LayoutTests/fast/mediastream/local-audio-playing-event.html (0 => 212696)
--- trunk/LayoutTests/fast/mediastream/local-audio-playing-event.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/local-audio-playing-event.html 2017-02-21 02:35:35 UTC (rev 212696)
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Testing local audio capture playback causes "playing" event to fire</title>
+ <script src=""
+ <script src=""
+</head>
+<body>
+ <audio id="audio" autoplay></audio>
+ <script>
+ if (window.testRunner)
+ testRunner.setUserMediaPermission(true);
+
+ var audio = document.getElementById('audio');
+
+ promise_test((test) => {
+ return navigator.mediaDevices.getUserMedia({audio: true}).then((stream) => {
+ audio.srcObject = stream;
+ var eventWatcher = new EventWatcher(test, audio, 'playing');
+ return eventWatcher.wait_for('playing');
+ });
+ }, 'Local audio playback fires playing event');
+ </script>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (212695 => 212696)
--- trunk/Source/WebCore/ChangeLog 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/Source/WebCore/ChangeLog 2017-02-21 02:35:35 UTC (rev 212696)
@@ -1,3 +1,28 @@
+2017-02-20 Jer Noble <jer.no...@apple.com>
+
+ Local audio-only stream will not trigger playback to begin
+ https://bugs.webkit.org/show_bug.cgi?id=168412
+
+ Reviewed by Youenn Fablet.
+
+ Test: fast/mediastream/local-audio-playing-event.html
+
+ With video-bearing streams, the first video sample emitted from the stream causes the
+ readyState to move from HAVE_NOTHING to HAVE_ENOUGH_DATA. Wire up this same behavior for
+ audio-bearing streams. Add a MediaStreamTrackPrivate::Observer callback method
+ audioSamplesAvailable(), which gets passed up to MediaPlayerPrivateMediaStreamAVFObjC.
+ Because this callback may be (and probably will be) called on a background thread, run the
+ updateReadyState() task in a scheduledDeferredTask().
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::audioSamplesAvailable):
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks):
+ * platform/mediastream/MediaStreamTrackPrivate.cpp:
+ (WebCore::MediaStreamTrackPrivate::audioSamplesAvailable):
+ * platform/mediastream/MediaStreamTrackPrivate.h:
+ (WebCore::MediaStreamTrackPrivate::Observer::audioSamplesAvailable):
+
2017-02-20 Zalan Bujtas <za...@apple.com>
Simple line layout: Implement absoluteQuadsForRange.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (212695 => 212696)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2017-02-21 02:35:35 UTC (rev 212696)
@@ -190,6 +190,7 @@
void trackSettingsChanged(MediaStreamTrackPrivate&) override { };
void trackEnabledChanged(MediaStreamTrackPrivate&) override { };
void sampleBufferUpdated(MediaStreamTrackPrivate&, MediaSample&) override;
+ void audioSamplesAvailable(MediaStreamTrackPrivate&) override;
#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
void setVideoFullscreenLayer(PlatformLayer*, std::function<void()> completionHandler) override;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (212695 => 212696)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-02-21 02:35:35 UTC (rev 212696)
@@ -753,6 +753,17 @@
}
}
+void MediaPlayerPrivateMediaStreamAVFObjC::audioSamplesAvailable(MediaStreamTrackPrivate&)
+{
+ if (m_hasReceivedMedia)
+ return;
+ m_hasReceivedMedia = true;
+
+ scheduleDeferredTask([this] {
+ updateReadyState();
+ });
+}
+
#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
void MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer(PlatformLayer *videoFullscreenLayer, std::function<void()> completionHandler)
{
@@ -851,6 +862,7 @@
m_player->removeAudioTrack(*track);
break;
case TrackState::Add:
+ track->streamTrack().addObserver(*this);
m_player->addAudioTrack(*track);
break;
case TrackState::Configure:
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (212695 => 212696)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2017-02-21 02:35:35 UTC (rev 212696)
@@ -213,6 +213,12 @@
observer->sampleBufferUpdated(*this, mediaSample);
}
+void MediaStreamTrackPrivate::audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t)
+{
+ for (auto& observer : m_observers)
+ observer->audioSamplesAvailable(*this);
+}
+
} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (212695 => 212696)
--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2017-02-21 02:32:38 UTC (rev 212695)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2017-02-21 02:35:35 UTC (rev 212696)
@@ -48,6 +48,7 @@
virtual void trackSettingsChanged(MediaStreamTrackPrivate&) = 0;
virtual void trackEnabledChanged(MediaStreamTrackPrivate&) = 0;
virtual void sampleBufferUpdated(MediaStreamTrackPrivate&, MediaSample&) { };
+ virtual void audioSamplesAvailable(MediaStreamTrackPrivate&) { };
};
static Ref<MediaStreamTrackPrivate> create(Ref<RealtimeMediaSource>&&);
@@ -102,6 +103,7 @@
void sourceSettingsChanged() final;
bool preventSourceFromStopping() final;
void videoSampleAvailable(MediaSample&) final;
+ void audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t) final;
Vector<Observer*> m_observers;
Ref<RealtimeMediaSource> m_source;