Changeset 245217 in webkit

Timestamp:

May 12, 2019 7:57:03 PM (5 years ago)

Author:

youenn@apple.com

Message:

Use clampTo in AVVideoCaptureSource::setSizeAndFrameRateWithPreset
​https://bugs.webkit.org/show_bug.cgi?id=197704

Reviewed by Alex Christensen.

Use clampTo as suggested in bug 196214 review.
No change of behavior.

• platform/mediastream/mac/AVVideoCaptureSource.mm:

(WebCore::AVVideoCaptureSource::setSizeAndFrameRateWithPreset):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/mac/AVVideoCaptureSource.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-12  Youenn Fablet  <youenn@apple.com>
+
+        Use clampTo in AVVideoCaptureSource::setSizeAndFrameRateWithPreset
+        https://bugs.webkit.org/show_bug.cgi?id=197704
+
+        Reviewed by Alex Christensen.
+
+        Use clampTo as suggested in bug 196214 review.
+        No change of behavior.
+
+        * platform/mediastream/mac/AVVideoCaptureSource.mm:
+        (WebCore::AVVideoCaptureSource::setSizeAndFrameRateWithPreset):
+
 2019-05-12  Youenn Fablet  <youenn@apple.com>
 

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

@@ -327 +327 @@
                 return;
 
-            if (requestedFrameRate < frameRateRange.minFrameRate)
-                requestedFrameRate = frameRateRange.minFrameRate;
-            else if (requestedFrameRate > frameRateRange.maxFrameRate)
-                requestedFrameRate = frameRateRange.maxFrameRate;
+            requestedFrameRate = clampTo(requestedFrameRate, frameRateRange.minFrameRate, frameRateRange.maxFrameRate);
 
             ALWAYS_LOG_IF(loggerPtr(), LOGIDENTIFIER, "setting frame rate to ", requestedFrameRate);