Changeset 246489 in webkit

Timestamp:

Jun 16, 2019, 6:38:51 PM (7 years ago)

Author:

eric.carlson@apple.com

Message:

[MediaStream] Avoid roundoff error when setting AVCapture min/max frame rate
​https://bugs.webkit.org/show_bug.cgi?id=198875
<rdar://problem/51768374>

Reviewed by Youenn Fablet.

Source/WebCore:

• platform/graphics/MediaPlayer.h:

(WTF::LogArgument<MediaTime>::toString): Deleted, moved to MediaTime.h.
(WTF::LogArgument<MediaTimeRange>::toString): Deleted, moved to MediaTime.h.

• platform/mediastream/mac/AVVideoCaptureSource.mm:

(WebCore::AVVideoCaptureSource::setSessionSizeAndFrameRate): Avoid roundoff error.

Source/WTF:

• wtf/MediaTime.h:

(WTF::LogArgument<MediaTime>::toString):
(WTF::LogArgument<MediaTimeRange>::toString):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/MediaTime.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/MediaPlayer.h (modified) (1 diff)
• WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-06-16  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Avoid roundoff error when setting AVCapture min/max frame rate
+        https://bugs.webkit.org/show_bug.cgi?id=198875
+        <rdar://problem/51768374>
+
+        Reviewed by Youenn Fablet.
+
+        * wtf/MediaTime.h:
+        (WTF::LogArgument<MediaTime>::toString):
+        (WTF::LogArgument<MediaTimeRange>::toString):
+
 2019-06-12  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WTF/wtf/MediaTime.h

@@ -175 +175 @@
 }
 
+template<typename Type>
+struct LogArgument;
+
+template <>
+struct LogArgument<MediaTime> {
+    static String toString(const MediaTime& time)
+    {
+        return time.toJSONString();
+    }
+};
+
+template <>
+struct LogArgument<MediaTimeRange> {
+    static String toString(const MediaTimeRange& range)
+    {
+        return range.toJSONString();
+    }
+};
+
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-16  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Avoid roundoff error when setting AVCapture min/max frame rate
+        https://bugs.webkit.org/show_bug.cgi?id=198875
+        <rdar://problem/51768374>
+
+        Reviewed by Youenn Fablet.
+
+        * platform/graphics/MediaPlayer.h:
+        (WTF::LogArgument<MediaTime>::toString): Deleted, moved to MediaTime.h.
+        (WTF::LogArgument<MediaTimeRange>::toString): Deleted, moved to MediaTime.h.
+
+        * platform/mediastream/mac/AVVideoCaptureSource.mm:
+        (WebCore::AVVideoCaptureSource::setSessionSizeAndFrameRate): Avoid roundoff error.
+
 2019-06-16  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/graphics/MediaPlayer.h

@@ -633 +633 @@
 } // namespace WebCore
 
-namespace WTF {
-
-template<typename Type>
-struct LogArgument;
-
-template <>
-struct LogArgument<MediaTime> {
-    static String toString(const MediaTime& time)
-    {
-        return time.toJSONString();
-    }
-};
-
-template <>
-struct LogArgument<MediaTimeRange> {
-    static String toString(const MediaTimeRange& range)
-    {
-        return range.toJSONString();
-    }
-};
-
-}
-
 #endif // ENABLE(VIDEO)

trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm

@@ -328 +328 @@
                 m_currentFrameRate = clampTo(m_currentFrameRate, frameRateRange.minFrameRate, frameRateRange.maxFrameRate);
 
-                ALWAYS_LOG_IF(loggerPtr(), LOGIDENTIFIER, "setting frame rate to ", m_currentFrameRate);
-                [device() setActiveVideoMinFrameDuration: CMTimeMake(1, m_currentFrameRate)];
-                [device() setActiveVideoMaxFrameDuration: CMTimeMake(1, m_currentFrameRate)];
+                auto frameDuration = CMTimeMake(1, m_currentFrameRate);
+                if (CMTimeCompare(frameDuration, frameRateRange.minFrameDuration) < 0)
+                    frameDuration = frameRateRange.minFrameDuration;
+                else if (CMTimeCompare(frameDuration, frameRateRange.maxFrameDuration) > 0)
+                    frameDuration = frameRateRange.maxFrameDuration;
+
+                ALWAYS_LOG_IF(loggerPtr(), LOGIDENTIFIER, "setting frame rate to ", m_currentFrameRate, ", duration ", PAL::toMediaTime(frameDuration));
+
+                [device() setActiveVideoMinFrameDuration: frameDuration];
+                [device() setActiveVideoMaxFrameDuration: frameDuration];
             } else
                 ERROR_LOG_IF(loggerPtr(), LOGIDENTIFIER, "cannot find proper frame rate range for the selected preset\n");