Title: [135863] trunk
- Revision
- 135863
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-27 07:58:34 -0800 (Tue, 27 Nov 2012)
Log Message
[GStreamer] Verify if GStreamer was previously initialized
https://bugs.webkit.org/show_bug.cgi?id=103151
Patch by Víctor Manuel Jáquez Leal <vjaq...@igalia.com> on 2012-11-27
Reviewed by Philippe Normand.
Source/WebCore:
This patch calls gst_is_initialized() before calling gst_init_check()
in order to verify if GStreamer has not been initialized before.
This is useful particularly for WebKit1 so the applications could
initialize GStreamer before.
As the API call was added in GStreamer v0.10.31, the patch fences the
call only in that version of GStreamer or above.
No new tests, existing media tests cover this change.
* platform/graphics/gstreamer/GStreamerUtilities.cpp:
(WebCore::initializeGStreamer):
Tools:
This patch adds the gst_init() in GtkLauncher, so we can add the
GStreamer options in the command line through
gst_init_get_option_group().
This approach is not valid for MiniBrowser because it uses WebKit2,
where the GStreamer backend lives in the web process, which is
different from the UI process.
* GNUmakefile.am:
* GtkLauncher/main.c:
(main):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135862 => 135863)
--- trunk/Source/WebCore/ChangeLog 2012-11-27 15:50:07 UTC (rev 135862)
+++ trunk/Source/WebCore/ChangeLog 2012-11-27 15:58:34 UTC (rev 135863)
@@ -1,3 +1,24 @@
+2012-11-27 Víctor Manuel Jáquez Leal <vjaq...@igalia.com>
+
+ [GStreamer] Verify if GStreamer was previously initialized
+ https://bugs.webkit.org/show_bug.cgi?id=103151
+
+ Reviewed by Philippe Normand.
+
+ This patch calls gst_is_initialized() before calling gst_init_check()
+ in order to verify if GStreamer has not been initialized before.
+
+ This is useful particularly for WebKit1 so the applications could
+ initialize GStreamer before.
+
+ As the API call was added in GStreamer v0.10.31, the patch fences the
+ call only in that version of GStreamer or above.
+
+ No new tests, existing media tests cover this change.
+
+ * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+ (WebCore::initializeGStreamer):
+
2012-11-27 Kentaro Hara <hara...@chromium.org>
[V8] Remove V8StringResource::m_string
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (135862 => 135863)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2012-11-27 15:50:07 UTC (rev 135862)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2012-11-27 15:58:34 UTC (rev 135863)
@@ -29,6 +29,11 @@
bool initializeGStreamer()
{
+#if GST_CHECK_VERSION(0, 10, 31)
+ if (gst_is_initialized())
+ return true;
+#endif
+
GOwnPtr<GError> error;
// FIXME: We should probably pass the arguments from the command line.
bool gstInitialized = gst_init_check(0, 0, &error.outPtr());
Modified: trunk/Tools/ChangeLog (135862 => 135863)
--- trunk/Tools/ChangeLog 2012-11-27 15:50:07 UTC (rev 135862)
+++ trunk/Tools/ChangeLog 2012-11-27 15:58:34 UTC (rev 135863)
@@ -1,3 +1,22 @@
+2012-11-27 Víctor Manuel Jáquez Leal <vjaq...@igalia.com>
+
+ [GStreamer] Verify if GStreamer was previously initialized
+ https://bugs.webkit.org/show_bug.cgi?id=103151
+
+ Reviewed by Philippe Normand.
+
+ This patch adds the gst_init() in GtkLauncher, so we can add the
+ GStreamer options in the command line through
+ gst_init_get_option_group().
+
+ This approach is not valid for MiniBrowser because it uses WebKit2,
+ where the GStreamer backend lives in the web process, which is
+ different from the UI process.
+
+ * GNUmakefile.am:
+ * GtkLauncher/main.c:
+ (main):
+
2012-11-27 Andras Becsi <andras.be...@digia.com>
[Qt] Fix the build with new Qt5 hash
Modified: trunk/Tools/GNUmakefile.am (135862 => 135863)
--- trunk/Tools/GNUmakefile.am 2012-11-27 15:50:07 UTC (rev 135862)
+++ trunk/Tools/GNUmakefile.am 2012-11-27 15:58:34 UTC (rev 135863)
@@ -22,7 +22,8 @@
-fno-strict-aliasing \
$(global_cflags) \
$(GTK_CFLAGS) \
- $(LIBSOUP_CFLAGS)
+ $(LIBSOUP_CFLAGS) \
+ $(GSTREAMER_CFLAGS)
Programs_GtkLauncher_LDADD = \
libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
@@ -30,7 +31,8 @@
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(LIBSOUP_LIBS) \
- $(WINMM_LIBS)
+ $(WINMM_LIBS) \
+ $(GSTREAMER_LIBS)
Programs_GtkLauncher_LDFLAGS = \
-no-fast-install \
Modified: trunk/Tools/GtkLauncher/main.c (135862 => 135863)
--- trunk/Tools/GtkLauncher/main.c 2012-11-27 15:50:07 UTC (rev 135862)
+++ trunk/Tools/GtkLauncher/main.c 2012-11-27 15:58:34 UTC (rev 135863)
@@ -27,6 +27,7 @@
#include "LauncherInspectorWindow.h"
#include <errno.h>
+#include <gst/gst.h>
#include <gtk/gtk.h>
#include <stdlib.h>
#include <string.h>
@@ -483,10 +484,12 @@
};
gtk_init(&argc, &argv);
+ gst_init(&argc, &argv);
GOptionContext *context = g_option_context_new(0);
g_option_context_add_main_entries(context, commandLineOptions, 0);
g_option_context_add_group(context, gtk_get_option_group(TRUE));
+ g_option_context_add_group(context, gst_init_get_option_group());
webkitSettings = webkit_web_settings_new();
g_object_set(webkitSettings, "enable-developer-extras", TRUE, NULL);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
