Title: [160214] trunk/Source/WebCore
Revision
160214
Author
[email protected]
Date
2013-12-06 01:06:14 -0800 (Fri, 06 Dec 2013)

Log Message

[GStreamer] Audio/Video sink management is incoherent
https://bugs.webkit.org/show_bug.cgi?id=125304

Reviewed by Gustavo Noronha Silva.

Allow subclasses of MediaPlayerPrivateGStreamerBase to create
custom audio/video sinks in a coherent manner using
create{Audio,Video}Sink methods. Convenience getters are also
available. Also removed some un-needed member variables in the
playbin-based player.

No new tests, existing media tests cover this change.

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
(WebCore::MediaPlayerPrivateGStreamer::updateStates):
(WebCore::MediaPlayerPrivateGStreamer::createAudioSink):
(WebCore::MediaPlayerPrivateGStreamer::audioSink):
(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
(WebCore::MediaPlayerPrivateGStreamerBase::createAudioSink):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (160213 => 160214)


--- trunk/Source/WebCore/ChangeLog	2013-12-06 05:32:06 UTC (rev 160213)
+++ trunk/Source/WebCore/ChangeLog	2013-12-06 09:06:14 UTC (rev 160214)
@@ -1,3 +1,29 @@
+2013-12-05  Philippe Normand  <[email protected]>
+
+        [GStreamer] Audio/Video sink management is incoherent
+        https://bugs.webkit.org/show_bug.cgi?id=125304
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Allow subclasses of MediaPlayerPrivateGStreamerBase to create
+        custom audio/video sinks in a coherent manner using
+        create{Audio,Video}Sink methods. Convenience getters are also
+        available. Also removed some un-needed member variables in the
+        playbin-based player.
+
+        No new tests, existing media tests cover this change.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
+        (WebCore::MediaPlayerPrivateGStreamer::updateStates):
+        (WebCore::MediaPlayerPrivateGStreamer::createAudioSink):
+        (WebCore::MediaPlayerPrivateGStreamer::audioSink):
+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+        (WebCore::MediaPlayerPrivateGStreamerBase::createAudioSink):
+
 2013-12-05  Gyuyoung Kim  <[email protected]>
 
         Introduce IMAGE_TYPE_CASTS, and use it

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (160213 => 160214)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2013-12-06 05:32:06 UTC (rev 160213)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2013-12-06 09:06:14 UTC (rev 160214)
@@ -268,7 +268,6 @@
     , m_videoTimerHandler(0)
     , m_videoCapsTimerHandler(0)
     , m_readyTimerHandler(0)
-    , m_webkitAudioSink(0)
     , m_totalBytes(-1)
     , m_preservesPitch(false)
     , m_requestedState(GST_STATE_VOID_PENDING)
@@ -1252,20 +1251,6 @@
     return m_totalBytes;
 }
 
-void MediaPlayerPrivateGStreamer::updateAudioSink()
-{
-    if (!m_playBin)
-        return;
-
-    m_webkitAudioSink.clear();
-    g_object_get(m_playBin.get(), "audio-sink", &m_webkitAudioSink.outPtr(), NULL);
-}
-
-GstElement* MediaPlayerPrivateGStreamer::audioSink() const
-{
-    return m_webkitAudioSink.get();
-}
-
 void MediaPlayerPrivateGStreamer::sourceChanged()
 {
     m_source.clear();
@@ -1390,9 +1375,6 @@
 
         // Sync states where needed.
         if (state == GST_STATE_PAUSED) {
-            if (!m_webkitAudioSink)
-                updateAudioSink();
-
             if (!m_volumeAndMuteInitialized) {
                 notifyPlayerOfVolumeChange();
                 notifyPlayerOfMute();
@@ -1813,42 +1795,43 @@
     }
 }
 
-void MediaPlayerPrivateGStreamer::createAudioSink()
+GstElement* MediaPlayerPrivateGStreamer::createAudioSink()
 {
-    // Construct audio sink if pitch preserving is enabled.
+    m_autoAudioSink = gst_element_factory_make("autoaudiosink", 0);
+    g_signal_connect(m_autoAudioSink.get(), "child-added", G_CALLBACK(setAudioStreamPropertiesCallback), this);
+
+    // Construct audio sink only if pitch preserving is enabled.
     if (!m_preservesPitch)
-        return;
+        return m_autoAudioSink.get();
 
-    if (!m_playBin)
-        return;
-
     GstElement* scale = gst_element_factory_make("scaletempo", 0);
     if (!scale) {
         GST_WARNING("Failed to create scaletempo");
-        return;
+        return m_autoAudioSink.get();
     }
 
+    GstElement* audioSinkBin = gst_bin_new("audio-sink");
     GstElement* convert = gst_element_factory_make("audioconvert", 0);
     GstElement* resample = gst_element_factory_make("audioresample", 0);
-    GstElement* sink = gst_element_factory_make("autoaudiosink", 0);
 
-    m_autoAudioSink = sink;
+    gst_bin_add_many(GST_BIN(audioSinkBin), scale, convert, resample, m_autoAudioSink.get(), NULL);
 
-    g_signal_connect(sink, "child-added", G_CALLBACK(setAudioStreamPropertiesCallback), this);
-
-    GstElement* audioSink = gst_bin_new("audio-sink");
-    gst_bin_add_many(GST_BIN(audioSink), scale, convert, resample, sink, NULL);
-
-    if (!gst_element_link_many(scale, convert, resample, sink, NULL)) {
+    if (!gst_element_link_many(scale, convert, resample, m_autoAudioSink.get(), NULL)) {
         GST_WARNING("Failed to link audio sink elements");
-        gst_object_unref(audioSink);
-        return;
+        gst_object_unref(audioSinkBin);
+        return m_autoAudioSink.get();
     }
 
     GRefPtr<GstPad> pad = adoptGRef(gst_element_get_static_pad(scale, "sink"));
-    gst_element_add_pad(audioSink, gst_ghost_pad_new("sink", pad.get()));
+    gst_element_add_pad(audioSinkBin, gst_ghost_pad_new("sink", pad.get()));
+    return audioSinkBin;
+}
 
-    g_object_set(m_playBin.get(), "audio-sink", audioSink, NULL);
+GstElement* MediaPlayerPrivateGStreamer::audioSink() const
+{
+    GstElement* sink;
+    g_object_get(m_playBin.get(), "audio-sink", &sink, nullptr);
+    return sink;
 }
 
 void MediaPlayerPrivateGStreamer::createGSTPlayBin()
@@ -1890,13 +1873,11 @@
     }
 #endif
 
-    g_object_set(m_playBin.get(), "video-sink", createVideoSink(), nullptr);
+    g_object_set(m_playBin.get(), "video-sink", createVideoSink(), "audio-sink", createAudioSink(), nullptr);
 
     GRefPtr<GstPad> videoSinkPad = adoptGRef(gst_element_get_static_pad(m_webkitVideoSink.get(), "sink"));
     if (videoSinkPad)
         g_signal_connect(videoSinkPad.get(), "notify::caps", G_CALLBACK(mediaPlayerPrivateVideoSinkCapsChangedCallback), this);
-
-    createAudioSink();
 }
 
 void MediaPlayerPrivateGStreamer::simulateAudioInterruption()

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (160213 => 160214)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h	2013-12-06 05:32:06 UTC (rev 160213)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h	2013-12-06 09:06:14 UTC (rev 160214)
@@ -127,8 +127,7 @@
 
     static bool isAvailable();
 
-    void updateAudioSink();
-    void createAudioSink();
+    GstElement* createAudioSink();
 
     float playbackPosition() const;
 
@@ -191,7 +190,6 @@
     guint m_videoTimerHandler;
     guint m_videoCapsTimerHandler;
     guint m_readyTimerHandler;
-    GRefPtr<GstElement> m_webkitAudioSink;
     mutable long m_totalBytes;
     URL m_url;
     bool m_preservesPitch;

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (160213 => 160214)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h	2013-12-06 05:32:06 UTC (rev 160213)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h	2013-12-06 09:06:14 UTC (rev 160214)
@@ -103,10 +103,12 @@
 
 protected:
     MediaPlayerPrivateGStreamerBase(MediaPlayer*);
-    GstElement* createVideoSink();
+    virtual GstElement* createVideoSink();
+    GRefPtr<GstCaps> currentVideoSinkCaps() const;
+
     void setStreamVolumeElement(GstStreamVolume*);
+    virtual GstElement* createAudioSink() { return 0; }
     virtual GstElement* audioSink() const { return 0; }
-    GRefPtr<GstCaps> currentVideoSinkCaps() const;
 
     MediaPlayer* m_player;
     GRefPtr<GstStreamVolume> m_volumeElement;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to