Title: [132081] trunk/Source/WebCore
- Revision
- 132081
- Author
- commit-qu...@webkit.org
- Date
- 2012-10-22 09:44:28 -0700 (Mon, 22 Oct 2012)
Log Message
Gstreamer 1.0 not working
https://bugs.webkit.org/show_bug.cgi?id=99852
Patch by Nicolas Dufresne <nicolas.dufre...@collabora.com> on 2012-10-22
Reviewed by Philippe Normand.
There was a series of trivial issue, g_object_is_floating() was called
on type GstCaps (which is not a GObject), webkitGstGetPadCaps() was
returning non-fixed caps and GST_MESSAGE_DURATION has been renamed
to GST_MESSAGE_DURATION_CHANGED.
Most failing test passes now.
* platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
(WTF::adoptGRef):
* platform/graphics/gstreamer/GStreamerVersioning.cpp:
(webkitGstGetPadCaps):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::handleMessage):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132080 => 132081)
--- trunk/Source/WebCore/ChangeLog 2012-10-22 16:30:03 UTC (rev 132080)
+++ trunk/Source/WebCore/ChangeLog 2012-10-22 16:44:28 UTC (rev 132081)
@@ -1,3 +1,24 @@
+2012-10-22 Nicolas Dufresne <nicolas.dufre...@collabora.com>
+
+ Gstreamer 1.0 not working
+ https://bugs.webkit.org/show_bug.cgi?id=99852
+
+ Reviewed by Philippe Normand.
+
+ There was a series of trivial issue, g_object_is_floating() was called
+ on type GstCaps (which is not a GObject), webkitGstGetPadCaps() was
+ returning non-fixed caps and GST_MESSAGE_DURATION has been renamed
+ to GST_MESSAGE_DURATION_CHANGED.
+
+ Most failing test passes now.
+
+ * platform/graphics/gstreamer/GRefPtrGStreamer.cpp:
+ (WTF::adoptGRef):
+ * platform/graphics/gstreamer/GStreamerVersioning.cpp:
+ (webkitGstGetPadCaps):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::handleMessage):
+
2012-10-22 Vsevolod Vlasov <vse...@chromium.org>
Web Inspector: Treat dynamic anonymous scripts as other anonymous and fix anonymous script editing and breakpoints.
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp (132080 => 132081)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2012-10-22 16:30:03 UTC (rev 132080)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp 2012-10-22 16:44:28 UTC (rev 132081)
@@ -88,7 +88,6 @@
template <> GRefPtr<GstCaps> adoptGRef(GstCaps* ptr)
{
- ASSERT(!ptr || !gstObjectIsFloating(GST_OBJECT(ptr)));
return GRefPtr<GstCaps>(ptr, GRefPtrAdopt);
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.cpp (132080 => 132081)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.cpp 2012-10-22 16:30:03 UTC (rev 132080)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerVersioning.cpp 2012-10-22 16:44:28 UTC (rev 132081)
@@ -40,10 +40,7 @@
return 0;
#ifdef GST_API_VERSION_1
- GstCaps* caps = gst_pad_get_current_caps(pad);
- if (!caps)
- caps = gst_pad_query_caps(pad, 0);
- return adoptGRef(caps); // gst_pad_query_caps and gst_pad_get_current_caps return a new reference.
+ return adoptGRef(gst_pad_get_current_caps(pad)); // gst_pad_get_current_caps return a new reference.
#else
return GST_PAD_CAPS(pad);
#endif
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (132080 => 132081)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2012-10-22 16:30:03 UTC (rev 132080)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2012-10-22 16:44:28 UTC (rev 132081)
@@ -857,7 +857,11 @@
case GST_MESSAGE_BUFFERING:
processBufferingStats(message);
break;
+#ifdef GST_API_VERSION_1
+ case GST_MESSAGE_DURATION_CHANGED:
+#else
case GST_MESSAGE_DURATION:
+#endif
LOG_MEDIA_MESSAGE("Duration changed");
durationChanged();
break;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
