Modified: trunk/Source/WebCore/ChangeLog (197022 => 197023)
--- 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)
@@ -1,3 +1,44 @@
+2016-02-24 Alejandro G. Castro <a...@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.
+
2016-02-23 Sergio Villar Senin <svil...@igalia.com>
[css-grid] Swap the order of columns/rows in grid-gap shorthand
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.cpp (197022 => 197023)
--- 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)
@@ -56,6 +56,11 @@
{
LOG_MEDIA_MESSAGE("Destroying");
+ if (hasAudio())
+ m_audioTrack->removeObserver(*this);
+ if (hasVideo())
+ m_videoTrack->removeObserver(*this);
+
stop();
}
@@ -82,12 +87,12 @@
bool MediaPlayerPrivateGStreamerOwr::hasVideo() const
{
- return m_videoSource;
+ return m_videoTrack;
}
bool MediaPlayerPrivateGStreamerOwr::hasAudio() const
{
- return m_audioSource;
+ return m_audioTrack;
}
float MediaPlayerPrivateGStreamerOwr::currentTime() const
@@ -95,9 +100,9 @@
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))
+ if (m_videoTrack && 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))
+ else if (m_audioTrack && gst_element_query(m_audioSink.get(), query))
gst_query_parse_position(query, 0, &position);
float result = 0;
@@ -181,28 +186,27 @@
continue;
}
- RealtimeMediaSourceOwr* source = reinterpret_cast<RealtimeMediaSourceOwr*>(&track->source());
- OwrMediaSource* mediaSource = OWR_MEDIA_SOURCE(source->mediaSource());
+ OwrMediaSource* mediaSource = OWR_MEDIA_SOURCE(reinterpret_cast<RealtimeMediaSourceOwr*>(&track->source())->mediaSource());
switch (track->type()) {
case RealtimeMediaSource::Audio:
- if (m_audioSource && (m_audioSource.get() == source))
+ if (m_audioTrack && (m_audioTrack.get() == track))
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);
+ m_audioTrack = track;
+ track->addObserver(*this);
break;
case RealtimeMediaSource::Video:
- if (m_videoSource && (m_videoSource.get() == source))
+ if (m_videoTrack && (m_videoTrack.get() == track))
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);
+ m_videoTrack = track;
+ track->addObserver(*this);
break;
case RealtimeMediaSource::None:
WARN_MEDIA_MESSAGE("Loading a track with None type");
@@ -220,11 +224,11 @@
return;
m_stopped = true;
- if (m_audioSource) {
+ if (m_audioTrack) {
LOG_MEDIA_MESSAGE("Stop: disconnecting audio");
g_object_set(m_audioRenderer.get(), "disabled", TRUE, nullptr);
}
- if (m_videoSource) {
+ if (m_videoTrack) {
LOG_MEDIA_MESSAGE("Stop: disconnecting video");
g_object_set(m_videoRenderer.get(), "disabled", TRUE, nullptr);
}
@@ -276,40 +280,34 @@
m_audioRenderer = adoptGRef(owr_gst_audio_renderer_new(m_audioSink.get()));
}
-void MediaPlayerPrivateGStreamerOwr::sourceStopped()
+void MediaPlayerPrivateGStreamerOwr::trackEnded(MediaStreamTrackPrivate& track)
{
- LOG_MEDIA_MESSAGE("Source stopped");
+ LOG_MEDIA_MESSAGE("Track ended");
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);
- }
+ 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);
}
-void MediaPlayerPrivateGStreamerOwr::sourceMutedChanged()
+void MediaPlayerPrivateGStreamerOwr::trackMutedChanged(MediaStreamTrackPrivate&)
{
- LOG_MEDIA_MESSAGE("Source muted state changed");
+ LOG_MEDIA_MESSAGE("Track muted state changed");
}
-void MediaPlayerPrivateGStreamerOwr::sourceSettingsChanged()
+void MediaPlayerPrivateGStreamerOwr::trackSettingsChanged(MediaStreamTrackPrivate&)
{
- LOG_MEDIA_MESSAGE("Source settings changed");
+ LOG_MEDIA_MESSAGE("Track settings changed");
}
-bool MediaPlayerPrivateGStreamerOwr::preventSourceFromStopping()
+void MediaPlayerPrivateGStreamerOwr::trackEnabledChanged(MediaStreamTrackPrivate&)
{
- LOG_MEDIA_MESSAGE("Prevent source from stopping");
- return false;
+ LOG_MEDIA_MESSAGE("Track enabled changed");
}
GstElement* MediaPlayerPrivateGStreamerOwr::createVideoSink()
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h (197022 => 197023)
--- 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)
@@ -23,7 +23,7 @@
#if ENABLE(MEDIA_STREAM) && USE(GSTREAMER) && USE(OPENWEBRTC)
#include "MediaPlayerPrivateGStreamerBase.h"
-#include "RealtimeMediaSource.h"
+#include "MediaStreamTrackPrivate.h"
typedef struct _OwrGstVideoRenderer OwrGstVideoRenderer;
typedef struct _OwrGstAudioRenderer OwrGstAudioRenderer;
@@ -33,7 +33,7 @@
class MediaStreamPrivate;
class RealtimeMediaSourceOwr;
-class MediaPlayerPrivateGStreamerOwr : public MediaPlayerPrivateGStreamerBase, private RealtimeMediaSource::Observer {
+class MediaPlayerPrivateGStreamerOwr : public MediaPlayerPrivateGStreamerBase, private MediaStreamTrackPrivate::Observer {
public:
explicit MediaPlayerPrivateGStreamerOwr(MediaPlayer*);
~MediaPlayerPrivateGStreamerOwr();
@@ -83,11 +83,11 @@
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;
+ // MediaStreamTrackPrivate::Observer implementation.
+ void trackEnded(MediaStreamTrackPrivate&) override final;
+ void trackMutedChanged(MediaStreamTrackPrivate&) override final;
+ void trackSettingsChanged(MediaStreamTrackPrivate&) override final;
+ void trackEnabledChanged(MediaStreamTrackPrivate&) override final;
static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>&);
static MediaPlayer::SupportsType supportsType(const MediaEngineSupportParameters&);
@@ -99,8 +99,8 @@
bool m_paused { true };
bool m_stopped { true };
- RefPtr<RealtimeMediaSourceOwr> m_videoSource;
- RefPtr<RealtimeMediaSourceOwr> m_audioSource;
+ RefPtr<MediaStreamTrackPrivate> m_videoTrack;
+ RefPtr<MediaStreamTrackPrivate> m_audioTrack;
GRefPtr<GstElement> m_audioSink;
RefPtr<MediaStreamPrivate> m_streamPrivate;
GRefPtr<OwrGstVideoRenderer> m_videoRenderer;
