Modified: trunk/Source/WebCore/ChangeLog (239004 => 239005)
--- trunk/Source/WebCore/ChangeLog 2018-12-08 01:19:58 UTC (rev 239004)
+++ trunk/Source/WebCore/ChangeLog 2018-12-08 03:10:39 UTC (rev 239005)
@@ -1,3 +1,18 @@
+2018-12-07 Eric Carlson <eric.carl...@apple.com>
+
+ [MediaStream] Address post-review comments after r238904
+ https://bugs.webkit.org/show_bug.cgi?id=192514
+ <rdar://problem/46564302>
+
+ Reviewed by Youenn Fablet.
+
+ No new tests, no functional change.
+
+ * platform/graphics/cv/ImageTransferSessionVT.mm:
+ (WebCore::ImageTransferSessionVT::setSize):
+ * platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm:
+ (WebCore::ScreenDisplayCaptureSourceMac::createDisplayStream):
+
2018-12-07 Antti Koivisto <an...@apple.com>
[LFC] Rename LayoutFormattingState files to LayoutState
Modified: trunk/Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm (239004 => 239005)
--- trunk/Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm 2018-12-08 01:19:58 UTC (rev 239004)
+++ trunk/Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm 2018-12-08 03:10:39 UTC (rev 239005)
@@ -85,20 +85,20 @@
if (m_size == size && m_outputBufferPool)
return true;
- CFDictionaryRef pixelBufferOptions = (__bridge CFDictionaryRef) @{
- (__bridge NSString *)kCVPixelBufferWidthKey :@(size.width()),
- (__bridge NSString *)kCVPixelBufferHeightKey:@(size.height()),
- (__bridge NSString *)kCVPixelBufferPixelFormatTypeKey:@(m_pixelFormat),
+ NSDictionary* pixelBufferOptions = @{
+ (__bridge NSString *)kCVPixelBufferWidthKey : @(size.width()),
+ (__bridge NSString *)kCVPixelBufferHeightKey : @(size.height()),
+ (__bridge NSString *)kCVPixelBufferPixelFormatTypeKey : @(m_pixelFormat),
(__bridge NSString *)cvPixelFormatOpenGLKey() : @(YES),
(__bridge NSString *)kCVPixelBufferIOSurfacePropertiesKey : @{ /*empty dictionary*/ },
};
- CFDictionaryRef pixelBufferPoolOptions = (__bridge CFDictionaryRef) @{
- (__bridge NSString *)kCVPixelBufferPoolMinimumBufferCountKey : @(6)
+ NSDictionary* pixelBufferPoolOptions = @{
+ (__bridge NSString *)kCVPixelBufferPoolMinimumBufferCountKey: @(6)
};
CVPixelBufferPoolRef bufferPool;
- auto status = CVPixelBufferPoolCreate(kCFAllocatorDefault, pixelBufferPoolOptions, pixelBufferOptions, &bufferPool);
+ auto status = CVPixelBufferPoolCreate(kCFAllocatorDefault, (__bridge CFDictionaryRef)pixelBufferPoolOptions, (__bridge CFDictionaryRef)pixelBufferOptions, &bufferPool);
ASSERT(!status);
if (status != kCVReturnSuccess)
return false;
Modified: trunk/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm (239004 => 239005)
--- trunk/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm 2018-12-08 01:19:58 UTC (rev 239004)
+++ trunk/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm 2018-12-08 03:10:39 UTC (rev 239005)
@@ -141,10 +141,10 @@
if (!m_captureQueue)
m_captureQueue = adoptOSObject(dispatch_queue_create("ScreenDisplayCaptureSourceMac Capture Queue", DISPATCH_QUEUE_SERIAL));
- CFDictionaryRef streamOptions = (__bridge CFDictionaryRef) @{
- (__bridge NSString *)kCGDisplayStreamMinimumFrameTime :@(1 / frameRate()),
- (__bridge NSString *)kCGDisplayStreamQueueDepth:@(screenQueueMaximumLength),
- (__bridge NSString *)kCGDisplayStreamColorSpace:(__bridge id)sRGBColorSpaceRef(),
+ NSDictionary* streamOptions = @{
+ (__bridge NSString *)kCGDisplayStreamMinimumFrameTime : @(1 / frameRate()),
+ (__bridge NSString *)kCGDisplayStreamQueueDepth : @(screenQueueMaximumLength),
+ (__bridge NSString *)kCGDisplayStreamColorSpace : (__bridge id)sRGBColorSpaceRef(),
(__bridge NSString *)kCGDisplayStreamShowCursor : @(YES),
};
@@ -156,7 +156,7 @@
weakThis->frameAvailable(status, displayTime, frameSurface, updateRef);
};
- m_displayStream = adoptCF(CGDisplayStreamCreateWithDispatchQueue(m_displayID, screenWidth, screenHeight, preferedPixelBufferFormat(), streamOptions, m_captureQueue.get(), frameAvailableBlock));
+ m_displayStream = adoptCF(CGDisplayStreamCreateWithDispatchQueue(m_displayID, screenWidth, screenHeight, preferedPixelBufferFormat(), (__bridge CFDictionaryRef)streamOptions, m_captureQueue.get(), frameAvailableBlock));
if (!m_displayStream) {
RELEASE_LOG(Media, "ScreenDisplayCaptureSourceMac::createDisplayStream: CGDisplayStreamCreate failed");
captureFailed();
