<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[236553] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/236553">236553</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2018-09-27 09:45:24 -0700 (Thu, 27 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use kCVPixelFormatType_420YpCbCr8Planar for capturing frames
https://bugs.webkit.org/show_bug.cgi?id=190014

Reviewed by Eric Carlson.

On Mac, rely on the monoplanar format which can be displayed without any issue.
Once rendering is fixed, we should change it back to biplanar as it is closer to what libwebrtc consumes.
Covered by manual testing.

* platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::avVideoCapturePixelBufferFormat):
(WebCore::AVVideoCaptureSource::setSizeAndFrameRateWithPreset):
(WebCore::AVVideoCaptureSource::setupCaptureSession):
(WebCore::AVVideoCaptureSource::captureOutputDidOutputSampleBufferFromConnection):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (236552 => 236553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-09-27 16:44:49 UTC (rev 236552)
+++ trunk/Source/WebCore/ChangeLog      2018-09-27 16:45:24 UTC (rev 236553)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2018-09-27  Youenn Fablet  <youenn@apple.com>
+
+        Use kCVPixelFormatType_420YpCbCr8Planar for capturing frames
+        https://bugs.webkit.org/show_bug.cgi?id=190014
+
+        Reviewed by Eric Carlson.
+
+        On Mac, rely on the monoplanar format which can be displayed without any issue.
+        Once rendering is fixed, we should change it back to biplanar as it is closer to what libwebrtc consumes.
+        Covered by manual testing.
+
+        * platform/mediastream/mac/AVVideoCaptureSource.mm:
+        (WebCore::avVideoCapturePixelBufferFormat):
+        (WebCore::AVVideoCaptureSource::setSizeAndFrameRateWithPreset):
+        (WebCore::AVVideoCaptureSource::setupCaptureSession):
+        (WebCore::AVVideoCaptureSource::captureOutputDidOutputSampleBufferFromConnection):
+
</ins><span class="cx"> 2018-09-27  Andy Estes  <aestes@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Apple Pay] Support granular errors in PaymentDetailsUpdate
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (236552 => 236553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm    2018-09-27 16:44:49 UTC (rev 236552)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm       2018-09-27 16:45:24 UTC (rev 236553)
</span><span class="lines">@@ -114,6 +114,16 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+static inline OSType avVideoCapturePixelBufferFormat()
+{
+    // FIXME: Use preferedPixelBufferFormat() once rdar://problem/44391444 is fixed.
+#if PLATFORM(MAC)
+    return kCVPixelFormatType_420YpCbCr8Planar;
+#else
+    return preferedPixelBufferFormat();
+#endif
+}
+
</ins><span class="cx"> static dispatch_queue_t globaVideoCaptureSerialQueue()
</span><span class="cx"> {
</span><span class="cx">     static dispatch_queue_t globalQueue;
</span><span class="lines">@@ -335,7 +345,7 @@
</span><span class="cx">                 [device() setActiveFormat:avPreset->format.get()];
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">                 auto settingsDictionary = @{
</span><del>-                    (__bridge NSString *)kCVPixelBufferPixelFormatTypeKey: @(preferedPixelBufferFormat()),
</del><ins>+                    (__bridge NSString *)kCVPixelBufferPixelFormatTypeKey: @(avVideoCapturePixelBufferFormat()),
</ins><span class="cx">                     (__bridge NSString *)kCVPixelBufferWidthKey: @(avPreset->size.width()),
</span><span class="cx">                     (__bridge NSString *)kCVPixelBufferHeightKey: @(avPreset->size.height())
</span><span class="cx">                 };
</span><span class="lines">@@ -444,7 +454,7 @@
</span><span class="cx">     [session() addInput:videoIn.get()];
</span><span class="cx"> 
</span><span class="cx">     m_videoOutput = adoptNS([allocAVCaptureVideoDataOutputInstance() init]);
</span><del>-    auto settingsDictionary = adoptNS([[NSMutableDictionary alloc] initWithObjectsAndKeys: [NSNumber numberWithInt:preferedPixelBufferFormat()], kCVPixelBufferPixelFormatTypeKey, nil]);
</del><ins>+    auto settingsDictionary = adoptNS([[NSMutableDictionary alloc] initWithObjectsAndKeys: [NSNumber numberWithInt:avVideoCapturePixelBufferFormat()], kCVPixelBufferPixelFormatTypeKey, nil]);
</ins><span class="cx"> 
</span><span class="cx">     [m_videoOutput setVideoSettings:settingsDictionary.get()];
</span><span class="cx">     [m_videoOutput setAlwaysDiscardsLateVideoFrames:YES];
</span><span class="lines">@@ -548,7 +558,7 @@
</span><span class="cx">             m_pixelBufferResizer = nullptr;
</span><span class="cx"> 
</span><span class="cx">         if (!m_pixelBufferResizer)
</span><del>-            m_pixelBufferResizer = std::make_unique<PixelBufferResizer>(m_requestedSize, preferedPixelBufferFormat());
</del><ins>+            m_pixelBufferResizer = std::make_unique<PixelBufferResizer>(m_requestedSize, avVideoCapturePixelBufferFormat());
</ins><span class="cx">     } else
</span><span class="cx">         m_pixelBufferResizer = nullptr;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>