<!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>[160214] 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/160214">160214</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-06 01:06:14 -0800 (Fri, 06 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160213 => 160214)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-12-05 Philippe Normand <pnormand@igalia.com>
+
+ [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):
+
</ins><span class="cx"> 2013-12-05 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Introduce IMAGE_TYPE_CASTS, and use it
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (160213 => 160214)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -268,7 +268,6 @@
</span><span class="cx"> , m_videoTimerHandler(0)
</span><span class="cx"> , m_videoCapsTimerHandler(0)
</span><span class="cx"> , m_readyTimerHandler(0)
</span><del>- , m_webkitAudioSink(0)
</del><span class="cx"> , m_totalBytes(-1)
</span><span class="cx"> , m_preservesPitch(false)
</span><span class="cx"> , m_requestedState(GST_STATE_VOID_PENDING)
</span><span class="lines">@@ -1252,20 +1251,6 @@
</span><span class="cx"> return m_totalBytes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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();
-}
-
</del><span class="cx"> void MediaPlayerPrivateGStreamer::sourceChanged()
</span><span class="cx"> {
</span><span class="cx"> m_source.clear();
</span><span class="lines">@@ -1390,9 +1375,6 @@
</span><span class="cx">
</span><span class="cx"> // Sync states where needed.
</span><span class="cx"> if (state == GST_STATE_PAUSED) {
</span><del>- if (!m_webkitAudioSink)
- updateAudioSink();
-
</del><span class="cx"> if (!m_volumeAndMuteInitialized) {
</span><span class="cx"> notifyPlayerOfVolumeChange();
</span><span class="cx"> notifyPlayerOfMute();
</span><span class="lines">@@ -1813,42 +1795,43 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamer::createAudioSink()
</del><ins>+GstElement* MediaPlayerPrivateGStreamer::createAudioSink()
</ins><span class="cx"> {
</span><del>- // Construct audio sink if pitch preserving is enabled.
</del><ins>+ 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.
</ins><span class="cx"> if (!m_preservesPitch)
</span><del>- return;
</del><ins>+ return m_autoAudioSink.get();
</ins><span class="cx">
</span><del>- if (!m_playBin)
- return;
-
</del><span class="cx"> GstElement* scale = gst_element_factory_make("scaletempo", 0);
</span><span class="cx"> if (!scale) {
</span><span class="cx"> GST_WARNING("Failed to create scaletempo");
</span><del>- return;
</del><ins>+ return m_autoAudioSink.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ GstElement* audioSinkBin = gst_bin_new("audio-sink");
</ins><span class="cx"> GstElement* convert = gst_element_factory_make("audioconvert", 0);
</span><span class="cx"> GstElement* resample = gst_element_factory_make("audioresample", 0);
</span><del>- GstElement* sink = gst_element_factory_make("autoaudiosink", 0);
</del><span class="cx">
</span><del>- m_autoAudioSink = sink;
</del><ins>+ gst_bin_add_many(GST_BIN(audioSinkBin), scale, convert, resample, m_autoAudioSink.get(), NULL);
</ins><span class="cx">
</span><del>- 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)) {
</del><ins>+ if (!gst_element_link_many(scale, convert, resample, m_autoAudioSink.get(), NULL)) {
</ins><span class="cx"> GST_WARNING("Failed to link audio sink elements");
</span><del>- gst_object_unref(audioSink);
- return;
</del><ins>+ gst_object_unref(audioSinkBin);
+ return m_autoAudioSink.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GRefPtr<GstPad> pad = adoptGRef(gst_element_get_static_pad(scale, "sink"));
</span><del>- gst_element_add_pad(audioSink, gst_ghost_pad_new("sink", pad.get()));
</del><ins>+ gst_element_add_pad(audioSinkBin, gst_ghost_pad_new("sink", pad.get()));
+ return audioSinkBin;
+}
</ins><span class="cx">
</span><del>- g_object_set(m_playBin.get(), "audio-sink", audioSink, NULL);
</del><ins>+GstElement* MediaPlayerPrivateGStreamer::audioSink() const
+{
+ GstElement* sink;
+ g_object_get(m_playBin.get(), "audio-sink", &sink, nullptr);
+ return sink;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::createGSTPlayBin()
</span><span class="lines">@@ -1890,13 +1873,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- g_object_set(m_playBin.get(), "video-sink", createVideoSink(), nullptr);
</del><ins>+ g_object_set(m_playBin.get(), "video-sink", createVideoSink(), "audio-sink", createAudioSink(), nullptr);
</ins><span class="cx">
</span><span class="cx"> GRefPtr<GstPad> videoSinkPad = adoptGRef(gst_element_get_static_pad(m_webkitVideoSink.get(), "sink"));
</span><span class="cx"> if (videoSinkPad)
</span><span class="cx"> g_signal_connect(videoSinkPad.get(), "notify::caps", G_CALLBACK(mediaPlayerPrivateVideoSinkCapsChangedCallback), this);
</span><del>-
- createAudioSink();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateGStreamer::simulateAudioInterruption()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (160213 => 160214)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -127,8 +127,7 @@
</span><span class="cx">
</span><span class="cx"> static bool isAvailable();
</span><span class="cx">
</span><del>- void updateAudioSink();
- void createAudioSink();
</del><ins>+ GstElement* createAudioSink();
</ins><span class="cx">
</span><span class="cx"> float playbackPosition() const;
</span><span class="cx">
</span><span class="lines">@@ -191,7 +190,6 @@
</span><span class="cx"> guint m_videoTimerHandler;
</span><span class="cx"> guint m_videoCapsTimerHandler;
</span><span class="cx"> guint m_readyTimerHandler;
</span><del>- GRefPtr<GstElement> m_webkitAudioSink;
</del><span class="cx"> mutable long m_totalBytes;
</span><span class="cx"> URL m_url;
</span><span class="cx"> bool m_preservesPitch;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (160213 => 160214)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -103,10 +103,12 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> MediaPlayerPrivateGStreamerBase(MediaPlayer*);
</span><del>- GstElement* createVideoSink();
</del><ins>+ virtual GstElement* createVideoSink();
+ GRefPtr<GstCaps> currentVideoSinkCaps() const;
+
</ins><span class="cx"> void setStreamVolumeElement(GstStreamVolume*);
</span><ins>+ virtual GstElement* createAudioSink() { return 0; }
</ins><span class="cx"> virtual GstElement* audioSink() const { return 0; }
</span><del>- GRefPtr<GstCaps> currentVideoSinkCaps() const;
</del><span class="cx">
</span><span class="cx"> MediaPlayer* m_player;
</span><span class="cx"> GRefPtr<GstStreamVolume> m_volumeElement;
</span></span></pre>
</div>
</div>
</body>
</html>