Changeset 217001 in webkit

Timestamp:

May 17, 2017 2:31:52 PM (7 years ago)

Author:

eric.carlson@apple.com

Message:

[MediaStream] videoWidth and videoHeight should be set when 'loadedmetadata' event fires
​https://bugs.webkit.org/show_bug.cgi?id=172223
<rdar://problem/31899755>

Reviewed by Jer Noble.

Source/WebCore:

Test: fast/mediastream/get-user-media-on-loadedmetadata.html

• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:

(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::currentReadyState): If a stream has
a video track, return HaveNothing until we have a sample.

• platform/mediastream/RealtimeMediaSource.h:
• platform/mock/MockRealtimeAudioSource.cpp:

(WebCore::MockRealtimeAudioSource::tick): Optionally delay the next sample.
(WebCore::MockRealtimeAudioSource::delaySamples):

• platform/mock/MockRealtimeAudioSource.h:

• platform/mock/MockRealtimeVideoSource.cpp:

(WebCore::MockRealtimeVideoSource::delaySamples):
(WebCore::MockRealtimeVideoSource::generateFrame): Optionally delay the next sample.

• platform/mock/MockRealtimeVideoSource.h:

• testing/Internals.cpp:

(WebCore::Internals::delayMediaStreamTrackSamples):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

• fast/mediastream/get-user-media-on-loadedmetadata-expected.txt: Added.
• fast/mediastream/get-user-media-on-loadedmetadata.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/get-user-media-on-loadedmetadata-expected.txt (added)
• LayoutTests/fast/mediastream/get-user-media-on-loadedmetadata.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (modified) (2 diffs)
• Source/WebCore/platform/mediastream/RealtimeMediaSource.h (modified) (1 diff)
• Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp (modified) (2 diffs)
• Source/WebCore/platform/mock/MockRealtimeAudioSource.h (modified) (1 diff)
• Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp (modified) (1 diff)
• Source/WebCore/platform/mock/MockRealtimeVideoSource.h (modified) (2 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-05-17  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] videoWidth and videoHeight should be set when 'loadedmetadata' event fires
+        https://bugs.webkit.org/show_bug.cgi?id=172223
+        <rdar://problem/31899755>
+
+        Reviewed by Jer Noble.
+
+        * fast/mediastream/get-user-media-on-loadedmetadata-expected.txt: Added.
+        * fast/mediastream/get-user-media-on-loadedmetadata.html: Added.
+
 2017-05-17  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-17  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] videoWidth and videoHeight should be set when 'loadedmetadata' event fires
+        https://bugs.webkit.org/show_bug.cgi?id=172223
+        <rdar://problem/31899755>
+
+        Reviewed by Jer Noble.
+
+        Test: fast/mediastream/get-user-media-on-loadedmetadata.html
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::currentReadyState): If a stream has
+        a video track, return HaveNothing until we have a sample.
+       
+        * platform/mediastream/RealtimeMediaSource.h:
+        * platform/mock/MockRealtimeAudioSource.cpp:
+        (WebCore::MockRealtimeAudioSource::tick): Optionally delay the next sample.
+        (WebCore::MockRealtimeAudioSource::delaySamples):
+        * platform/mock/MockRealtimeAudioSource.h:
+
+        * platform/mock/MockRealtimeVideoSource.cpp:
+        (WebCore::MockRealtimeVideoSource::delaySamples):
+        (WebCore::MockRealtimeVideoSource::generateFrame): Optionally delay the next sample.
+        * platform/mock/MockRealtimeVideoSource.h:
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::delayMediaStreamTrackSamples):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2017-05-17  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h

@@ -248 +248 @@
     MediaPlayer::NetworkState m_networkState { MediaPlayer::Empty };
     MediaPlayer::ReadyState m_readyState { MediaPlayer::HaveNothing };
-    MediaPlayer::ReadyState m_previousReadyState { MediaPlayer::HaveNothing };
     FloatSize m_intrinsicSize;
     float m_volume { 1 };
@@ -264 +263 @@
     bool m_transformIsValid { false };
     bool m_visible { false };
+    bool m_haveSeenMetadata { false };
 
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm

@@ -742 +742 @@
     bool allTracksAreLive = true;
     for (auto& track : m_mediaStreamPrivate->tracks()) {
-        if (!track->enabled() || track->readyState() != MediaStreamTrackPrivate::ReadyState::Live) {
+        if (!track->enabled() || track->readyState() != MediaStreamTrackPrivate::ReadyState::Live)
             allTracksAreLive = false;
-            break;
+
+        if (track == m_mediaStreamPrivate->activeVideoTrack() && !m_imagePainter.mediaSample) {
+            if (!m_haveSeenMetadata)
+                return MediaPlayer::ReadyState::HaveNothing;
+            allTracksAreLive = false;
         }
-
-        if (track == m_mediaStreamPrivate->activeVideoTrack() && !m_imagePainter.mediaSample) {
-            allTracksAreLive = false;
-            break;
-        }
-    }
-
-    if (!allTracksAreLive && m_previousReadyState == MediaPlayer::ReadyState::HaveNothing)
+    }
+
+    if (!allTracksAreLive && !m_haveSeenMetadata)
         return MediaPlayer::ReadyState::HaveMetadata;
 
@@ -1079 +1078 @@
         return;
 
-    m_previousReadyState = m_readyState;
+    if (readyState != MediaPlayer::ReadyState::HaveNothing)
+        m_haveSeenMetadata = true;
     m_readyState = readyState;
     characteristicsChanged();

trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h

@@ -210 +210 @@
     virtual AudioSourceProvider* audioSourceProvider() { return nullptr; }
 
+    // Testing only
+    virtual void delaySamples(float) { };
+
 protected:
     RealtimeMediaSource(const String& id, Type, const String& name);

trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.cpp

@@ -154 +154 @@
 
     double now = monotonicallyIncreasingTime();
+
+    if (m_delayUntil) {
+        if (m_delayUntil < now)
+            return;
+        m_delayUntil = 0;
+    }
+
     double delta = now - m_lastRenderTime;
     m_lastRenderTime = now;
@@ -159 +166 @@
 }
 
+void MockRealtimeAudioSource::delaySamples(float delta)
+{
+    m_delayUntil = monotonicallyIncreasingTime() + delta;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/platform/mock/MockRealtimeAudioSource.h

@@ -76 +76 @@
     bool isCaptureSource() const final { return true; }
 
+    void delaySamples(float) final;
+
     RunLoop::Timer<MockRealtimeAudioSource> m_timer;
     double m_startTime { NAN };
     double m_lastRenderTime { NAN };
     double m_elapsedTime { 0 };
+    double m_delayUntil { 0 };
 };
 

trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp

@@ -368 +368 @@
 }
 
+void MockRealtimeVideoSource::delaySamples(float delta)
+{
+    m_delayUntil = monotonicallyIncreasingTime() + delta;
+}
+
 void MockRealtimeVideoSource::generateFrame()
 {
+    if (m_delayUntil) {
+        if (m_delayUntil < monotonicallyIncreasingTime())
+            return;
+        m_delayUntil = 0;
+    }
+
     ImageBuffer* buffer = imageBuffer();
     if (!buffer)

trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.h

@@ -83 +83 @@
     void generateFrame();
 
+    void delaySamples(float) override;
+
     float m_baseFontSize { 0 };
     FontCascade m_timeFont;
@@ -99 +101 @@
     double m_startTime { NAN };
     double m_elapsedTime { 0 };
+    double m_delayUntil { 0 };
 
     unsigned m_frameNumber { 0 };

trunk/Source/WebCore/testing/Internals.cpp

@@ -4045 +4045 @@
 }
 
+void Internals::delayMediaStreamTrackSamples(MediaStreamTrack& track, float delay)
+{
+    track.source().delaySamples(delay);
+}
+
 #endif
 

trunk/Source/WebCore/testing/Internals.h

@@ -575 +575 @@
     using TrackFramePromise = DOMPromiseDeferred<IDLInterface<ImageData>>;
     void grabNextMediaStreamTrackFrame(TrackFramePromise&&);
+    void delayMediaStreamTrackSamples(MediaStreamTrack&, float);
 #endif
 

trunk/Source/WebCore/testing/Internals.idl

@@ -537 +537 @@
     [Conditional=MEDIA_STREAM] readonly attribute unsigned long trackVideoSampleCount;
     [Conditional=MEDIA_STREAM, MayThrowException] void setMediaDeviceState(DOMString deviceID, DOMString property, boolean value);
-};
+    [Conditional=MEDIA_STREAM] void delayMediaStreamTrackSamples(MediaStreamTrack track, float delay);
+};