<!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>[230227] trunk/Source</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/230227">230227</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2018-04-03 17:44:24 -0700 (Tue, 03 Apr 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>RealtimeOutgoingVideoSourceMac should pass a ObjCFrameBuffer buffer
https://bugs.webkit.org/show_bug.cgi?id=184281
rdar://problem/39153262

Reviewed by Jer Noble.

Source/ThirdParty/libwebrtc:

Introduce a routine to create the wrapper around native pixel buffers as expected by the new libwebrtc H264 encoder.

* Configurations/libwebrtc.iOS.exp:
* Configurations/libwebrtc.iOSsim.exp:
* Configurations/libwebrtc.mac.exp:
* Source/webrtc/sdk/WebKit/WebKitUtilities.h:
* Source/webrtc/sdk/WebKit/WebKitUtilities.mm:
(webrtc::pixelBufferToFrame):

Source/WebCore:

Covered by manual testing by going to WebRTC web sites.

* platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.cpp:
(WebCore::RealtimeOutgoingVideoSourceCocoa::sampleBufferUpdated):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceThirdPartylibwebrtcChangeLog">trunk/Source/ThirdParty/libwebrtc/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcConfigurationslibwebrtciOSexp">trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcConfigurationslibwebrtciOSsimexp">trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcConfigurationslibwebrtcmacexp">trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcewebrtcsdkWebKitWebKitUtilitiesh">trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitUtilities.h</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcewebrtcsdkWebKitWebKitUtilitiesmm">trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitUtilities.mm</a></li>
<li><a href="#trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjcFrameworkClassesVideoobjc_frame_buffermm">trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingVideoSourceCocoacpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceThirdPartylibwebrtcChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (230226 => 230227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/ChangeLog      2018-04-03 23:52:09 UTC (rev 230226)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2018-04-04 00:44:24 UTC (rev 230227)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2018-04-03  Youenn Fablet  <youenn@apple.com>
+
+        RealtimeOutgoingVideoSourceMac should pass a ObjCFrameBuffer buffer
+        https://bugs.webkit.org/show_bug.cgi?id=184281
+        rdar://problem/39153262
+
+        Reviewed by Jer Noble.
+
+        Introduce a routine to create the wrapper around native pixel buffers as expected by the new libwebrtc H264 encoder.
+
+        * Configurations/libwebrtc.iOS.exp:
+        * Configurations/libwebrtc.iOSsim.exp:
+        * Configurations/libwebrtc.mac.exp:
+        * Source/webrtc/sdk/WebKit/WebKitUtilities.h:
+        * Source/webrtc/sdk/WebKit/WebKitUtilities.mm:
+        (webrtc::pixelBufferToFrame):
+
</ins><span class="cx"> 2018-04-02  Alejandro G. Castro  <alex@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed fixing GTK port X86 32bits compilation after r230152.
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcConfigurationslibwebrtciOSexp"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp (230226 => 230227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp       2018-04-03 23:52:09 UTC (rev 230226)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp  2018-04-04 00:44:24 UTC (rev 230227)
</span><span class="lines">@@ -130,3 +130,4 @@
</span><span class="cx"> __ZN6webrtc32createVideoToolboxEncoderFactoryEv
</span><span class="cx"> __ZN6webrtc29setH264HardwareEncoderAllowedEb
</span><span class="cx"> __ZN6webrtc20pixelBufferFromFrameERKNS_10VideoFrameE
</span><ins>+__ZN6webrtc18pixelBufferToFrameEP10__CVBuffer
</ins></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcConfigurationslibwebrtciOSsimexp"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp (230226 => 230227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp    2018-04-03 23:52:09 UTC (rev 230226)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp       2018-04-04 00:44:24 UTC (rev 230227)
</span><span class="lines">@@ -130,3 +130,4 @@
</span><span class="cx"> __ZN6webrtc32createVideoToolboxEncoderFactoryEv
</span><span class="cx"> __ZN6webrtc29setH264HardwareEncoderAllowedEb
</span><span class="cx"> __ZN6webrtc20pixelBufferFromFrameERKNS_10VideoFrameE
</span><ins>+__ZN6webrtc18pixelBufferToFrameEP10__CVBuffer
</ins></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcConfigurationslibwebrtcmacexp"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp (230226 => 230227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp       2018-04-03 23:52:09 UTC (rev 230226)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp  2018-04-04 00:44:24 UTC (rev 230227)
</span><span class="lines">@@ -131,3 +131,4 @@
</span><span class="cx"> __ZN6webrtc32createVideoToolboxEncoderFactoryEv
</span><span class="cx"> __ZN6webrtc29setH264HardwareEncoderAllowedEb
</span><span class="cx"> __ZN6webrtc20pixelBufferFromFrameERKNS_10VideoFrameE
</span><ins>+__ZN6webrtc18pixelBufferToFrameEP10__CVBuffer
</ins></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcewebrtcsdkWebKitWebKitUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitUtilities.h (230226 => 230227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitUtilities.h     2018-04-03 23:52:09 UTC (rev 230226)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitUtilities.h        2018-04-04 00:44:24 UTC (rev 230227)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><span class="cx"> #include "api/video_codecs/video_encoder_factory.h"
</span><ins>+#include "api/video/video_frame_buffer.h"
+#include "rtc_base/scoped_ref_ptr.h"
</ins><span class="cx"> 
</span><span class="cx"> typedef struct __CVBuffer* CVPixelBufferRef;
</span><span class="cx"> 
</span><span class="lines">@@ -44,5 +46,6 @@
</span><span class="cx"> bool isH264HardwareEncoderAllowed();
</span><span class="cx"> 
</span><span class="cx"> CVPixelBufferRef pixelBufferFromFrame(const VideoFrame&);
</span><ins>+rtc::scoped_refptr<webrtc::VideoFrameBuffer> pixelBufferToFrame(CVPixelBufferRef);
</ins><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcewebrtcsdkWebKitWebKitUtilitiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitUtilities.mm (230226 => 230227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitUtilities.mm    2018-04-03 23:52:09 UTC (rev 230226)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitUtilities.mm       2018-04-04 00:44:24 UTC (rev 230227)
</span><span class="lines">@@ -117,6 +117,12 @@
</span><span class="cx">     return h264HardwareEncoderAllowed;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+rtc::scoped_refptr<webrtc::VideoFrameBuffer> pixelBufferToFrame(CVPixelBufferRef pixelBuffer)
+{
+    RTCCVPixelBuffer *frameBuffer = [[RTCCVPixelBuffer alloc] initWithPixelBuffer: pixelBuffer];
+    return new rtc::RefCountedObject<webrtc::ObjCFrameBuffer>(frameBuffer);
+}
+
</ins><span class="cx"> CVPixelBufferRef pixelBufferFromFrame(const VideoFrame& frame)
</span><span class="cx"> {
</span><span class="cx">     auto buffer = frame.video_frame_buffer();
</span></span></pre></div>
<a id="trunkSourceThirdPartylibwebrtcSourcewebrtcsdkobjcFrameworkClassesVideoobjc_frame_buffermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm (230226 => 230227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm    2018-04-03 23:52:09 UTC (rev 230226)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/Video/objc_frame_buffer.mm       2018-04-04 00:44:24 UTC (rev 230227)
</span><span class="lines">@@ -50,7 +50,10 @@
</span><span class="cx"> ObjCFrameBuffer::ObjCFrameBuffer(id<RTCVideoFrameBuffer> frame_buffer)
</span><span class="cx">     : frame_buffer_(frame_buffer), width_(frame_buffer.width), height_(frame_buffer.height) {}
</span><span class="cx"> 
</span><del>-ObjCFrameBuffer::~ObjCFrameBuffer() {}
</del><ins>+ObjCFrameBuffer::~ObjCFrameBuffer() {
+    // FIXME: Activate ARC.
+    [frame_buffer_ release];
+}
</ins><span class="cx"> 
</span><span class="cx"> VideoFrameBuffer::Type ObjCFrameBuffer::type() const {
</span><span class="cx">   return Type::kNative;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (230226 => 230227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-04-03 23:52:09 UTC (rev 230226)
+++ trunk/Source/WebCore/ChangeLog      2018-04-04 00:44:24 UTC (rev 230227)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2018-04-03  Youenn Fablet  <youenn@apple.com>
+
+        RealtimeOutgoingVideoSourceMac should pass a ObjCFrameBuffer buffer
+        https://bugs.webkit.org/show_bug.cgi?id=184281
+        rdar://problem/39153262
+
+        Reviewed by Jer Noble.
+
+        Covered by manual testing by going to WebRTC web sites.
+
+        * platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.cpp:
+        (WebCore::RealtimeOutgoingVideoSourceCocoa::sampleBufferUpdated):
+
</ins><span class="cx"> 2018-04-03  Filip Pizlo  <fpizlo@apple.com>
</span><span class="cx"> 
</span><span class="cx">         GC shouldn't do object distancing
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingVideoSourceCocoacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.cpp (230226 => 230227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.cpp       2018-04-03 23:52:09 UTC (rev 230226)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.cpp  2018-04-04 00:44:24 UTC (rev 230227)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include <webrtc/api/video/i420_buffer.h>
</span><span class="cx"> #include <webrtc/common_video/libyuv/include/webrtc_libyuv.h>
</span><ins>+#include <webrtc/sdk/WebKit/WebKitUtilities.h>
</ins><span class="cx"> #include <webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.h>
</span><span class="cx"> #include <pal/cf/CoreMediaSoftLink.h>
</span><span class="cx"> #include "CoreVideoSoftLink.h"
</span><span class="lines">@@ -147,7 +148,7 @@
</span><span class="cx">     auto pixelFormatType = CVPixelBufferGetPixelFormatType(pixelBuffer);
</span><span class="cx"> 
</span><span class="cx">     if (pixelFormatType == kCVPixelFormatType_420YpCbCr8Planar || pixelFormatType == kCVPixelFormatType_420YpCbCr8BiPlanarFullRange) {
</span><del>-        rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer = new rtc::RefCountedObject<webrtc::CoreVideoFrameBuffer>(pixelBuffer);
</del><ins>+        rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer = webrtc::pixelBufferToFrame(pixelBuffer);
</ins><span class="cx">         if (m_shouldApplyRotation && m_currentRotation != webrtc::kVideoRotation_0) {
</span><span class="cx">             // FIXME: We should make AVVideoCaptureSource handle the rotation whenever possible.
</span><span class="cx">             // This implementation is inefficient, we should rotate on the CMSampleBuffer directly instead of doing this double allocation.
</span></span></pre>
</div>
</div>

</body>
</html>