Attachment 370987 Details for Bug 198392 – Patch

[patch] Patch

bug-198392-20190530155011.patch (text/plain), 2.16 KB, created by youenn fablet on 2019-05-30 15:50:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-05-30 15:50:12 PDT

Size: 2.16 KB

patch

obsolete

>Subversion Revision: 245849
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index bc335bff81417c7e3d9ce9cab0d72eae9fefd119..13c3e82503825c73e21ef1cadb04de2ba4124a78 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-05-30  Youenn Fablet  <youenn@apple.com>
>+
>+        Fix AVVideoCaptureSource::setFrameRateWithPreset logging
>+        https://bugs.webkit.org/show_bug.cgi?id=198392
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-29  Youenn Fablet  <youenn@apple.com>
> 
>         Add an option to mute audio capture automatically when page is not visible
>diff --git a/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm b/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
>index f66d0118c1cf668d40e5c04ec75eb15262256fde..ef6db171732560eb36a48afb97502ace180d4e08 100644
>--- a/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
>+++ b/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm
>@@ -285,8 +285,6 @@ bool AVVideoCaptureSource::prefersPreset(VideoPreset& preset)
> 
> 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;
>     m_currentFrameRate = requestedFrameRate;
>@@ -303,6 +301,8 @@ void AVVideoCaptureSource::setSessionSizeAndFrameRate()
>     if (!avPreset)
>         return;
> 
>+    ALWAYS_LOG_IF(loggerPtr(), LOGIDENTIFIER, SizeAndFrameRate { m_currentPreset->size.width(), m_currentPreset->size.height(), m_currentFrameRate });
>+
>     ASSERT(avPreset->format);
> 
>     NSError *error = nil;

Actions: View | Formatted Diff | Diff

Attachments on bug 198392: 370987