<!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>[209188] 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/209188">209188</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-12-01 11:27:25 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream][Mac] Video presets sometimes don't work
https://bugs.webkit.org/show_bug.cgi?id=165214
<rdar://problem/29444533>
Reviewed by Jer Noble.
* platform/mediastream/mac/AVVideoCaptureSource.h:
* platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::setPreset): Set videoSettings width and height.
(WebCore::AVVideoCaptureSource::setupCaptureSession): Store videoSettings object for later use.
Set videoSettings width and height.
(WebCore::AVVideoCaptureSource::bestSessionPresetForVideoDimensions):
(WebCore::AVVideoCaptureSource::sizeForPreset): New.</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 (209187 => 209188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-01 18:41:08 UTC (rev 209187)
+++ trunk/Source/WebCore/ChangeLog 2016-12-01 19:27:25 UTC (rev 209188)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-01 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream][Mac] Video presets sometimes don't work
+ https://bugs.webkit.org/show_bug.cgi?id=165214
+ <rdar://problem/29444533>
+
+ Reviewed by Jer Noble.
+
+ * platform/mediastream/mac/AVVideoCaptureSource.h:
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::setPreset): Set videoSettings width and height.
+ (WebCore::AVVideoCaptureSource::setupCaptureSession): Store videoSettings object for later use.
+ Set videoSettings width and height.
+ (WebCore::AVVideoCaptureSource::bestSessionPresetForVideoDimensions):
+ (WebCore::AVVideoCaptureSource::sizeForPreset): New.
+
</ins><span class="cx"> 2016-12-01 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Promote the "on" property from AirPlayButton to IconButton
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h (209187 => 209188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h 2016-12-01 18:41:08 UTC (rev 209187)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h 2016-12-01 19:27:25 UTC (rev 209188)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> RetainPtr<NSString> m_pendingPreset;
</span><span class="cx"> RetainPtr<CMSampleBufferRef> m_buffer;
</span><span class="cx"> RetainPtr<CGImageRef> m_lastImage;
</span><ins>+ RetainPtr<AVCaptureVideoDataOutput> m_videoOutput;
</ins><span class="cx">
</span><span class="cx"> Vector<Float64> m_videoFrameTimeStamps;
</span><span class="cx"> Float64 m_frameRate { 0 };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (209187 => 209188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-12-01 18:41:08 UTC (rev 209187)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-12-01 19:27:25 UTC (rev 209188)
</span><span class="lines">@@ -333,6 +333,30 @@
</span><span class="cx"> return setPreset(preset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static IntSize sizeForPreset(NSString* preset)
+{
+ if (!preset)
+ return { };
+
+ if ([preset isEqualToString:AVCaptureSessionPreset1280x720])
+ return { 1280, 720 };
+
+ if ([preset isEqualToString:AVCaptureSessionPreset960x540])
+ return { 960, 540 };
+
+ if ([preset isEqualToString:AVCaptureSessionPreset640x480])
+ return { 640, 480 };
+
+ if ([preset isEqualToString:AVCaptureSessionPreset352x288])
+ return { 352, 288 };
+
+ if ([preset isEqualToString:AVCaptureSessionPreset320x240])
+ return { 320, 240 };
+
+ return { };
+
+}
+
</ins><span class="cx"> bool AVVideoCaptureSource::setPreset(NSString *preset)
</span><span class="cx"> {
</span><span class="cx"> if (!session()) {
</span><span class="lines">@@ -339,12 +363,17 @@
</span><span class="cx"> m_pendingPreset = preset;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- m_pendingPreset = nullptr;
- if (!preset)
</del><ins>+
+ auto size = sizeForPreset(preset);
+ if (size.width() == m_width && size.height() == m_height)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> @try {
</span><span class="cx"> session().sessionPreset = preset;
</span><ins>+#if PLATFORM(MAC)
+ auto settingsDictionary = @{ (NSString*)kCVPixelBufferPixelFormatTypeKey: @(videoCaptureFormat), (NSString*)kCVPixelBufferWidthKey: @(size.width()), (NSString*)kCVPixelBufferHeightKey: @(size.height()), };
+ [m_videoOutput setVideoSettings:settingsDictionary];
+#endif
</ins><span class="cx"> } @catch(NSException *exception) {
</span><span class="cx"> LOG(Media, "AVVideoCaptureSource::applySize(%p), exception thrown configuring device: <%s> %s", this, [[exception name] UTF8String], [[exception reason] UTF8String]);
</span><span class="cx"> return false;
</span><span class="lines">@@ -398,9 +427,6 @@
</span><span class="cx">
</span><span class="cx"> void AVVideoCaptureSource::setupCaptureSession()
</span><span class="cx"> {
</span><del>- if (m_pendingPreset)
- setPreset(m_pendingPreset.get());
-
</del><span class="cx"> NSError *error = nil;
</span><span class="cx"> RetainPtr<AVCaptureDeviceInputType> videoIn = adoptNS([allocAVCaptureDeviceInputInstance() initWithDevice:device() error:&error]);
</span><span class="cx"> if (error) {
</span><span class="lines">@@ -414,17 +440,30 @@
</span><span class="cx"> }
</span><span class="cx"> [session() addInput:videoIn.get()];
</span><span class="cx">
</span><del>- RetainPtr<AVCaptureVideoDataOutputType> videoOutput = adoptNS([allocAVCaptureVideoDataOutputInstance() init]);
- RetainPtr<NSDictionary> settingsDictionary = adoptNS([[NSDictionary alloc] initWithObjectsAndKeys: [NSNumber numberWithInt:videoCaptureFormat], kCVPixelBufferPixelFormatTypeKey, nil]);
- [videoOutput setVideoSettings:settingsDictionary.get()];
- [videoOutput setAlwaysDiscardsLateVideoFrames:YES];
- setVideoSampleBufferDelegate(videoOutput.get());
</del><ins>+ m_videoOutput = adoptNS([allocAVCaptureVideoDataOutputInstance() init]);
+ auto settingsDictionary = adoptNS([[NSMutableDictionary alloc] initWithObjectsAndKeys: [NSNumber numberWithInt:videoCaptureFormat], kCVPixelBufferPixelFormatTypeKey, nil]);
+ if (m_pendingPreset) {
+#if PLATFORM(MAC)
+ auto size = sizeForPreset(m_pendingPreset.get());
+ [settingsDictionary.get() setObject:[NSNumber numberWithInt:size.width()] forKey:(NSString*)kCVPixelBufferWidthKey];
+ [settingsDictionary.get() setObject:[NSNumber numberWithInt:size.height()] forKey:(NSString*)kCVPixelBufferHeightKey];
+#endif
+ }
</ins><span class="cx">
</span><del>- if (![session() canAddOutput:videoOutput.get()]) {
</del><ins>+ [m_videoOutput setVideoSettings:settingsDictionary.get()];
+ [m_videoOutput setAlwaysDiscardsLateVideoFrames:YES];
+ setVideoSampleBufferDelegate(m_videoOutput.get());
+
+ if (![session() canAddOutput:m_videoOutput.get()]) {
</ins><span class="cx"> LOG(Media, "AVVideoCaptureSource::setupCaptureSession(%p), unable to add video sample buffer output delegate", this);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- [session() addOutput:videoOutput.get()];
</del><ins>+ [session() addOutput:m_videoOutput.get()];
+
+#if PLATFORM(IOS)
+ setPreset(m_pendingPreset.get());
+#endif
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AVVideoCaptureSource::shutdownCaptureSession()
</span><span class="lines">@@ -567,7 +606,7 @@
</span><span class="cx"> return AVVideoSourcePreview::create(session(), device(), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NSString *AVVideoCaptureSource::bestSessionPresetForVideoDimensions(std::optional<int> width, std::optional<int> height) const
</del><ins>+NSString* AVVideoCaptureSource::bestSessionPresetForVideoDimensions(std::optional<int> width, std::optional<int> height) const
</ins><span class="cx"> {
</span><span class="cx"> if (!width && !height)
</span><span class="cx"> return nil;
</span></span></pre>
</div>
</div>
</body>
</html>