Diff
Modified: trunk/ChangeLog (125040 => 125041)
--- trunk/ChangeLog 2012-08-08 16:32:05 UTC (rev 125040)
+++ trunk/ChangeLog 2012-08-08 16:52:20 UTC (rev 125041)
@@ -1,3 +1,14 @@
+2012-08-08 Philippe Normand <[email protected]>
+
+ [GStreamer] 0.11 build broken (again)
+ https://bugs.webkit.org/show_bug.cgi?id=93474
+
+ Reviewed by Martin Robinson.
+
+ * configure.ac: Disable media-stream build if GStreamer 0.11
+ support is enabled, due to farstream-0.1 still messing up with
+ gstreamer-0.10 include path.
+
2012-08-07 YoungTaeck Song <[email protected]>
[WK2][EFL] Implement accelerated compositing on WK2 Efl port
Modified: trunk/Source/WebCore/ChangeLog (125040 => 125041)
--- trunk/Source/WebCore/ChangeLog 2012-08-08 16:32:05 UTC (rev 125040)
+++ trunk/Source/WebCore/ChangeLog 2012-08-08 16:52:20 UTC (rev 125041)
@@ -1,3 +1,21 @@
+2012-08-08 Philippe Normand <[email protected]>
+
+ [GStreamer] 0.11 build broken (again)
+ https://bugs.webkit.org/show_bug.cgi?id=93474
+
+ Reviewed by Martin Robinson.
+
+ Adapt the GStreamer media player backend to the latest GStreamer
+ 0.11 API changes.
+
+ * platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
+ (WTF::adoptGRef):
+ * platform/graphics/gstreamer/GStreamerVersioning.cpp:
+ (gstObjectIsFloating):
+ * platform/graphics/gstreamer/GStreamerVersioning.h:
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (StreamingClient::didReceiveResponse):
+
2012-08-08 Loïc Yhuel <[email protected]>
[Qt] Compile errors with OpenGLES2
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp (125040 => 125041)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2012-08-08 16:32:05 UTC (rev 125040)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2012-08-08 16:52:20 UTC (rev 125041)
@@ -28,7 +28,7 @@
template <> GRefPtr<GstElement> adoptGRef(GstElement* ptr)
{
- ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
+ ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr)));
return GRefPtr<GstElement>(ptr, GRefPtrAdopt);
}
@@ -48,7 +48,7 @@
template <> GRefPtr<GstPad> adoptGRef(GstPad* ptr)
{
- ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
+ ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr)));
return GRefPtr<GstPad>(ptr, GRefPtrAdopt);
}
@@ -68,7 +68,7 @@
template <> GRefPtr<GstPadTemplate> adoptGRef(GstPadTemplate* ptr)
{
- ASSERT(!ptr || !GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
+ ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr)));
return GRefPtr<GstPadTemplate>(ptr, GRefPtrAdopt);
}
@@ -102,7 +102,7 @@
template <> GRefPtr<GstTask> adoptGRef(GstTask* ptr)
{
- ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
+ ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
return GRefPtr<GstTask>(ptr, GRefPtrAdopt);
}
@@ -122,7 +122,7 @@
template <> GRefPtr<GstBus> adoptGRef(GstBus* ptr)
{
- ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
+ ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
return GRefPtr<GstBus>(ptr, GRefPtrAdopt);
}
@@ -142,7 +142,7 @@
template <> GRefPtr<GstElementFactory> adoptGRef(GstElementFactory* ptr)
{
- ASSERT(!GST_OBJECT_IS_FLOATING(GST_OBJECT(ptr)));
+ ASSERT(!gstObjectIsFloating(GST_OBJECT(ptr)));
return GRefPtr<GstElementFactory>(ptr, GRefPtrAdopt);
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.cpp (125040 => 125041)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.cpp 2012-08-08 16:32:05 UTC (rev 125040)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.cpp 2012-08-08 16:52:20 UTC (rev 125041)
@@ -22,6 +22,7 @@
#include "GStreamerVersioning.h"
#include "IntSize.h"
+#include <wtf/UnusedParam.h>
void webkitGstObjectRefSink(GstObject* gstObject)
{
@@ -105,3 +106,22 @@
gst_element_class_set_details_simple(elementClass, name, longName, description, author);
#endif
}
+
+bool gstObjectIsFloating(GstObject* gstObject)
+{
+#ifdef GST_API_VERSION_1
+ return g_object_is_floating(G_OBJECT(gstObject));
+#else
+ return GST_OBJECT_IS_FLOATING(gstObject);
+#endif
+}
+
+void notifyGstTagsOnPad(GstElement* element, GstPad* pad, GstTagList* tags)
+{
+#ifdef GST_API_VERSION_1
+ UNUSED_PARAM(element);
+ gst_pad_push_event(GST_PAD_CAST(pad), gst_event_new_tag(tags));
+#else
+ gst_element_found_tags_for_pad(element, pad, tags);
+#endif
+}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.h (125040 => 125041)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.h 2012-08-08 16:32:05 UTC (rev 125040)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.h 2012-08-08 16:52:20 UTC (rev 125041)
@@ -32,4 +32,6 @@
bool getVideoSizeAndFormatFromCaps(GstCaps*, WebCore::IntSize&, GstVideoFormat&, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride);
GstBuffer* createGstBuffer(GstBuffer*);
void setGstElementClassMetadata(GstElementClass*, const char* name, const char* longName, const char* description, const char* author);
+bool gstObjectIsFloating(GstObject*);
+void notifyGstTagsOnPad(GstElement*, GstPad*, GstTagList*);
#endif // GStreamerVersioning_h
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (125040 => 125041)
--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2012-08-08 16:32:05 UTC (rev 125040)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2012-08-08 16:52:20 UTC (rev 125041)
@@ -853,11 +853,7 @@
gst_tag_list_free(tags);
#endif
else
-#ifdef GST_API_VERSION_1
- gst_pad_push_event(GST_PAD_CAST(m_src->priv->srcpad), gst_event_new_tag("WebKitWebSrc", tags));
-#else
- gst_element_found_tags_for_pad(GST_ELEMENT(m_src), m_src->priv->srcpad, tags);
-#endif
+ notifyGstTagsOnPad(GST_ELEMENT(m_src), tags, m_src->priv->srcpad);
}
void StreamingClient::didReceiveData(ResourceHandle* handle, const char* data, int length, int encodedDataLength)
Modified: trunk/configure.ac (125040 => 125041)
--- trunk/configure.ac 2012-08-08 16:32:05 UTC (rev 125040)
+++ trunk/configure.ac 2012-08-08 16:52:20 UTC (rev 125041)
@@ -470,6 +470,11 @@
AC_SUBST(ENCHANT_LIBS)
fi
+# farstream-0.1 depends on gstreamer 0.10 currently. Disable
+# media_stream if gstreamer 0.11 build support is enabled.
+if test "$GST_API_VERSION" = "1.0"; then
+ enable_media_stream=false
+fi
if test "$enable_media_stream" = "yes"; then
PKG_CHECK_MODULES([FARSTREAM], [farstream-0.1],
[have_farstream=yes], [enable_media_stream=false])
