<!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>[214694] 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/214694">214694</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2017-03-31 15:50:47 -0700 (Fri, 31 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Incoming video source doesn't propogate frame rotation
https://bugs.webkit.org/show_bug.cgi?id=170364
Reviewed by Youenn Fablet.
No new tests, the mock video source doesn't support rotation. Test will be added when
this is fixed in https://bugs.webkit.org/show_bug.cgi?id=169822. The changes were
verified manually.
* platform/mediastream/mac/RealtimeIncomingVideoSource.cpp:
(WebCore::RealtimeIncomingVideoSource::OnFrame): Convert frame rotation to sample
orientation and swap width and height when necessary.
(WebCore::RealtimeIncomingVideoSource::processNewSample):
* platform/mediastream/mac/RealtimeIncomingVideoSource.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeIncomingVideoSourcecpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeIncomingVideoSourceh">trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214693 => 214694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-31 22:48:50 UTC (rev 214693)
+++ trunk/Source/WebCore/ChangeLog        2017-03-31 22:50:47 UTC (rev 214694)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-03-31 Eric Carlson <eric.carlson@apple.com>
+
+ Incoming video source doesn't propogate frame rotation
+ https://bugs.webkit.org/show_bug.cgi?id=170364
+
+ Reviewed by Youenn Fablet.
+
+ No new tests, the mock video source doesn't support rotation. Test will be added when
+ this is fixed in https://bugs.webkit.org/show_bug.cgi?id=169822. The changes were
+ verified manually.
+
+ * platform/mediastream/mac/RealtimeIncomingVideoSource.cpp:
+ (WebCore::RealtimeIncomingVideoSource::OnFrame): Convert frame rotation to sample
+ orientation and swap width and height when necessary.
+ (WebCore::RealtimeIncomingVideoSource::processNewSample):
+ * platform/mediastream/mac/RealtimeIncomingVideoSource.h:
+
</ins><span class="cx"> 2017-03-31 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Possible null dereference under SourceBuffer::sourceBufferPrivateDidReceiveSample()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeIncomingVideoSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.cpp (214693 => 214694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.cpp        2017-03-31 22:48:50 UTC (rev 214693)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.cpp        2017-03-31 22:50:47 UTC (rev 214694)
</span><span class="lines">@@ -170,13 +170,32 @@
</span><span class="cx">
</span><span class="cx"> unsigned width = frame.width();
</span><span class="cx"> unsigned height = frame.height();
</span><ins>+
+ MediaSample::VideoOrientation orientation;
+ switch (frame.rotation()) {
+ case webrtc::kVideoRotation_0:
+ orientation = MediaSample::VideoOrientation::Portrait;
+ break;
+ case webrtc::kVideoRotation_180:
+ orientation = MediaSample::VideoOrientation::PortraitUpsideDown;
+ break;
+ case webrtc::kVideoRotation_90:
+ orientation = MediaSample::VideoOrientation::LandscapeRight;
+ std::swap(width, height);
+ break;
+ case webrtc::kVideoRotation_270:
+ orientation = MediaSample::VideoOrientation::LandscapeLeft;
+ std::swap(width, height);
+ break;
+ }
+
</ins><span class="cx"> RefPtr<RealtimeIncomingVideoSource> protectedThis(this);
</span><del>- callOnMainThread([protectedThis = WTFMove(protectedThis), sample = WTFMove(sample), width, height] {
- protectedThis->processNewSample(sample.get(), width, height);
</del><ins>+ callOnMainThread([protectedThis = WTFMove(protectedThis), sample = WTFMove(sample), width, height, orientation] {
+ protectedThis->processNewSample(sample.get(), width, height, orientation);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RealtimeIncomingVideoSource::processNewSample(CMSampleBufferRef sample, unsigned width, unsigned height)
</del><ins>+void RealtimeIncomingVideoSource::processNewSample(CMSampleBufferRef sample, unsigned width, unsigned height, MediaSample::VideoOrientation orientation)
</ins><span class="cx"> {
</span><span class="cx"> m_buffer = sample;
</span><span class="cx"> if (width != m_currentSettings.width() || height != m_currentSettings.height()) {
</span><span class="lines">@@ -185,7 +204,7 @@
</span><span class="cx"> settingsDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- videoSampleAvailable(MediaSampleAVFObjC::create(sample));
</del><ins>+ videoSampleAvailable(MediaSampleAVFObjC::create(sample, orientation));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<RealtimeMediaSourceCapabilities> RealtimeIncomingVideoSource::capabilities() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeIncomingVideoSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.h (214693 => 214694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.h        2017-03-31 22:48:50 UTC (rev 214693)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.h        2017-03-31 22:50:47 UTC (rev 214694)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> MediaConstraints& constraints() { return *m_constraints.get(); }
</span><span class="cx"> RealtimeMediaSourceSupportedConstraints& supportedConstraints();
</span><span class="cx">
</span><del>- void processNewSample(CMSampleBufferRef, unsigned, unsigned);
</del><ins>+ void processNewSample(CMSampleBufferRef, unsigned, unsigned, MediaSample::VideoOrientation);
</ins><span class="cx">
</span><span class="cx"> bool isProducingData() const final { return m_isProducingData && m_buffer; }
</span><span class="cx"> bool applySize(const IntSize&) final { return true; }
</span></span></pre>
</div>
</div>
</body>
</html>