Diff
Modified: trunk/ChangeLog (93760 => 93761)
--- trunk/ChangeLog 2011-08-25 05:50:01 UTC (rev 93760)
+++ trunk/ChangeLog 2011-08-25 06:06:29 UTC (rev 93761)
@@ -1,3 +1,12 @@
+2011-08-24 Philippe Normand <[email protected]>
+
+ [GTK] bump GStreamer requirement to 0.10.30
+ https://bugs.webkit.org/show_bug.cgi?id=66860
+
+ Reviewed by Martin Robinson.
+
+ * configure.ac:
+
2011-08-23 Steve Block <[email protected]>
Remove all mention of removed Android files from build scripts
Modified: trunk/Source/WebCore/ChangeLog (93760 => 93761)
--- trunk/Source/WebCore/ChangeLog 2011-08-25 05:50:01 UTC (rev 93760)
+++ trunk/Source/WebCore/ChangeLog 2011-08-25 06:06:29 UTC (rev 93761)
@@ -1,3 +1,17 @@
+2011-08-24 Philippe Normand <[email protected]>
+
+ [GTK] bump GStreamer requirement to 0.10.30
+ https://bugs.webkit.org/show_bug.cgi?id=66860
+
+ Reviewed by Martin Robinson.
+
+ Use fast element linking by default.
+
+ * platform/graphics/gstreamer/GStreamerGWorld.cpp:
+ (WebCore::GStreamerGWorld::enterFullscreen):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+
2011-08-24 James Robinson <[email protected]>
Some layerTreeAsText compositing tests are flaky
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp (93760 => 93761)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp 2011-08-25 05:50:01 UTC (rev 93760)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp 2011-08-25 06:06:29 UTC (rev 93761)
@@ -95,14 +95,11 @@
// Add and link a queue, ffmpegcolorspace, videoscale and sink in the bin.
gst_bin_add_many(GST_BIN(videoSink.get()), platformVideoSink, videoScale, colorspace, queue, NULL);
-#if GST_CHECK_VERSION(0, 10, 30)
- // Faster elements linking, if possible.
+
+ // Faster elements linking.
gst_element_link_pads_full(queue, "src", colorspace, "sink", GST_PAD_LINK_CHECK_NOTHING);
gst_element_link_pads_full(colorspace, "src", videoScale, "sink", GST_PAD_LINK_CHECK_NOTHING);
gst_element_link_pads_full(videoScale, "src", platformVideoSink, "sink", GST_PAD_LINK_CHECK_NOTHING);
-#else
- gst_element_link_many(queue, colorspace, videoScale, platformVideoSink, NULL);
-#endif
// Link a new src pad from tee to queue.
GstPad* srcPad = gst_element_get_request_pad(tee, "src%d");
@@ -126,18 +123,11 @@
GstQuery* query = gst_query_new_segment(GST_FORMAT_TIME);
gboolean queryResult = gst_element_query(m_pipeline, query);
-#if GST_CHECK_VERSION(0, 10, 30)
if (!queryResult) {
gst_query_unref(query);
gst_object_unref(GST_OBJECT(srcPad));
return true;
}
-#else
- // GStreamer < 0.10.30 doesn't set the query result correctly, so
- // just ignore it to avoid a compilation warning.
- // See https://bugzilla.gnome.org/show_bug.cgi?id=620490.
- (void) queryResult;
-#endif
GstFormat format;
gint64 position;
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (93760 => 93761)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2011-08-25 05:50:01 UTC (rev 93760)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2011-08-25 06:06:29 UTC (rev 93761)
@@ -1724,14 +1724,11 @@
}
ASSERT(actualVideoSink);
-#if GST_CHECK_VERSION(0, 10, 30)
- // Faster elements linking, if possible.
- gst_element_link_pads_full(queue, "src", identity, "sink", GST_PAD_LINK_CHECK_NOTHING);
- gst_element_link_pads_full(identity, "src", actualVideoSink, "sink", GST_PAD_LINK_CHECK_NOTHING);
-#else
- gst_element_link_many(queue, identity, actualVideoSink, NULL);
-#endif
+ // Faster elements linking.
+ gst_element_link_pads_full(queue, "src", identity, "sink", GST_PAD_LINK_CHECK_NOTHING);
+ gst_element_link_pads_full(identity, "src", actualVideoSink, "sink", GST_PAD_LINK_CHECK_NOTHING);
+
// Add a ghostpad to the bin so it can proxy to tee.
GstPad* pad = gst_element_get_static_pad(videoTee, "sink");
gst_element_add_pad(m_videoSinkBin, gst_ghost_pad_new("sink", pad));
Modified: trunk/configure.ac (93760 => 93761)
--- trunk/configure.ac 2011-08-25 05:50:01 UTC (rev 93760)
+++ trunk/configure.ac 2011-08-25 06:06:29 UTC (rev 93761)
@@ -272,7 +272,7 @@
LIBXSLT_REQUIRED_VERSION=1.1.7
SQLITE_REQUIRED_VERSION=3.0
GSTREAMER_REQUIRED_VERSION=0.10
-GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.25
+GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.30
ENCHANT_REQUIRED_VERSION=0.22
# Available modules
