Changeset 245948 in webkit

Timestamp:

May 30, 2019, 9:57:06 PM (7 years ago)

Author:

youenn@apple.com

Message:

Fix AVVideoCaptureSource::setFrameRateWithPreset logging
​https://bugs.webkit.org/show_bug.cgi?id=198392

Reviewed by Eric Carlson.

Move logging from setFrameRateWithPreset to setSessionSizeAndFrameRate which does the actual job.
This ensures to not log in case of preset being null.
No change of behavior.

• platform/mediastream/mac/AVVideoCaptureSource.mm:

(WebCore::AVVideoCaptureSource::setFrameRateWithPreset):
(WebCore::AVVideoCaptureSource::setSessionSizeAndFrameRate):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-30  Youenn Fablet  <youenn@apple.com>
+
+        Fix AVVideoCaptureSource::setFrameRateWithPreset logging
+        https://bugs.webkit.org/show_bug.cgi?id=198392
+
+        Reviewed by Eric Carlson.
+
+        Move logging from setFrameRateWithPreset to setSessionSizeAndFrameRate which does the actual job.
+        This ensures to not log in case of preset being null.
+        No change of behavior.
+
+        * platform/mediastream/mac/AVVideoCaptureSource.mm:
+        (WebCore::AVVideoCaptureSource::setFrameRateWithPreset):
+        (WebCore::AVVideoCaptureSource::setSessionSizeAndFrameRate):
+
 2019-05-30  Jer Noble  <jer.noble@apple.com>
 

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

@@ -286 +286 @@
 void AVVideoCaptureSource::setFrameRateWithPreset(double requestedFrameRate, RefPtr<VideoPreset> preset)
 {
-    ALWAYS_LOG_IF(loggerPtr(), LOGIDENTIFIER, SizeAndFrameRate { preset->size.width(), preset->size.height(), requestedFrameRate });
-
     auto* avPreset = preset ? downcast<AVVideoPreset>(preset.get()) : nullptr;
     m_currentPreset = avPreset;
@@ -303 +301 @@
     if (!avPreset)
         return;
+
+    ALWAYS_LOG_IF(loggerPtr(), LOGIDENTIFIER, SizeAndFrameRate { m_currentPreset->size.width(), m_currentPreset->size.height(), m_currentFrameRate });
 
     ASSERT(avPreset->format);