WebKit Bugzilla
Attachment 356835 Details for
Bug 192514
: [MediaStream] Address post-review comments after r238904
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-192514-20181207141527.patch (text/plain), 4.97 KB, created by
Eric Carlson
on 2018-12-07 14:15:28 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Eric Carlson
Created:
2018-12-07 14:15:28 PST
Size:
4.97 KB
patch
obsolete
>Subversion Revision: 238964 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 764c2c369812f4d9d508ec79b6fa1607de42e870..b12cec2eb78045d7c361bbba8c87ac88a2caec55 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,18 @@ >+2018-12-07 Eric Carlson <eric.carlson@apple.com> >+ >+ [MediaStream] Address post-review comments after r238904 >+ https://bugs.webkit.org/show_bug.cgi?id=192514 >+ <rdar://problem/46564302> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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 <antti@apple.com> > > Rename LayoutState to RenderLayoutState >diff --git a/Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm b/Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm >index dbd58b32ef684246041112d361bc66fc2fd19eaf..24aa48c41c932233b53484d4c74e7937fa8c5e69 100644 >--- a/Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm >+++ b/Source/WebCore/platform/graphics/cv/ImageTransferSessionVT.mm >@@ -85,20 +85,20 @@ bool ImageTransferSessionVT::setSize(const IntSize& size) > 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; >diff --git a/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm b/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm >index 83b2022248e88e4866184cb6640f3df308492f62..8200e9019183552a88614e1df53a8fa6e272d729 100644 >--- a/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm >+++ b/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm >@@ -141,10 +141,10 @@ bool ScreenDisplayCaptureSourceMac::createDisplayStream() > 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 @@ bool ScreenDisplayCaptureSourceMac::createDisplayStream() > 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();
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 192514
: 356835