[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [239532] trunk
From: youenn () apple ! com
Date: 2018-12-22 2:14:31
Message-ID: 20181222021432.18D7810051CE () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[239532] 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/239532">239532</a></dd> \
<dt>Author</dt> <dd>youenn@apple.com</dd> <dt>Date</dt> <dd>2018-12-21 18:14:31 -0800 \
(Fri, 21 Dec 2018)</dd> </dl>
<h3>Log Message</h3>
<pre>RTCRtpSender.setParameters() does set active parameter
https://bugs.webkit.org/show_bug.cgi?id=192848
Reviewed by Eric Carlson.
Source/WebCore:
Covered by updated test.
* Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp:
(WebCore::updateRTCRtpSendParameters):
The routine was updating the local value, not the out parameter.
LayoutTests:
* webrtc/video.html:
Add a check for active value.
Test video freezing through canvas instead of stats.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestswebrtcvideohtml">trunk/LayoutTests/webrtc/video.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCUtilscpp">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (239531 => \
239532)</h4> <pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2018-12-22 01:37:00 UTC (rev \
239531)
+++ trunk/LayoutTests/ChangeLog 2018-12-22 02:14:31 UTC (rev 239532)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2018-12-21 Youenn Fablet <youenn@apple.com>
+
+ RTCRtpSender.setParameters() does set active parameter
+ https://bugs.webkit.org/show_bug.cgi?id=192848
+
+ Reviewed by Eric Carlson.
+
+ * webrtc/video.html:
+ Add a check for active value.
+ Test video freezing through canvas instead of stats.
+
</ins><span class="cx"> 2018-12-21 Justin Michaud <justin_michaud@apple.com>
</span><span class="cx">
</span><span class="cx"> CSS variables don't work for colors in \
"border" property </span></span></pre></div>
<a id="trunkLayoutTestswebrtcvideohtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/video.html (239531 => \
239532)</h4> <pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/video.html 2018-12-22 01:37:00 UTC \
(rev 239531)
+++ trunk/LayoutTests/webrtc/video.html 2018-12-22 02:14:31 UTC (rev 239532)
</span><span class="lines">@@ -14,15 +14,19 @@
</span><span class="cx"> video = document.getElementById("video");
</span><span class="cx"> canvas = document.getElementById("canvas");
</span><span class="cx">
</span><del>-function testImage()
</del><ins>+function grabFrameData(x, y, w, h)
</ins><span class="cx"> {
</span><span class="cx"> canvas.width = video.videoWidth;
</span><span class="cx"> canvas.height = video.videoHeight;
</span><del>- canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, \
canvas.height); </del><span class="cx">
</span><del>- imageData = canvas.getContext('2d').getImageData(10, 325, 250, 1);
- data = imageData.data;
</del><ins>+ canvas.getContext('2d').drawImage(video, x, y, w, h, x, y, w, h);
+ return canvas.getContext('2d').getImageData(x, y, w, h).data;
+}
</ins><span class="cx">
</span><ins>+function testImage()
+{
+ const data = grabFrameData(10, 325, 250, 1);
+
</ins><span class="cx"> var index = 20;
</span><span class="cx"> assert_true(data[index] < 100);
</span><span class="cx"> assert_true(data[index + 1] < 100);
</span><span class="lines">@@ -72,69 +76,50 @@
</span><span class="cx"> testImage();
</span><span class="cx"> }, "Basic video exchange");
</span><span class="cx">
</span><del>-async function getInboundRTPStatsNumberOfDecodedFrames(connection)
</del><ins>+function getCircleImageData()
</ins><span class="cx"> {
</span><del>- var report = await connection.getStats();
- var framesDecoded;
- report.forEach((statItem) => {
- if (statItem.type === "inbound-rtp")
- framesDecoded = statItem.framesDecoded;
- });
- return framesDecoded;
</del><ins>+ return grabFrameData(450, 100, 150, 100);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-async function testFrameDecodedIncreased(connection, count, \
previousFramesNumber) </del><ins>+async function checkVideoIsUpdated(shouldBeUpdated, \
count, referenceData) </ins><span class="cx"> {
</span><del>- if (previousFramesNumber === undefined) {
- let number = await getInboundRTPStatsNumberOfDecodedFrames(connection);
- await waitFor(1000);
- return testFrameDecodedIncreased(connection, 0, number);
- }
</del><ins>+ if (count === undefined)
+ count = 0;
+ else if (count >= 20)
+ return Promise.reject("checkVideoIsUpdated timed out :" + \
shouldBeUpdated + " " + count); </ins><span class="cx">
</span><del>- var number = await \
getInboundRTPStatsNumberOfDecodedFrames(connection);
- if (previousFramesNumber && number > previousFramesNumber)
- return;
</del><ins>+ if (referenceData === undefined)
+ referenceData = getCircleImageData();
</ins><span class="cx">
</span><del>- if (count >= 20)
- return Promise.reject("test increasing frame encoded timed out");
</del><ins>+ await waitFor(200);
+ const newData = getCircleImageData();
</ins><span class="cx">
</span><del>- await waitFor(1000);
- return testFrameDecodedIncreased(connection, ++count, previousFramesNumber);
-}
-
-async function testFrameDecodedDidNotIncreased(connection, count, \
previousFramesNumber)
-{
- if (previousFramesNumber === undefined) {
- let number = await getInboundRTPStatsNumberOfDecodedFrames(connection);
- await waitFor(100);
- return testFrameDecodedDidNotIncreased(connection, 0, number);
- }
-
- var number = await getInboundRTPStatsNumberOfDecodedFrames(connection);
- if (previousFramesNumber && number == previousFramesNumber)
</del><ins>+ if (shouldBeUpdated === (JSON.stringify(referenceData) !== \
JSON.stringify(newData))) </ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (count >= 20)
- return Promise.reject("test increasing frame encoded timed out");
-
- await waitFor(100);
- return testFrameDecodedIncreased(connection, ++count, number);
</del><ins>+ await checkVideoIsUpdated(shouldBeUpdated, ++count, newData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> promise_test(async (test) => {
</span><del>- let p = pc1.getSenders()[0].getParameters();
- p.encodings[0].active = false;
- await pc1.getSenders()[0].setParameters(p);
</del><ins>+ const sender = pc1.getSenders()[0];
+ let p = sender.getParameters();
+ p.encodings[0].active = false;
+ await sender.setParameters(p);
</ins><span class="cx">
</span><del>- await testFrameDecodedDidNotIncreased(pc2);
</del><ins>+ assert_false(sender.getParameters().encodings[0].active, \
"encodings[0].active should be false"); +
+ await checkVideoIsUpdated(false);
</ins><span class="cx"> }, "Call setParameters to disable sending a given \
encoding"); </span><span class="cx">
</span><span class="cx"> promise_test(async (test) => {
</span><del>- let p = pc1.getSenders()[0].getParameters();
- p.encodings[0].active = true;
- await pc1.getSenders()[0].setParameters(p);
</del><ins>+ const sender = pc1.getSenders()[0];
+ let p = sender.getParameters();
+ p.encodings[0].active = true;
+ await sender.setParameters(p);
</ins><span class="cx">
</span><del>- await testFrameDecodedIncreased(pc2);
</del><ins>+ assert_true(sender.getParameters().encodings[0].active, \
"encodings[0].active should be true"); +
+ await checkVideoIsUpdated(true);
</ins><span class="cx"> }, "Call setParameters to reenable sending a given \
encoding"); </span><span class="cx"> </script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (239531 => \
239532)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2018-12-22 01:37:00 UTC (rev \
239531)
+++ trunk/Source/WebCore/ChangeLog 2018-12-22 02:14:31 UTC (rev 239532)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2018-12-21 Youenn Fablet <youenn@apple.com>
+
+ RTCRtpSender.setParameters() does set active parameter
+ https://bugs.webkit.org/show_bug.cgi?id=192848
+
+ Reviewed by Eric Carlson.
+
+ Covered by updated test.
+
+ * Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp:
+ (WebCore::updateRTCRtpSendParameters):
+ The routine was updating the local value, not the out parameter.
+
</ins><span class="cx"> 2018-12-21 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> 'ended' Event doesn't fire on MediaStreamTrack when \
a USB camera is unplugged </span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCUtilscpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp (239531 => \
239532)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp 2018-12-22 \
01:37:00 UTC (rev 239531)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCUtils.cpp 2018-12-22 \
02:14:31 UTC (rev 239532) </span><span class="lines">@@ -160,10 +160,8 @@
</span><span class="cx"> return parameters;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void updateRTCRtpSendParameters(const RTCRtpSendParameters& \
parameters, webrtc::RtpParameters& currentParameters) </del><ins>+void \
updateRTCRtpSendParameters(const RTCRtpSendParameters& parameters, \
webrtc::RtpParameters& rtcParameters) </ins><span class="cx"> {
</span><del>- webrtc::RtpParameters rtcParameters = currentParameters;
-
</del><span class="cx"> rtcParameters.transaction_id = \
parameters.transactionId.utf8().data(); </span><span class="cx">
</span><span class="cx"> if (parameters.encodings.size() != \
rtcParameters.encodings.size()) { </span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic