<!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>[209125] 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/209125">209125</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-30 00:36:45 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC][OpenWebRTC] Temporary device selection support
https://bugs.webkit.org/show_bug.cgi?id=165141
Reviewed by Alejandro G. Castro.
Make sure the player handles only one audio and video track at
most for now. The device choice can be influenced with the
WEBKIT_VIDEO_DEVICE and WEBKIT_AUDIO_DEVICE environment variables.
Each variable optionally holds the name of the device to use.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:
(WebCore::MediaPlayerPrivateGStreamerOwr::play):
(WebCore::MediaPlayerPrivateGStreamerOwr::load):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrcpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209124 => 209125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-30 08:30:51 UTC (rev 209124)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 08:36:45 UTC (rev 209125)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-11-29 Philippe Normand <pnormand@igalia.com>
+
+ [WebRTC][OpenWebRTC] Temporary device selection support
+ https://bugs.webkit.org/show_bug.cgi?id=165141
+
+ Reviewed by Alejandro G. Castro.
+
+ Make sure the player handles only one audio and video track at
+ most for now. The device choice can be influenced with the
+ WEBKIT_VIDEO_DEVICE and WEBKIT_AUDIO_DEVICE environment variables.
+ Each variable optionally holds the name of the device to use.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerOwr::play):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::load):
+
</ins><span class="cx"> 2016-11-29 Claudio Saavedra <csaavedra@igalia.com>
</span><span class="cx">
</span><span class="cx"> Build fix with !HAVE(ACCESSIBILITY)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp (209124 => 209125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp 2016-11-30 08:30:51 UTC (rev 209124)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp 2016-11-30 08:36:45 UTC (rev 209125)
</span><span class="lines">@@ -73,14 +73,11 @@
</span><span class="cx">
</span><span class="cx"> GST_DEBUG("Connecting to live stream, descriptor: %p", m_streamPrivate.get());
</span><span class="cx">
</span><del>- for (auto track : m_streamPrivate->tracks()) {
- if (!track->enabled()) {
- GST_DEBUG("Track %s disabled", track->label().ascii().data());
- continue;
- }
</del><ins>+ if (m_videoTrack)
+ maybeHandleChangeMutedState(*m_videoTrack.get());
</ins><span class="cx">
</span><del>- maybeHandleChangeMutedState(*track);
- }
</del><ins>+ if (m_audioTrack)
+ maybeHandleChangeMutedState(*m_audioTrack.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamerOwr::pause()
</span><span class="lines">@@ -192,18 +189,37 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- track->addObserver(*this);
</del><ins>+ GST_DEBUG("Processing track %s", track->label().ascii().data());
</ins><span class="cx">
</span><ins>+ bool observeTrack = false;
+
+ // TODO: Support for multiple tracks of the same type.
+
</ins><span class="cx"> switch (track->type()) {
</span><span class="cx"> case RealtimeMediaSource::Audio:
</span><del>- m_audioTrack = track;
</del><ins>+ if (!m_audioTrack) {
+ String preSelectedDevice = getenv("WEBKIT_AUDIO_DEVICE");
+ if (!preSelectedDevice || (preSelectedDevice == track->label())) {
+ m_audioTrack = track;
+ observeTrack = true;
+ }
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case RealtimeMediaSource::Video:
</span><del>- m_videoTrack = track;
</del><ins>+ if (!m_videoTrack) {
+ String preSelectedDevice = getenv("WEBKIT_VIDEO_DEVICE");
+ if (!preSelectedDevice || (preSelectedDevice == track->label())) {
+ m_videoTrack = track;
+ observeTrack = true;
+ }
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case RealtimeMediaSource::None:
</span><span class="cx"> GST_WARNING("Loading a track with None type");
</span><span class="cx"> }
</span><ins>+
+ if (observeTrack)
+ track->addObserver(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_readyState = MediaPlayer::HaveEnoughData;
</span></span></pre>
</div>
</div>
</body>
</html>