Changeset 135863 in webkit

Timestamp:

Nov 27, 2012 7:58:34 AM (11 years ago)

Author:

commit-queue@webkit.org

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 <​vjaquez@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):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/GNUmakefile.am (modified) (2 diffs)
• Tools/GtkLauncher/main.c (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-27  Víctor Manuel Jáquez Leal  <vjaquez@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  <haraken@chromium.org>
 

trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp

@@ -30 +30 @@
 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.

trunk/Tools/ChangeLog

@@ +1 @@
+2012-11-27  Víctor Manuel Jáquez Leal  <vjaquez@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.becsi@digia.com>
 

trunk/Tools/GNUmakefile.am

@@ -23 +23 @@
         $(global_cflags) \
         $(GTK_CFLAGS) \
-        $(LIBSOUP_CFLAGS)
+        $(LIBSOUP_CFLAGS) \
+        $(GSTREAMER_CFLAGS)
 
 Programs_GtkLauncher_LDADD = \
@@ -31 +32 @@
         $(GLIB_LIBS) \
         $(LIBSOUP_LIBS) \
-        $(WINMM_LIBS)
+        $(WINMM_LIBS) \
+        $(GSTREAMER_LIBS)
 
 Programs_GtkLauncher_LDFLAGS = \

trunk/Tools/GtkLauncher/main.c

@@ -28 +28 @@
 #include "LauncherInspectorWindow.h"
 #include <errno.h>
+#include <gst/gst.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
@@ -484 +485 @@
 
     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();