Title: [176541] trunk/Source/WebCore
- Revision
- 176541
- Author
- [email protected]
- Date
- 2014-11-25 06:49:30 -0800 (Tue, 25 Nov 2014)
Log Message
[GStreamer] gstmpegts is not initialized
https://bugs.webkit.org/show_bug.cgi?id=139039
Reviewed by Carlos Garcia Campos.
* platform/graphics/gstreamer/GStreamerUtilities.cpp:
(WebCore::initializeGStreamer): Initialize the gstmpegts library.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (176540 => 176541)
--- trunk/Source/WebCore/ChangeLog 2014-11-25 14:29:09 UTC (rev 176540)
+++ trunk/Source/WebCore/ChangeLog 2014-11-25 14:49:30 UTC (rev 176541)
@@ -1,3 +1,13 @@
+2014-11-25 Philippe Normand <[email protected]>
+
+ [GStreamer] gstmpegts is not initialized
+ https://bugs.webkit.org/show_bug.cgi?id=139039
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+ (WebCore::initializeGStreamer): Initialize the gstmpegts library.
+
2014-11-24 Eva Balazsfalvi <[email protected]>
Fix unused variable warning in Biquad.cpp
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (176540 => 176541)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2014-11-25 14:29:09 UTC (rev 176540)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2014-11-25 14:49:30 UTC (rev 176541)
@@ -29,6 +29,12 @@
#include <wtf/MathExtras.h>
#include <wtf/gobject/GUniquePtr.h>
+#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
+#define GST_USE_UNSTABLE_API
+#include <gst/mpegts/mpegts.h>
+#undef GST_USE_UNSTABLE_API
+#endif
+
namespace WebCore {
const char* webkitGstMapInfoQuarkString = "webkit-gst-map-info";
@@ -132,6 +138,12 @@
// FIXME: We should probably pass the arguments from the command line.
bool gstInitialized = gst_init_check(0, 0, &error.outPtr());
ASSERT_WITH_MESSAGE(gstInitialized, "GStreamer initialization failed: %s", error ? error->message : "unknown error occurred");
+
+#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
+ if (gstInitialized)
+ gst_mpegts_initialize();
+#endif
+
return gstInitialized;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
