Modified: trunk/Source/WebCore/ChangeLog (159944 => 159945)
--- trunk/Source/WebCore/ChangeLog 2013-12-02 19:50:51 UTC (rev 159944)
+++ trunk/Source/WebCore/ChangeLog 2013-12-02 19:55:30 UTC (rev 159945)
@@ -1,3 +1,30 @@
+2013-12-02 Víctor Manuel Jáquez Leal <vjaq...@igalia.com>
+
+ Simplify MediaPlayerPrivateGStreamerBase::createVideoSink()
+ https://bugs.webkit.org/show_bug.cgi?id=125077
+
+ Remove the method's unused parameter.
+ Remove the GStreamer 0.10.22 run-time validation, since we are using
+ GStreamer 1.0 officially.
+ Remove the creation of a spurious Bin for the video sink, since
+ either the fpssink or the webkitsink are valid sink elements.
+ Change fpsink to a GRefPtr.
+
+ Now, createVideoSink() returns a simple pointer to the created sink
+ element.
+
+ Reviewed by Philippe Normand.
+
+ No new tests, no behavior changes.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::createVideoSink):
+ (WebCore::MediaPlayerPrivateGStreamerBase::decodedFrameCount):
+ (WebCore::MediaPlayerPrivateGStreamerBase::droppedFrameCount):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+
2013-12-02 Alexey Proskuryakov <a...@apple.com>
Add support for WebCrypto RSA-OAEP
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (159944 => 159945)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2013-12-02 19:50:51 UTC (rev 159944)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2013-12-02 19:55:30 UTC (rev 159945)
@@ -1890,10 +1890,8 @@
}
#endif
- createVideoSink(m_playBin.get());
+ g_object_set(m_playBin.get(), "video-sink", createVideoSink(), nullptr);
- g_object_set(m_playBin.get(), "video-sink", m_videoSinkBin.get(), 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);
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (159944 => 159945)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2013-12-02 19:50:51 UTC (rev 159944)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2013-12-02 19:55:30 UTC (rev 159945)
@@ -462,57 +462,41 @@
return currentCaps;
}
-void MediaPlayerPrivateGStreamerBase::createVideoSink(GstElement* pipeline)
+GstElement* MediaPlayerPrivateGStreamerBase::createVideoSink()
{
- if (!initializeGStreamer())
- return;
+ ASSERT(initializeGStreamer());
- UNUSED_PARAM(pipeline);
+ GstElement* videoSink = nullptr;
m_webkitVideoSink = webkitVideoSinkNew();
m_repaintHandler = g_signal_connect(m_webkitVideoSink.get(), "repaint-requested", G_CALLBACK(mediaPlayerPrivateRepaintCallback), this);
- m_videoSinkBin = gst_bin_new(nullptr);
-
- GstElement* videoSink = nullptr;
m_fpsSink = gst_element_factory_make("fpsdisplaysink", "sink");
if (m_fpsSink) {
- // The verbose property has been added in -bad 0.10.22. Making
- // this whole code depend on it because we don't want
- // fpsdiplaysink to spit data on stdout.
- GstElementFactory* factory = GST_ELEMENT_FACTORY(GST_ELEMENT_GET_CLASS(m_fpsSink)->elementfactory);
- if (gst_plugin_feature_check_version(GST_PLUGIN_FEATURE(factory), 0, 10, 22)) {
- g_object_set(m_fpsSink, "silent", TRUE , nullptr);
+ g_object_set(m_fpsSink.get(), "silent", TRUE , nullptr);
- // Turn off text overlay unless logging is enabled.
+ // Turn off text overlay unless logging is enabled.
#if LOG_DISABLED
- g_object_set(m_fpsSink, "text-overlay", FALSE , nullptr);
+ g_object_set(m_fpsSink.get(), "text-overlay", FALSE , nullptr);
#else
- WTFLogChannel* channel = logChannelByName("Media");
- if (channel->state != WTFLogChannelOn)
- g_object_set(m_fpsSink, "text-overlay", FALSE , nullptr);
+ WTFLogChannel* channel = logChannelByName("Media");
+ if (channel->state != WTFLogChannelOn)
+ g_object_set(m_fpsSink.get(), "text-overlay", FALSE , nullptr);
#endif // LOG_DISABLED
- if (g_object_class_find_property(G_OBJECT_GET_CLASS(m_fpsSink), "video-sink")) {
- g_object_set(m_fpsSink, "video-sink", m_webkitVideoSink.get(), nullptr);
- gst_bin_add(GST_BIN(m_videoSinkBin.get()), m_fpsSink);
- videoSink = m_fpsSink;
- } else
- m_fpsSink = nullptr;
+ if (g_object_class_find_property(G_OBJECT_GET_CLASS(m_fpsSink.get()), "video-sink")) {
+ g_object_set(m_fpsSink.get(), "video-sink", m_webkitVideoSink.get(), nullptr);
+ videoSink = m_fpsSink.get();
} else
m_fpsSink = nullptr;
}
- if (!m_fpsSink) {
- gst_bin_add(GST_BIN(m_videoSinkBin.get()), m_webkitVideoSink.get());
+ if (!m_fpsSink)
videoSink = m_webkitVideoSink.get();
- }
ASSERT(videoSink);
- GstElement* firstChild = videoSink;
- GRefPtr<GstPad> pad = adoptGRef(gst_element_get_static_pad(firstChild, "sink"));
- gst_element_add_pad(m_videoSinkBin.get(), gst_ghost_pad_new("sink", pad.get()));
+ return videoSink;
}
void MediaPlayerPrivateGStreamerBase::setStreamVolumeElement(GstStreamVolume* volume)
@@ -539,7 +523,7 @@
{
guint64 decodedFrames = 0;
if (m_fpsSink)
- g_object_get(m_fpsSink, "frames-rendered", &decodedFrames, NULL);
+ g_object_get(m_fpsSink.get(), "frames-rendered", &decodedFrames, NULL);
return static_cast<unsigned>(decodedFrames);
}
@@ -547,7 +531,7 @@
{
guint64 framesDropped = 0;
if (m_fpsSink)
- g_object_get(m_fpsSink, "frames-dropped", &framesDropped, NULL);
+ g_object_get(m_fpsSink.get(), "frames-dropped", &framesDropped, NULL);
return static_cast<unsigned>(framesDropped);
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (159944 => 159945)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2013-12-02 19:50:51 UTC (rev 159944)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2013-12-02 19:55:30 UTC (rev 159945)
@@ -103,7 +103,7 @@
protected:
MediaPlayerPrivateGStreamerBase(MediaPlayer*);
- void createVideoSink(GstElement* pipeline);
+ GstElement* createVideoSink();
void setStreamVolumeElement(GstStreamVolume*);
virtual GstElement* audioSink() const { return 0; }
GRefPtr<GstCaps> currentVideoSinkCaps() const;
@@ -111,8 +111,7 @@
MediaPlayer* m_player;
GRefPtr<GstStreamVolume> m_volumeElement;
GRefPtr<GstElement> m_webkitVideoSink;
- GRefPtr<GstElement> m_videoSinkBin;
- GstElement* m_fpsSink;
+ GRefPtr<GstElement> m_fpsSink;
MediaPlayer::ReadyState m_readyState;
MediaPlayer::NetworkState m_networkState;
IntSize m_size;
