<!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>[197023] 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/197023">197023</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-24 02:12:54 -0800 (Wed, 24 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Gstreamer] Mediaplayer should observe the tracks and not the source
https://bugs.webkit.org/show_bug.cgi?id=154582
Patch by Alejandro G. Castro <alex@igalia.com> on 2016-02-24
Reviewed by Philippe Normand.
We have to observe the track objects that define the
mediastream. Replace the source attributes with the new tracks and
use them properly in the class.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:
(WebCore::MediaPlayerPrivateGStreamerOwr::~MediaPlayerPrivateGStreamerOwr):
Make sure we are not observing anymore the tracks after
destruction.
(WebCore::MediaPlayerPrivateGStreamerOwr::hasVideo): Used the track
instead of the source.
(WebCore::MediaPlayerPrivateGStreamerOwr::hasAudio): Ditto.
(WebCore::MediaPlayerPrivateGStreamerOwr::currentTime): Ditto.
(WebCore::MediaPlayerPrivateGStreamerOwr::internalLoad): Ditto.
(WebCore::MediaPlayerPrivateGStreamerOwr::stop): Ditto.
(WebCore::MediaPlayerPrivateGStreamerOwr::trackEnded): Added, new
track observer API, make sure we disable the ended tracks.
(WebCore::MediaPlayerPrivateGStreamerOwr::trackMutedChanged):
Added, new track observer API.
(WebCore::MediaPlayerPrivateGStreamerOwr::trackSettingsChanged):
Added, new track observer API.
(WebCore::MediaPlayerPrivateGStreamerOwr::trackEnabledChanged):
Added, new track observer API.
(WebCore::MediaPlayerPrivateGStreamerOwr::sourceStopped): Deleted,
source observer API.
(WebCore::MediaPlayerPrivateGStreamerOwr::sourceMutedChanged):
Deleted, source observer API.
(WebCore::MediaPlayerPrivateGStreamerOwr::sourceSettingsChanged):
Deleted, source observer API.
(WebCore::MediaPlayerPrivateGStreamerOwr::preventSourceFromStopping):
Deleted, source observer API.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h:
Replaced the attributes representing the source with the tracks
and added the new track observer functions.</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>
<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 (197022 => 197023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-24 10:03:25 UTC (rev 197022)
+++ trunk/Source/WebCore/ChangeLog 2016-02-24 10:12:54 UTC (rev 197023)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2016-02-24 Alejandro G. Castro <alex@igalia.com>
+
+ [Gstreamer] Mediaplayer should observe the tracks and not the source
+ https://bugs.webkit.org/show_bug.cgi?id=154582
+
+ Reviewed by Philippe Normand.
+
+ We have to observe the track objects that define the
+ mediastream. Replace the source attributes with the new tracks and
+ use them properly in the class.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerOwr::~MediaPlayerPrivateGStreamerOwr):
+ Make sure we are not observing anymore the tracks after
+ destruction.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::hasVideo): Used the track
+ instead of the source.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::hasAudio): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::currentTime): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::internalLoad): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::stop): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::trackEnded): Added, new
+ track observer API, make sure we disable the ended tracks.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::trackMutedChanged):
+ Added, new track observer API.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::trackSettingsChanged):
+ Added, new track observer API.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::trackEnabledChanged):
+ Added, new track observer API.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::sourceStopped): Deleted,
+ source observer API.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::sourceMutedChanged):
+ Deleted, source observer API.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::sourceSettingsChanged):
+ Deleted, source observer API.
+ (WebCore::MediaPlayerPrivateGStreamerOwr::preventSourceFromStopping):
+ Deleted, source observer API.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h:
+ Replaced the attributes representing the source with the tracks
+ and added the new track observer functions.
+
</ins><span class="cx"> 2016-02-23 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Swap the order of columns/rows in grid-gap shorthand
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp (197022 => 197023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp 2016-02-24 10:03:25 UTC (rev 197022)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp 2016-02-24 10:12:54 UTC (rev 197023)
</span><span class="lines">@@ -56,6 +56,11 @@
</span><span class="cx"> {
</span><span class="cx"> LOG_MEDIA_MESSAGE("Destroying");
</span><span class="cx">
</span><ins>+ if (hasAudio())
+ m_audioTrack->removeObserver(*this);
+ if (hasVideo())
+ m_videoTrack->removeObserver(*this);
+
</ins><span class="cx"> stop();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -82,12 +87,12 @@
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateGStreamerOwr::hasVideo() const
</span><span class="cx"> {
</span><del>- return m_videoSource;
</del><ins>+ return m_videoTrack;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateGStreamerOwr::hasAudio() const
</span><span class="cx"> {
</span><del>- return m_audioSource;
</del><ins>+ return m_audioTrack;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float MediaPlayerPrivateGStreamerOwr::currentTime() const
</span><span class="lines">@@ -95,9 +100,9 @@
</span><span class="cx"> gint64 position = GST_CLOCK_TIME_NONE;
</span><span class="cx"> GstQuery* query = gst_query_new_position(GST_FORMAT_TIME);
</span><span class="cx">
</span><del>- if (m_videoSource && gst_element_query(m_videoSink.get(), query))
</del><ins>+ if (m_videoTrack && gst_element_query(m_videoSink.get(), query))
</ins><span class="cx"> gst_query_parse_position(query, 0, &position);
</span><del>- else if (m_audioSource && gst_element_query(m_audioSink.get(), query))
</del><ins>+ else if (m_audioTrack && gst_element_query(m_audioSink.get(), query))
</ins><span class="cx"> gst_query_parse_position(query, 0, &position);
</span><span class="cx">
</span><span class="cx"> float result = 0;
</span><span class="lines">@@ -181,28 +186,27 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RealtimeMediaSourceOwr* source = reinterpret_cast<RealtimeMediaSourceOwr*>(&track->source());
- OwrMediaSource* mediaSource = OWR_MEDIA_SOURCE(source->mediaSource());
</del><ins>+ OwrMediaSource* mediaSource = OWR_MEDIA_SOURCE(reinterpret_cast<RealtimeMediaSourceOwr*>(&track->source())->mediaSource());
</ins><span class="cx">
</span><span class="cx"> switch (track->type()) {
</span><span class="cx"> case RealtimeMediaSource::Audio:
</span><del>- if (m_audioSource && (m_audioSource.get() == source))
</del><ins>+ if (m_audioTrack && (m_audioTrack.get() == track))
</ins><span class="cx"> g_object_set(m_audioRenderer.get(), "disabled", FALSE, nullptr);
</span><span class="cx">
</span><span class="cx"> owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_audioRenderer.get()), mediaSource);
</span><del>- m_audioSource = source;
- source->addObserver(this);
</del><ins>+ m_audioTrack = track;
+ track->addObserver(*this);
</ins><span class="cx"> break;
</span><span class="cx"> case RealtimeMediaSource::Video:
</span><del>- if (m_videoSource && (m_videoSource.get() == source))
</del><ins>+ if (m_videoTrack && (m_videoTrack.get() == track))
</ins><span class="cx"> g_object_set(m_videoRenderer.get(), "disabled", FALSE, nullptr);
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove hardcoded video dimensions when the rendering performance:
</span><span class="cx"> // https://webkit.org/b/153826.
</span><span class="cx"> g_object_set(m_videoRenderer.get(), "width", 640, "height", 480, nullptr);
</span><span class="cx"> owr_media_renderer_set_source(OWR_MEDIA_RENDERER(m_videoRenderer.get()), mediaSource);
</span><del>- m_videoSource = source;
- source->addObserver(this);
</del><ins>+ m_videoTrack = track;
+ track->addObserver(*this);
</ins><span class="cx"> break;
</span><span class="cx"> case RealtimeMediaSource::None:
</span><span class="cx"> WARN_MEDIA_MESSAGE("Loading a track with None type");
</span><span class="lines">@@ -220,11 +224,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_stopped = true;
</span><del>- if (m_audioSource) {
</del><ins>+ if (m_audioTrack) {
</ins><span class="cx"> LOG_MEDIA_MESSAGE("Stop: disconnecting audio");
</span><span class="cx"> g_object_set(m_audioRenderer.get(), "disabled", TRUE, nullptr);
</span><span class="cx"> }
</span><del>- if (m_videoSource) {
</del><ins>+ if (m_videoTrack) {
</ins><span class="cx"> LOG_MEDIA_MESSAGE("Stop: disconnecting video");
</span><span class="cx"> g_object_set(m_videoRenderer.get(), "disabled", TRUE, nullptr);
</span><span class="cx"> }
</span><span class="lines">@@ -276,40 +280,34 @@
</span><span class="cx"> m_audioRenderer = adoptGRef(owr_gst_audio_renderer_new(m_audioSink.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamerOwr::sourceStopped()
</del><ins>+void MediaPlayerPrivateGStreamerOwr::trackEnded(MediaStreamTrackPrivate& track)
</ins><span class="cx"> {
</span><del>- LOG_MEDIA_MESSAGE("Source stopped");
</del><ins>+ LOG_MEDIA_MESSAGE("Track ended");
</ins><span class="cx">
</span><span class="cx"> if (!m_streamPrivate || !m_streamPrivate->active()) {
</span><span class="cx"> stop();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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);
- }
</del><ins>+ if (&track == m_audioTrack)
+ g_object_set(m_audioRenderer.get(), "disabled", TRUE, nullptr);
+ else if (&track == m_videoTrack)
+ g_object_set(m_videoRenderer.get(), "disabled", TRUE, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamerOwr::sourceMutedChanged()
</del><ins>+void MediaPlayerPrivateGStreamerOwr::trackMutedChanged(MediaStreamTrackPrivate&)
</ins><span class="cx"> {
</span><del>- LOG_MEDIA_MESSAGE("Source muted state changed");
</del><ins>+ LOG_MEDIA_MESSAGE("Track muted state changed");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamerOwr::sourceSettingsChanged()
</del><ins>+void MediaPlayerPrivateGStreamerOwr::trackSettingsChanged(MediaStreamTrackPrivate&)
</ins><span class="cx"> {
</span><del>- LOG_MEDIA_MESSAGE("Source settings changed");
</del><ins>+ LOG_MEDIA_MESSAGE("Track settings changed");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaPlayerPrivateGStreamerOwr::preventSourceFromStopping()
</del><ins>+void MediaPlayerPrivateGStreamerOwr::trackEnabledChanged(MediaStreamTrackPrivate&)
</ins><span class="cx"> {
</span><del>- LOG_MEDIA_MESSAGE("Prevent source from stopping");
- return false;
</del><ins>+ LOG_MEDIA_MESSAGE("Track enabled changed");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GstElement* MediaPlayerPrivateGStreamerOwr::createVideoSink()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerOwrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h (197022 => 197023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h 2016-02-24 10:03:25 UTC (rev 197022)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h 2016-02-24 10:12:54 UTC (rev 197023)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && USE(OPENWEBRTC)
</span><span class="cx">
</span><span class="cx"> #include "MediaPlayerPrivateGStreamerBase.h"
</span><del>-#include "RealtimeMediaSource.h"
</del><ins>+#include "MediaStreamTrackPrivate.h"
</ins><span class="cx">
</span><span class="cx"> typedef struct _OwrGstVideoRenderer OwrGstVideoRenderer;
</span><span class="cx"> typedef struct _OwrGstAudioRenderer OwrGstAudioRenderer;
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> class MediaStreamPrivate;
</span><span class="cx"> class RealtimeMediaSourceOwr;
</span><span class="cx">
</span><del>-class MediaPlayerPrivateGStreamerOwr : public MediaPlayerPrivateGStreamerBase, private RealtimeMediaSource::Observer {
</del><ins>+class MediaPlayerPrivateGStreamerOwr : public MediaPlayerPrivateGStreamerBase, private MediaStreamTrackPrivate::Observer {
</ins><span class="cx"> public:
</span><span class="cx"> explicit MediaPlayerPrivateGStreamerOwr(MediaPlayer*);
</span><span class="cx"> ~MediaPlayerPrivateGStreamerOwr();
</span><span class="lines">@@ -83,11 +83,11 @@
</span><span class="cx"> bool canLoadPoster() const override { return false; }
</span><span class="cx"> void setPoster(const String&) override { }
</span><span class="cx">
</span><del>- // RealtimeMediaSource::Observer implementation.
- void sourceStopped() override final;
- void sourceMutedChanged() override final;
- void sourceSettingsChanged() override final;
- bool preventSourceFromStopping() override final;
</del><ins>+ // MediaStreamTrackPrivate::Observer implementation.
+ void trackEnded(MediaStreamTrackPrivate&) override final;
+ void trackMutedChanged(MediaStreamTrackPrivate&) override final;
+ void trackSettingsChanged(MediaStreamTrackPrivate&) override final;
+ void trackEnabledChanged(MediaStreamTrackPrivate&) override final;
</ins><span class="cx">
</span><span class="cx"> static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>&);
</span><span class="cx"> static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
</span><span class="lines">@@ -99,8 +99,8 @@
</span><span class="cx">
</span><span class="cx"> bool m_paused { true };
</span><span class="cx"> bool m_stopped { true };
</span><del>- RefPtr<RealtimeMediaSourceOwr> m_videoSource;
- RefPtr<RealtimeMediaSourceOwr> m_audioSource;
</del><ins>+ RefPtr<MediaStreamTrackPrivate> m_videoTrack;
+ RefPtr<MediaStreamTrackPrivate> m_audioTrack;
</ins><span class="cx"> GRefPtr<GstElement> m_audioSink;
</span><span class="cx"> RefPtr<MediaStreamPrivate> m_streamPrivate;
</span><span class="cx"> GRefPtr<OwrGstVideoRenderer> m_videoRenderer;
</span></span></pre>
</div>
</div>
</body>
</html>