<!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>[187208] 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/187208">187208</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-22 21:15:15 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Needed to add methods to get PreviewCaptureLayers from Video
https://bugs.webkit.org/show_bug.cgi?id=147011
<rdar://problem/21861999>
Patch by Matthew Daiter <mdaiter@apple.com> on 2015-07-22
Reviewed by Jer Noble.
* platform/mediastream/mac/AVVideoCaptureSource.h: Added in preview
layer to class
(WebCore::AVVideoCaptureSource::previewLayer):
* platform/mediastream/mac/AVVideoCaptureSource.mm: Instantiate
previewLayer on load
(WebCore::AVVideoCaptureSource::setupCaptureSession):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourceh">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h</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 (187207 => 187208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-23 03:54:33 UTC (rev 187207)
+++ trunk/Source/WebCore/ChangeLog 2015-07-23 04:15:15 UTC (rev 187208)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-07-22 Matthew Daiter <mdaiter@apple.com>
+
+ Needed to add methods to get PreviewCaptureLayers from Video
+ https://bugs.webkit.org/show_bug.cgi?id=147011
+ <rdar://problem/21861999>
+
+ Reviewed by Jer Noble.
+
+ * platform/mediastream/mac/AVVideoCaptureSource.h: Added in preview
+ layer to class
+ (WebCore::AVVideoCaptureSource::previewLayer):
+ * platform/mediastream/mac/AVVideoCaptureSource.mm: Instantiate
+ previewLayer on load
+ (WebCore::AVVideoCaptureSource::setupCaptureSession):
+
</ins><span class="cx"> 2015-07-22 Sungmann Cho <sungmann.cho@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [EFL] The "Missing Plug-in" buttons are not showing up on some flash contents
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h (187207 => 187208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h 2015-07-23 03:54:33 UTC (rev 187207)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h 2015-07-23 04:15:15 UTC (rev 187208)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx">
</span><span class="cx"> #include "AVMediaCaptureSource.h"
</span><span class="cx">
</span><ins>+OBJC_CLASS AVCaptureVideoPreviewLayer;
+
</ins><span class="cx"> typedef const struct opaqueCMFormatDescription *CMFormatDescriptionRef;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -44,6 +46,8 @@
</span><span class="cx"> virtual int32_t width() const { return m_width; }
</span><span class="cx"> virtual int32_t height() const { return m_height; }
</span><span class="cx">
</span><ins>+ AVCaptureVideoPreviewLayer* previewLayer() { return m_videoPreviewLayer.get(); }
+
</ins><span class="cx"> private:
</span><span class="cx"> AVVideoCaptureSource(AVCaptureDevice*, const AtomicString&, PassRefPtr<MediaConstraints>);
</span><span class="cx"> virtual ~AVVideoCaptureSource();
</span><span class="lines">@@ -58,6 +62,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<AVCaptureConnection> m_videoConnection;
</span><span class="cx"> RetainPtr<CMFormatDescriptionRef> m_videoFormatDescription;
</span><ins>+ RetainPtr<AVCaptureVideoPreviewLayer> m_videoPreviewLayer;
</ins><span class="cx"> Vector<Float64> m_videoFrameTimeStamps;
</span><span class="cx"> Float64 m_frameRate;
</span><span class="cx"> int32_t m_width;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (187207 => 187208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2015-07-23 03:54:33 UTC (rev 187207)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2015-07-23 04:15:15 UTC (rev 187208)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> typedef AVCaptureDeviceInput AVCaptureDeviceInputType;
</span><span class="cx"> typedef AVCaptureOutput AVCaptureOutputType;
</span><span class="cx"> typedef AVCaptureVideoDataOutput AVCaptureVideoDataOutputType;
</span><ins>+typedef AVCaptureVideoPreviewLayer AVCaptureVideoPreviewLayerType;
</ins><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
</span><span class="cx">
</span><span class="lines">@@ -53,12 +54,14 @@
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVCaptureDeviceInput)
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVCaptureOutput)
</span><span class="cx"> SOFT_LINK_CLASS(AVFoundation, AVCaptureVideoDataOutput)
</span><ins>+SOFT_LINK_CLASS(AVFoundation, AVCaptureVideoPreviewLayer)
</ins><span class="cx">
</span><span class="cx"> #define AVCaptureConnection getAVCaptureConnectionClass()
</span><span class="cx"> #define AVCaptureDevice getAVCaptureDeviceClass()
</span><span class="cx"> #define AVCaptureDeviceInput getAVCaptureDeviceInputClass()
</span><span class="cx"> #define AVCaptureOutput getAVCaptureOutputClass()
</span><span class="cx"> #define AVCaptureVideoDataOutput getAVCaptureVideoDataOutputClass()
</span><ins>+#define AVCaptureVideoPreviewLayer getAVCaptureVideoPreviewLayerClass()
</ins><span class="cx">
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVMediaTypeAudio, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVMediaTypeVideo, NSString *)
</span><span class="lines">@@ -217,6 +220,8 @@
</span><span class="cx"> [session() addOutput:videoOutput.get()];
</span><span class="cx">
</span><span class="cx"> m_videoConnection = adoptNS([videoOutput.get() connectionWithMediaType:AVMediaTypeVideo]);
</span><ins>+
+ m_videoPreviewLayer = adoptNS([[AVCaptureVideoPreviewLayer alloc] initWithSession:session()]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AVVideoCaptureSource::calculateFramerate(CMSampleBufferRef sampleBuffer)
</span></span></pre>
</div>
</div>
</body>
</html>