Changeset 278764 in webkit

Timestamp:

Jun 11, 2021, 10:25:40 AM (5 years ago)

Author:

youenn@apple.com

Message:

getDisplayMedia API doesn't work
​https://bugs.webkit.org/show_bug.cgi?id=226874
<rdar://problem/79134041>

Reviewed by Eric Carlson.

Source/WebCore:

Test: fast/mediastream/getDisplayMedia-frame-rate.html

• platform/mediastream/RealtimeVideoSource.cpp:

(WebCore::RealtimeVideoSource::videoSampleAvailable):
Only apply decimation in case frame rate is set.

LayoutTests:

• fast/mediastream/getDisplayMedia-frame-rate-expected.txt: Added.
• fast/mediastream/getDisplayMedia-frame-rate.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/getDisplayMedia-frame-rate-expected.txt (added)
• LayoutTests/fast/mediastream/getDisplayMedia-frame-rate.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-06-11  Youenn Fablet  <youenn@apple.com>
+
+        getDisplayMedia API doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=226874
+        <rdar://problem/79134041>
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/getDisplayMedia-frame-rate-expected.txt: Added.
+        * fast/mediastream/getDisplayMedia-frame-rate.html: Added.
+
 2021-06-11  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-11  Youenn Fablet  <youenn@apple.com>
+
+        getDisplayMedia API doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=226874
+        <rdar://problem/79134041>
+
+        Reviewed by Eric Carlson.
+
+        Test: fast/mediastream/getDisplayMedia-frame-rate.html
+
+        * platform/mediastream/RealtimeVideoSource.cpp:
+        (WebCore::RealtimeVideoSource::videoSampleAvailable):
+        Only apply decimation in case frame rate is set.
+
 2021-06-11  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp

@@ -184 +184 @@
         return;
 
-    m_frameDecimation = static_cast<size_t>(m_source->observedFrameRate() / frameRate());
+    auto frameRate = this->frameRate();
+    m_frameDecimation = frameRate ? static_cast<size_t>(m_source->observedFrameRate() / frameRate) : 1;
     if (!m_frameDecimation)
         m_frameDecimation = 1;