Attachment 372211 Details for Bug 198875 – Patch for landing

[patch] Patch for landing

bug-198875-20190615194533.patch (text/plain), 4.97 KB, created by Eric Carlson on 2019-06-15 19:45:34 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2019-06-15 19:45:34 PDT

Size: 4.97 KB

patch

obsolete

>Subversion Revision: 246201
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index ab9b3920492658ff0b8b04957dffec91f6c2aa92..f0cf0be53698c72801315d8502a529ee6d49a470 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-14  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-06  Caio Lima  <ticaiolima@gmail.com>
> 
>         [JSCOnly] JSCOnly port is not building on macOS
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index af9788cdfc6cc4d724952e7d81ab9a7f218133e2..1e7862d972c89247e35d63e63abeb3b0697a4bfc 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-06-14  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-07  Joonghun Park  <jh718.park@samsung.com>
> 
>         Unreviewed. Use const TabSize& instead of TabSize to avoid unnecessary copy.
>diff --git a/Source/WTF/wtf/MediaTime.h b/Source/WTF/wtf/MediaTime.h
>index b3478fe9c0c063b857f0a30924eb1acc3c799eae..442d5ec1cc99c6ef69730339906fb8a15006cbc9 100644
>--- a/Source/WTF/wtf/MediaTime.h
>+++ b/Source/WTF/wtf/MediaTime.h
>@@ -174,6 +174,25 @@ bool MediaTime::decode(Decoder& decoder, MediaTime& time)
>         && decoder.decode(time.m_timeFlags);
> }
> 
>+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();
>+    }
>+};
>+
> }
> 
> using WTF::MediaTime;
>diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platform/graphics/MediaPlayer.h
>index 3e1263bbb63a387fe2c2fb4e16d0d07f7fce6de6..0ec33062b6f9461b6b3578744fc21f424a04c555 100644
>--- a/Source/WebCore/platform/graphics/MediaPlayer.h
>+++ b/Source/WebCore/platform/graphics/MediaPlayer.h
>@@ -632,27 +632,4 @@ public:
> 
> } // 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)
>diff --git a/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm b/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
>index ef6db171732560eb36a48afb97502ace180d4e08..8b40a29e8b977868530b2a5b6a4076256ec17286 100644
>--- a/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
>+++ b/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
>@@ -327,9 +327,16 @@ void AVVideoCaptureSource::setSessionSizeAndFrameRate()
>             if (frameRateRange) {
>                 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");
>

Actions: View | Formatted Diff | Diff

Attachments on bug 198875: 372165 | 372211