<!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>[196117] 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/196117">196117</a></dd>
<dt>Author</dt> <dd>alex@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-04 03:39:31 -0800 (Thu, 04 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Implement mediastream mediaplayer
https://bugs.webkit.org/show_bug.cgi?id=153541
Reviewed by Martin Robinson.
Added the implementation of the mediaplayer for the
mediastream. The code was implemented by Philippe Normand and
Alessandro Decina.
* PlatformGTK.cmake: Added the file to the compilation.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::setSrcObject): Set the src of the
media element to the mediastream.
* platform/graphics/MediaPlayer.cpp:
(WebCore::buildMediaEnginesVector): Register the mediastream
mediaplayer as an option in the media engines vector.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp: Added.
(WebCore::MediaPlayerPrivateGStreamerOwr::MediaPlayerPrivateGStreamerOwr):
(WebCore::MediaPlayerPrivateGStreamerOwr::~MediaPlayerPrivateGStreamerOwr):
(WebCore::MediaPlayerPrivateGStreamerOwr::play):
(WebCore::MediaPlayerPrivateGStreamerOwr::pause):
(WebCore::MediaPlayerPrivateGStreamerOwr::hasVideo):
(WebCore::MediaPlayerPrivateGStreamerOwr::hasAudio):
(WebCore::MediaPlayerPrivateGStreamerOwr::currentTime):
(WebCore::MediaPlayerPrivateGStreamerOwr::load):
(WebCore::MediaPlayerPrivateGStreamerOwr::loadingFailed):
(WebCore::MediaPlayerPrivateGStreamerOwr::didLoadingProgress):
(WebCore::MediaPlayerPrivateGStreamerOwr::internalLoad):
(WebCore::MediaPlayerPrivateGStreamerOwr::stop):
(WebCore::MediaPlayerPrivateGStreamerOwr::registerMediaEngine):
(WebCore::MediaPlayerPrivateGStreamerOwr::getSupportedTypes):
(WebCore::MediaPlayerPrivateGStreamerOwr::supportsType):
(WebCore::MediaPlayerPrivateGStreamerOwr::isAvailable):
(WebCore::MediaPlayerPrivateGStreamerOwr::createGSTAudioSinkBin):
(WebCore::MediaPlayerPrivateGStreamerOwr::sourceStopped):
(WebCore::MediaPlayerPrivateGStreamerOwr::sourceMutedChanged):
(WebCore::MediaPlayerPrivateGStreamerOwr::sourceSettingsChanged):
(WebCore::MediaPlayerPrivateGStreamerOwr::preventSourceFromStopping):
(WebCore::MediaPlayerPrivateGStreamerOwr::createVideoSink):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h: Added.
(WebCore::MediaPlayerPrivateGStreamerOwr::engineDescription):
(WebCore::MediaPlayerPrivateGStreamerOwr::load):
(WebCore::MediaPlayerPrivateGStreamerOwr::cancelLoad):
(WebCore::MediaPlayerPrivateGStreamerOwr::prepareToPlay):
(WebCore::MediaPlayerPrivateGStreamerOwr::duration):
(WebCore::MediaPlayerPrivateGStreamerOwr::seek):
(WebCore::MediaPlayerPrivateGStreamerOwr::seeking):
(WebCore::MediaPlayerPrivateGStreamerOwr::setRate):
(WebCore::MediaPlayerPrivateGStreamerOwr::setPreservesPitch):
(WebCore::MediaPlayerPrivateGStreamerOwr::paused):
(WebCore::MediaPlayerPrivateGStreamerOwr::hasClosedCaptions):
(WebCore::MediaPlayerPrivateGStreamerOwr::setClosedCaptionsVisible):
(WebCore::MediaPlayerPrivateGStreamerOwr::maxTimeSeekable):
(WebCore::MediaPlayerPrivateGStreamerOwr::buffered):
(WebCore::MediaPlayerPrivateGStreamerOwr::totalBytes):
(WebCore::MediaPlayerPrivateGStreamerOwr::bytesLoaded):
(WebCore::MediaPlayerPrivateGStreamerOwr::canLoadPoster):
(WebCore::MediaPlayerPrivateGStreamerOwr::setPoster):
(WebCore::MediaPlayerPrivateGStreamerOwr::isLiveStream):
(WebCore::MediaPlayerPrivateGStreamerOwr::audioSink):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrcpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (196116 => 196117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-04 11:14:04 UTC (rev 196116)
+++ trunk/Source/WebCore/ChangeLog 2016-02-04 11:39:31 UTC (rev 196117)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2016-02-04 Alejandro G. Castro <alex@igalia.com>
+
+ [GTK] Implement mediastream mediaplayer
+ https://bugs.webkit.org/show_bug.cgi?id=153541
+
+ Reviewed by Martin Robinson.
+
+ Added the implementation of the mediaplayer for the
+ mediastream. The code was implemented by Philippe Normand and
+ Alessandro Decina.
+
+ * PlatformGTK.cmake: Added the file to the compilation.
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setSrcObject): Set the src of the
+ media element to the mediastream.
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::buildMediaEnginesVector): Register the mediastream
+ mediaplayer as an option in the media engines vector.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp: Added.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::MediaPlayerPrivateGStreamerOwr):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::~MediaPlayerPrivateGStreamerOwr):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::play):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::pause):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::hasVideo):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::hasAudio):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::currentTime):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::load):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::loadingFailed):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::didLoadingProgress):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::internalLoad):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::stop):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::registerMediaEngine):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::getSupportedTypes):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::supportsType):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::isAvailable):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::createGSTAudioSinkBin):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::sourceStopped):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::sourceMutedChanged):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::sourceSettingsChanged):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::preventSourceFromStopping):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::createVideoSink):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h: Added.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::engineDescription):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::load):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::cancelLoad):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::prepareToPlay):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::duration):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::seek):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::seeking):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::setRate):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::setPreservesPitch):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::paused):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::hasClosedCaptions):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::setClosedCaptionsVisible):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::maxTimeSeekable):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::buffered):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::totalBytes):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::bytesLoaded):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::canLoadPoster):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::setPoster):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::isLiveStream):
+ (WebCore::MediaPlayerPrivateGStreamerOwr::audioSink):
+
</ins><span class="cx"> 2016-02-04 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Add support for iterating over Headers
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (196116 => 196117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2016-02-04 11:14:04 UTC (rev 196116)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2016-02-04 11:39:31 UTC (rev 196117)
</span><span class="lines">@@ -388,6 +388,9 @@
</span><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><span class="cx"> ${OPENWEBRTC_LIBRARIES}
</span><span class="cx"> )
</span><ins>+ list(APPEND WebCore_SOURCES
+ platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp
+ )
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (196116 => 196117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2016-02-04 11:14:04 UTC (rev 196116)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-02-04 11:39:31 UTC (rev 196117)
</span><span class="lines">@@ -407,6 +407,9 @@
</span><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><span class="cx"> ${OPENWEBRTC_LIBRARIES}
</span><span class="cx"> )
</span><ins>+ list(APPEND WebCore_SOURCES
+ platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp
+ )
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (USE_TEXTURE_MAPPER)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (196116 => 196117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-02-04 11:14:04 UTC (rev 196116)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-02-04 11:39:31 UTC (rev 196117)
</span><span class="lines">@@ -133,6 +133,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><ins>+#include "DOMURL.h"
</ins><span class="cx"> #include "MediaStream.h"
</span><span class="cx"> #include "MediaStreamRegistry.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -908,6 +909,7 @@
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=124896
</span><span class="cx">
</span><span class="cx"> m_mediaStreamSrcObject = mediaStream;
</span><ins>+ setSrc(DOMURL::createPublicURL(ActiveDOMObject::scriptExecutionContext(), mediaStream));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (196116 => 196117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-02-04 11:14:04 UTC (rev 196116)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2016-02-04 11:39:31 UTC (rev 196117)
</span><span class="lines">@@ -53,6 +53,9 @@
</span><span class="cx">
</span><span class="cx"> #if USE(GSTREAMER)
</span><span class="cx"> #include "MediaPlayerPrivateGStreamer.h"
</span><ins>+#if ENABLE(MEDIA_STREAM) && USE(OPENWEBRTC)
+#include "MediaPlayerPrivateGStreamerOwr.h"
+#endif
</ins><span class="cx"> #define PlatformMediaEngineClassName MediaPlayerPrivateGStreamer
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -209,6 +212,11 @@
</span><span class="cx"> MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && USE(OPENWEBRTC)
+ MediaPlayerPrivateGStreamerOwr::registerMediaEngine(addMediaEngine);
+#endif
+
</ins><span class="cx"> #if defined(PlatformMediaEngineClassName)
</span><span class="cx"> PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp (0 => 196117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp 2016-02-04 11:39:31 UTC (rev 196117)
</span><span class="lines">@@ -0,0 +1,324 @@
</span><ins>+/*
+ * Copyright (C) 2012 Collabora Ltd. All rights reserved.
+ * Copyright (C) 2014, 2015 Igalia S.L. All rights reserved.
+ * Copyright (C) 2015 Metrological All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#include "MediaPlayerPrivateGStreamerOwr.h"
+
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && USE(OPENWEBRTC)
+
+#include "GStreamerUtilities.h"
+#include "MediaPlayer.h"
+#include "MediaStreamPrivate.h"
+#include "NotImplemented.h"
+#include "RealtimeMediaSourceOwr.h"
+#include "URL.h"
+#include <gst/audio/streamvolume.h>
+#include <owr/owr.h>
+#include <owr/owr_gst_audio_renderer.h>
+#include <owr/owr_gst_video_renderer.h>
+#include <wtf/text/CString.h>
+
+GST_DEBUG_CATEGORY(webkit_openwebrtc_debug);
+#define GST_CAT_DEFAULT webkit_openwebrtc_debug
+
+namespace WebCore {
+
+MediaPlayerPrivateGStreamerOwr::MediaPlayerPrivateGStreamerOwr(MediaPlayer* player)
+ : MediaPlayerPrivateGStreamerBase(player)
+{
+ if (initializeGStreamerAndGStreamerDebugging()) {
+ LOG_MEDIA_MESSAGE("Creating MediaPlayerPrivateGStreamerOwr");
+
+ createVideoSink();
+ createGSTAudioSinkBin();
+ }
+}
+
+MediaPlayerPrivateGStreamerOwr::~MediaPlayerPrivateGStreamerOwr()
+{
+ LOG_MEDIA_MESSAGE("Destroying");
+
+ stop();
+}
+
+void MediaPlayerPrivateGStreamerOwr::play()
+{
+ LOG_MEDIA_MESSAGE("Play");
+
+ if (!m_streamPrivate || !m_streamPrivate->active()) {
+ m_readyState = MediaPlayer::HaveNothing;
+ loadingFailed(MediaPlayer::Empty);
+ return;
+ }
+
+ m_paused = false;
+ internalLoad();
+}
+
+void MediaPlayerPrivateGStreamerOwr::pause()
+{
+ LOG_MEDIA_MESSAGE("Pause");
+ m_paused = true;
+ stop();
+}
+
+bool MediaPlayerPrivateGStreamerOwr::hasVideo() const
+{
+ return m_videoSource;
+}
+
+bool MediaPlayerPrivateGStreamerOwr::hasAudio() const
+{
+ return m_audioSource;
+}
+
+float MediaPlayerPrivateGStreamerOwr::currentTime() const
+{
+ gint64 position = GST_CLOCK_TIME_NONE;
+ GstQuery* query = gst_query_new_position(GST_FORMAT_TIME);
+
+ if (m_videoSource && gst_element_query(m_videoSink.get(), query))
+ gst_query_parse_position(query, 0, &position);
+ else if (m_audioSource && gst_element_query(m_audioSink.get(), query))
+ gst_query_parse_position(query, 0, &position);
+
+ float result = 0;
+ if (static_cast<GstClockTime>(position) != GST_CLOCK_TIME_NONE)
+ result = static_cast<double>(position) / GST_SECOND;
+
+ LOG_MEDIA_MESSAGE("Position %" GST_TIME_FORMAT, GST_TIME_ARGS(position));
+ gst_query_unref(query);
+
+ return result;
+}
+
+void MediaPlayerPrivateGStreamerOwr::load(const String &)
+{
+ notImplemented();
+}
+
+void MediaPlayerPrivateGStreamerOwr::load(MediaStreamPrivate& streamPrivate)
+{
+ if (!initializeGStreamer())
+ return;
+
+ LOG_MEDIA_MESSAGE("Loading MediaStreamPrivate %p", &streamPrivate);
+
+ m_streamPrivate = &streamPrivate;
+ if (!m_streamPrivate->active()) {
+ loadingFailed(MediaPlayer::NetworkError);
+ return;
+ }
+
+ m_readyState = MediaPlayer::HaveNothing;
+ m_networkState = MediaPlayer::Loading;
+ m_player->networkStateChanged();
+ m_player->readyStateChanged();
+
+ if (!internalLoad())
+ return;
+
+ // If the stream contains video, wait for first video frame before setting
+ // HaveEnoughData.
+ if (!hasVideo())
+ m_readyState = MediaPlayer::HaveEnoughData;
+
+ m_player->readyStateChanged();
+}
+
+void MediaPlayerPrivateGStreamerOwr::loadingFailed(MediaPlayer::NetworkState error)
+{
+ if (m_networkState != error) {
+ m_networkState = error;
+ m_player->networkStateChanged();
+ }
+ if (m_readyState != MediaPlayer::HaveNothing) {
+ m_readyState = MediaPlayer::HaveNothing;
+ m_player->readyStateChanged();
+ }
+}
+
+bool MediaPlayerPrivateGStreamerOwr::didLoadingProgress() const
+{
+ // FIXME: Implement loading progress support.
+ return true;
+}
+
+bool MediaPlayerPrivateGStreamerOwr::internalLoad()
+{
+ if (!m_stopped)
+ return false;
+
+ m_stopped = false;
+ if (!m_streamPrivate || !m_streamPrivate->active()) {
+ loadingFailed(MediaPlayer::NetworkError);
+ return false;
+ }
+
+ LOG_MEDIA_MESSAGE("Connecting to live stream, descriptor: %p", m_streamPrivate.get());
+
+ for (auto track : m_streamPrivate->tracks()) {
+ if (!track->enabled()) {
+ LOG_MEDIA_MESSAGE("Track %s disabled", track->label().ascii().data());
+ continue;
+ }
+
+ RealtimeMediaSourceOwr* source = reinterpret_cast<RealtimeMediaSourceOwr*>(&track->source());
+ OwrMediaSource* mediaSource = OWR_MEDIA_SOURCE(source->mediaSource());
+
+ switch (track->type()) {
+ case RealtimeMediaSource::Audio:
+ if (m_audioSource && (m_audioSource.get() == source))
+ g_object_set(m_audioRenderer.get(), "disabled", FALSE, nullptr);
+
+ owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_audioRenderer.get()), mediaSource);
+ m_audioSource = source;
+ source->addObserver(this);
+ break;
+ case RealtimeMediaSource::Video:
+ if (m_videoSource && (m_videoSource.get() == source))
+ g_object_set(m_videoRenderer.get(), "disabled", FALSE, nullptr);
+
+ // FIXME: Remove hardcoded video dimensions when the rendering performance:
+ // https://webkit.org/b/153826.
+ g_object_set(m_videoRenderer.get(), "width", 640, "height", 480, nullptr);
+ owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_videoRenderer.get()), mediaSource);
+ m_videoSource = source;
+ source->addObserver(this);
+ break;
+ case RealtimeMediaSource::None:
+ WARN_MEDIA_MESSAGE("Loading a track with None type");
+ }
+ }
+
+ m_readyState = MediaPlayer::HaveEnoughData;
+ m_player->readyStateChanged();
+ return true;
+}
+
+void MediaPlayerPrivateGStreamerOwr::stop()
+{
+ if (m_stopped)
+ return;
+
+ m_stopped = true;
+ if (m_audioSource) {
+ LOG_MEDIA_MESSAGE("Stop: disconnecting audio");
+ g_object_set(m_audioRenderer.get(), "disabled", TRUE, nullptr);
+ }
+ if (m_videoSource) {
+ LOG_MEDIA_MESSAGE("Stop: disconnecting video");
+ g_object_set(m_videoRenderer.get(), "disabled", TRUE, nullptr);
+ }
+}
+
+void MediaPlayerPrivateGStreamerOwr::registerMediaEngine(MediaEngineRegistrar registrar)
+{
+ if (initializeGStreamerAndGStreamerDebugging()) {
+ registrar([](MediaPlayer* player) {
+ return std::make_unique<MediaPlayerPrivateGStreamerOwr>(player);
+ }, getSupportedTypes, supportsType, 0, 0, 0, 0);
+ }
+}
+
+void MediaPlayerPrivateGStreamerOwr::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>&)
+{
+ // Not supported in this media player.
+}
+
+MediaPlayer::SupportsType MediaPlayerPrivateGStreamerOwr::supportsType(const MediaEngineSupportParameters&)
+{
+ return MediaPlayer::IsNotSupported;
+}
+
+bool MediaPlayerPrivateGStreamerOwr::initializeGStreamerAndGStreamerDebugging()
+{
+ if (!initializeGStreamer())
+ return false;
+
+ static std::once_flag debugRegisteredFlag;
+ std::call_once(debugRegisteredFlag, [] {
+ GST_DEBUG_CATEGORY_INIT(webkit_openwebrtc_debug, "webkitowrplayer", 0, "WebKit OpenWebRTC player");
+ });
+
+ return true;
+}
+
+void MediaPlayerPrivateGStreamerOwr::createGSTAudioSinkBin()
+{
+ ASSERT(!m_audioSink);
+ LOG_MEDIA_MESSAGE("Creating audio sink");
+ // FIXME: volume/mute support: https://webkit.org/b/153828.
+
+ GRefPtr<GstElement> sink = gst_element_factory_make("autoaudiosink", 0);
+ GstChildProxy* childProxy = GST_CHILD_PROXY(sink.get());
+ m_audioSink = adoptGRef(GST_ELEMENT(gst_child_proxy_get_child_by_index(childProxy, 0)));
+ gst_element_set_state(sink.get(), GST_STATE_NULL);
+
+ m_audioRenderer = adoptGRef(owr_gst_audio_renderer_new(m_audioSink.get()));
+}
+
+void MediaPlayerPrivateGStreamerOwr::sourceStopped()
+{
+ LOG_MEDIA_MESSAGE("Source stopped");
+
+ if (!m_streamPrivate || !m_streamPrivate->active()) {
+ stop();
+ return;
+ }
+
+ for (auto& track : m_streamPrivate->tracks()) {
+ auto* source = reinterpret_cast<RealtimeMediaSourceOwr*>(&track->source());
+ if (track->enabled())
+ continue;
+ if (source == m_audioSource)
+ g_object_set(m_audioRenderer.get(), "disabled", TRUE, nullptr);
+ else if (source == m_videoSource)
+ g_object_set(m_videoRenderer.get(), "disabled", TRUE, nullptr);
+ }
+}
+
+void MediaPlayerPrivateGStreamerOwr::sourceMutedChanged()
+{
+ LOG_MEDIA_MESSAGE("Source muted state changed");
+}
+
+void MediaPlayerPrivateGStreamerOwr::sourceSettingsChanged()
+{
+ LOG_MEDIA_MESSAGE("Source settings changed");
+}
+
+bool MediaPlayerPrivateGStreamerOwr::preventSourceFromStopping()
+{
+ LOG_MEDIA_MESSAGE("Prevent source from stopping");
+ return false;
+}
+
+GstElement* MediaPlayerPrivateGStreamerOwr::createVideoSink()
+{
+ GstElement* sink = MediaPlayerPrivateGStreamerBase::createVideoSink();
+ m_videoRenderer = adoptGRef(owr_gst_video_renderer_new(sink));
+ return sink;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && USE(OPENWEBRTC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h (0 => 196117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h 2016-02-04 11:39:31 UTC (rev 196117)
</span><span class="lines">@@ -0,0 +1,114 @@
</span><ins>+/*
+ * Copyright (C) 2015 Igalia S.L. All rights reserved.
+ * Copyright (C) 2015 Metrological. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef MediaPlayerPrivateGStreamerOwr_h
+#define MediaPlayerPrivateGStreamerOwr_h
+
+#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && USE(OPENWEBRTC)
+
+#include "MediaPlayerPrivateGStreamerBase.h"
+#include "RealtimeMediaSource.h"
+
+typedef struct _OwrGstVideoRenderer OwrGstVideoRenderer;
+typedef struct _OwrGstAudioRenderer OwrGstAudioRenderer;
+
+namespace WebCore {
+
+class MediaStreamPrivate;
+class RealtimeMediaSourceOwr;
+
+class MediaPlayerPrivateGStreamerOwr : public MediaPlayerPrivateGStreamerBase, private RealtimeMediaSource::Observer {
+public:
+ explicit MediaPlayerPrivateGStreamerOwr(MediaPlayer*);
+ ~MediaPlayerPrivateGStreamerOwr();
+
+ static void registerMediaEngine(MediaEngineRegistrar);
+
+private:
+ GstElement* createVideoSink() override;
+ GstElement* audioSink() const override { return m_audioSink.get(); }
+ bool isLiveStream() const override { return true; }
+
+ String engineDescription() const override { return "OpenWebRTC"; }
+
+ void load(const String&) override;
+#if ENABLE(MEDIA_SOURCE)
+ void load(const String&, MediaSourcePrivateClient*) override { }
+#endif
+ void load(MediaStreamPrivate&) override;
+ void cancelLoad() override { }
+
+ void prepareToPlay() override { }
+ void play() override;
+ void pause() override;
+
+ bool hasVideo() const override;
+ bool hasAudio() const override;
+
+ float duration() const override { return 0; }
+
+ float currentTime() const override;
+ void seek(float) override { }
+ bool seeking() const override { return false; }
+
+ void setRate(float) override { }
+ void setPreservesPitch(bool) override { }
+ bool paused() const override { return m_paused; }
+
+ bool hasClosedCaptions() const override { return false; }
+ void setClosedCaptionsVisible(bool) override { };
+
+ float maxTimeSeekable() const override { return 0; }
+ std::unique_ptr<PlatformTimeRanges> buffered() const override { return std::make_unique<PlatformTimeRanges>(); }
+ bool didLoadingProgress() const override;
+
+ unsigned long long totalBytes() const override { return 0; }
+
+ bool canLoadPoster() const override { return false; }
+ void setPoster(const String&) override { }
+
+ // RealtimeMediaSource::Observer implementation.
+ void sourceStopped() override final;
+ void sourceMutedChanged() override final;
+ void sourceSettingsChanged() override final;
+ bool preventSourceFromStopping() override final;
+
+ static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>&);
+ static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
+ static bool initializeGStreamerAndGStreamerDebugging();
+ void createGSTAudioSinkBin();
+ void loadingFailed(MediaPlayer::NetworkState error);
+ bool internalLoad();
+ void stop();
+
+ bool m_paused { true };
+ bool m_stopped { true };
+ RefPtr<RealtimeMediaSourceOwr> m_videoSource;
+ RefPtr<RealtimeMediaSourceOwr> m_audioSource;
+ GRefPtr<GstElement> m_audioSink;
+ RefPtr<MediaStreamPrivate> m_streamPrivate;
+ GRefPtr<OwrGstVideoRenderer> m_videoRenderer;
+ GRefPtr<OwrGstAudioRenderer> m_audioRenderer;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && USE(OPENWEBRTC)
+
+#endif // MediaPlayerPrivateGStreamerOwr_h
</ins></span></pre>
</div>
</div>
</body>
</html>