Title: [245948] trunk/Source/WebCore
- Revision
- 245948
- Author
- you...@apple.com
- Date
- 2019-05-30 21:57:06 -0700 (Thu, 30 May 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (245947 => 245948)
--- trunk/Source/WebCore/ChangeLog 2019-05-31 04:46:39 UTC (rev 245947)
+++ trunk/Source/WebCore/ChangeLog 2019-05-31 04:57:06 UTC (rev 245948)
@@ -1,3 +1,18 @@
+2019-05-30 Youenn Fablet <you...@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.no...@apple.com>
Video playback in Safari should continue when CarPlay is plugged in
Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (245947 => 245948)
--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2019-05-31 04:46:39 UTC (rev 245947)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2019-05-31 04:57:06 UTC (rev 245948)
@@ -285,8 +285,6 @@
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 @@
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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
