<!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>[245033] trunk</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/245033">245033</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2019-05-07 14:07:00 -0700 (Tue, 07 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Video stream freeze on front camera orientation changing
https://bugs.webkit.org/show_bug.cgi?id=197227
<rdar://problem/50175498>

Reviewed by Eric Carlson.

Source/WebCore:

Use m_currentRotationSessionAngle instead of m_currentRotation to create or not a new rotation session.
Covered by updated test.

* platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.h:
* platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.mm:
(WebCore::RealtimeOutgoingVideoSourceCocoa::rotatePixelBuffer):

LayoutTests:

* webrtc/video-rotation-expected.txt:
* webrtc/video-rotation.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestswebrtcvideorotationexpectedtxt">trunk/LayoutTests/webrtc/video-rotation-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebrtcvideorotationhtml">trunk/LayoutTests/webrtc/video-rotation.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingVideoSourceCocoah">trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingVideoSourceCocoamm">trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (245032 => 245033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-05-07 21:04:09 UTC (rev 245032)
+++ trunk/LayoutTests/ChangeLog 2019-05-07 21:07:00 UTC (rev 245033)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-05-07  Youenn Fablet  <youenn@apple.com>
+
+        Video stream freeze on front camera orientation changing
+        https://bugs.webkit.org/show_bug.cgi?id=197227
+        <rdar://problem/50175498>
+
+        Reviewed by Eric Carlson.
+
+        * webrtc/video-rotation-expected.txt:
+        * webrtc/video-rotation.html:
+
</ins><span class="cx"> 2019-05-07  Brent Fulgham  <bfulgham@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Correct JSON parser to address unterminated escape character
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideorotationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-rotation-expected.txt (245032 => 245033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-rotation-expected.txt     2019-05-07 21:04:09 UTC (rev 245032)
+++ trunk/LayoutTests/webrtc/video-rotation-expected.txt        2019-05-07 21:07:00 UTC (rev 245033)
</span><span class="lines">@@ -3,4 +3,5 @@
</span><span class="cx"> PASS Setting video exchange 
</span><span class="cx"> PASS Track is enabled, video should not be black 
</span><span class="cx"> PASS Track is enabled and rotated, video should not be black and should change size 
</span><ins>+PASS Track is enabled and rotated again, video should not be black and should change size 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideorotationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video-rotation.html (245032 => 245033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video-rotation.html     2019-05-07 21:04:09 UTC (rev 245032)
+++ trunk/LayoutTests/webrtc/video-rotation.html        2019-05-07 21:07:00 UTC (rev 245033)
</span><span class="lines">@@ -86,6 +86,15 @@
</span><span class="cx">         return waitForVideoSize(video, 240, 320);
</span><span class="cx">     });
</span><span class="cx"> }, "Track is enabled and rotated, video should not be black and should change size");
</span><ins>+
+promise_test((test) => {
+    if (window.internals)
+        window.internals.setCameraMediaStreamTrackOrientation(track, 180);
+
+    return checkVideoBlack(false, "canvas1").then(() => {
+        return waitForVideoSize(video, 320, 240);
+    });
+}, "Track is enabled and rotated again, video should not be black and should change size");
</ins><span class="cx">         </script>
</span><span class="cx">     </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (245032 => 245033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-05-07 21:04:09 UTC (rev 245032)
+++ trunk/Source/WebCore/ChangeLog      2019-05-07 21:07:00 UTC (rev 245033)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2019-05-07  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><ins>+        Video stream freeze on front camera orientation changing
+        https://bugs.webkit.org/show_bug.cgi?id=197227
+        <rdar://problem/50175498>
+
+        Reviewed by Eric Carlson.
+
+        Use m_currentRotationSessionAngle instead of m_currentRotation to create or not a new rotation session.
+        Covered by updated test.
+
+        * platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.h:
+        * platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.mm:
+        (WebCore::RealtimeOutgoingVideoSourceCocoa::rotatePixelBuffer):
+
+2019-05-07  Youenn Fablet  <youenn@apple.com>
+
</ins><span class="cx">         getUserMedia framerate unusable under low light in iOS 12.2
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=196214
</span><span class="cx">         <rdar://problem/49232193>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingVideoSourceCocoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.h (245032 => 245033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.h 2019-05-07 21:04:09 UTC (rev 245032)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.h    2019-05-07 21:07:00 UTC (rev 245033)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">     std::unique_ptr<PixelBufferConformerCV> m_pixelBufferConformer;
</span><span class="cx">     RetainPtr<VTImageRotationSessionRef> m_rotationSession;
</span><span class="cx">     RetainPtr<CVPixelBufferPoolRef> m_rotationPool;
</span><del>-    webrtc::VideoRotation m_currentRotationAngle { webrtc::kVideoRotation_0 };
</del><ins>+    webrtc::VideoRotation m_currentRotationSessionAngle { webrtc::kVideoRotation_0 };
</ins><span class="cx">     size_t m_rotatedWidth { 0 };
</span><span class="cx">     size_t m_rotatedHeight { 0 };
</span><span class="cx">     OSType m_rotatedFormat;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingVideoSourceCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.mm (245032 => 245033)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.mm        2019-05-07 21:04:09 UTC (rev 245032)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.mm   2019-05-07 21:07:00 UTC (rev 245033)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">     if (!rotation)
</span><span class="cx">         return pixelBuffer;
</span><span class="cx"> 
</span><del>-    if (!m_rotationSession || rotation != m_currentRotation) {
</del><ins>+    if (!m_rotationSession || rotation != m_currentRotationSessionAngle) {
</ins><span class="cx">         VTImageRotationSessionRef rawRotationSession = nullptr;
</span><span class="cx">         auto status = VTImageRotationSessionCreate(kCFAllocatorDefault, rotation, &rawRotationSession);
</span><span class="cx">         if (status != noErr) {
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         m_rotationSession = adoptCF(rawRotationSession);
</span><del>-        m_currentRotation = rotation;
</del><ins>+        m_currentRotationSessionAngle = rotation;
</ins><span class="cx"> 
</span><span class="cx">         VTImageRotationSessionSetProperty(rawRotationSession, kVTImageRotationPropertyKey_EnableHighSpeedTransfer, kCFBooleanTrue);
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>