[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
philn at webkit.org
philn at webkit.org
Wed Dec 22 18:22:34 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7a878367830b0598bf754a45c8e9fa81578c469f
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 10 10:25:55 2010 +0000
2010-12-10 Philippe Normand <pnormand at igalia.com>
Reviewed by Gustavo Noronha Silva.
[GStreamer] data: source could also support non-base64 encoded URIs
https://bugs.webkit.org/show_bug.cgi?id=30007
Removed our ancient implementation of dataurisrc. We should now
use the one in gst-plugins-bad which is more mature.
* GNUmakefile.am:
* platform/graphics/gstreamer/DataSourceGStreamer.cpp: Removed.
* platform/graphics/gstreamer/DataSourceGStreamer.h: Removed.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::doGstInit):
LayoutTests:
Reviewed by Gustavo Noronha Silva.
[GStreamer] data: source could also support non-base64 encoded URIs
https://bugs.webkit.org/show_bug.cgi?id=30007
* platform/gtk/Skipped: Unskipped media/audio-data-url.html. It
should now be much more reliable on the bots running latest
GStreamer versions.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73700 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0d281c3..163ee6f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-10 Philippe Normand <pnormand at igalia.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ [GStreamer] data: source could also support non-base64 encoded URIs
+ https://bugs.webkit.org/show_bug.cgi?id=30007
+
+ * platform/gtk/Skipped: Unskipped media/audio-data-url.html. It
+ should now be much more reliable on the bots running latest
+ GStreamer versions.
+
2010-12-10 Hans Wennborg <hans at chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index c6b4e68..2278c1d 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5019,9 +5019,6 @@ svg/dom/SVGScriptElement/script-set-href.svg
# https://bugs.webkit.org/show_bug.cgi?id=37562
plugins/update-widgets-crash.html
-# https://bugs.webkit.org/show_bug.cgi?id=37564
-media/audio-data-url.html
-
# https://bugs.webkit.org/show_bug.cgi?id=37572
plugins/open-and-close-window-with-plugin.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aa54779..92179ec 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-10 Philippe Normand <pnormand at igalia.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ [GStreamer] data: source could also support non-base64 encoded URIs
+ https://bugs.webkit.org/show_bug.cgi?id=30007
+
+ Removed our ancient implementation of dataurisrc. We should now
+ use the one in gst-plugins-bad which is more mature.
+
+ * GNUmakefile.am:
+ * platform/graphics/gstreamer/DataSourceGStreamer.cpp: Removed.
+ * platform/graphics/gstreamer/DataSourceGStreamer.h: Removed.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::doGstInit):
+
2010-12-10 Zoltan Herczeg <zherczeg at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 25c24e9..da60f18 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -3635,8 +3635,6 @@ webcoregtk_sources += \
WebCore/platform/graphics/cairo/RefPtrCairo.cpp \
WebCore/platform/graphics/cairo/RefPtrCairo.h \
WebCore/platform/graphics/cairo/TransformationMatrixCairo.cpp \
- WebCore/platform/graphics/gstreamer/DataSourceGStreamer.cpp \
- WebCore/platform/graphics/gstreamer/DataSourceGStreamer.h \
WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.cpp \
WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.h \
WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp \
diff --git a/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.cpp b/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.cpp
deleted file mode 100644
index 5a94fd4..0000000
--- a/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (C) 2009 Igalia S.L
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "DataSourceGStreamer.h"
-#if USE(GSTREAMER)
-
-#include <gio/gio.h>
-#include <glib.h>
-#include <gst/gst.h>
-#include <gst/pbutils/missing-plugins.h>
-
-static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE("src",
- GST_PAD_SRC,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS_ANY);
-
-GST_DEBUG_CATEGORY_STATIC(webkit_data_src_debug);
-#define GST_CAT_DEFAULT webkit_data_src_debug
-
-static void webkit_data_src_uri_handler_init(gpointer g_iface,
- gpointer iface_data);
-
-static void webkit_data_src_finalize(WebkitDataSrc* src);
-static GstStateChangeReturn webkit_data_src_change_state(GstElement* element,
- GstStateChange transition);
-
-static const GInterfaceInfo urihandler_info = {
- webkit_data_src_uri_handler_init,
- 0, 0
-};
-
-
-static void _do_init(GType datasrc_type)
-{
- GST_DEBUG_CATEGORY_INIT(webkit_data_src_debug, "webkit_data_src", 0, "datasrc element");
- g_type_add_interface_static(datasrc_type, GST_TYPE_URI_HANDLER,
- &urihandler_info);
-}
-
-GST_BOILERPLATE_FULL(WebkitDataSrc, webkit_data_src, GstBin, GST_TYPE_BIN, _do_init);
-
-static void webkit_data_src_base_init(gpointer klass)
-{
- GstElementClass* element_class = GST_ELEMENT_CLASS(klass);
-
- gst_element_class_add_pad_template(element_class,
- gst_static_pad_template_get(&src_template));
- gst_element_class_set_details_simple(element_class, (gchar*) "WebKit data source element",
- (gchar*) "Source",
- (gchar*) "Handles data: uris",
- (gchar*) "Philippe Normand <pnormand at igalia.com>");
-
-}
-
-static void webkit_data_src_class_init(WebkitDataSrcClass* klass)
-{
- GObjectClass* oklass = G_OBJECT_CLASS(klass);
- GstElementClass* eklass = GST_ELEMENT_CLASS(klass);
-
- oklass->finalize = (GObjectFinalizeFunc) webkit_data_src_finalize;
- eklass->change_state = webkit_data_src_change_state;
-}
-
-
-static gboolean webkit_data_src_reset(WebkitDataSrc* src)
-{
- GstPad* targetpad;
-
- if (src->kid) {
- gst_element_set_state(src->kid, GST_STATE_NULL);
- gst_bin_remove(GST_BIN(src), src->kid);
- }
-
- src->kid = gst_element_factory_make("giostreamsrc", "streamsrc");
- if (!src->kid) {
- GST_ERROR_OBJECT(src, "Failed to create giostreamsrc");
- return FALSE;
- }
-
- gst_bin_add(GST_BIN(src), src->kid);
-
- targetpad = gst_element_get_static_pad(src->kid, "src");
- gst_ghost_pad_set_target(GST_GHOST_PAD(src->pad), targetpad);
- gst_object_unref(targetpad);
-
- return TRUE;
-}
-
-static void webkit_data_src_init(WebkitDataSrc* src,
- WebkitDataSrcClass* g_class)
-{
- GstPadTemplate* pad_template = gst_static_pad_template_get(&src_template);
- src->pad = gst_ghost_pad_new_no_target_from_template("src",
- pad_template);
-
- gst_element_add_pad(GST_ELEMENT(src), src->pad);
-
- webkit_data_src_reset(src);
-}
-
-static void webkit_data_src_finalize(WebkitDataSrc* src)
-{
- g_free(src->uri);
-
- if (src->kid) {
- GST_DEBUG_OBJECT(src, "Removing giostreamsrc element");
- gst_element_set_state(src->kid, GST_STATE_NULL);
- gst_bin_remove(GST_BIN(src), src->kid);
- src->kid = 0;
- }
-
- GST_CALL_PARENT(G_OBJECT_CLASS, finalize, ((GObject* )(src)));
-}
-
-static GstStateChangeReturn webkit_data_src_change_state(GstElement* element, GstStateChange transition)
-{
- GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
- WebkitDataSrc* src = WEBKIT_DATA_SRC(element);
-
- switch (transition) {
- case GST_STATE_CHANGE_NULL_TO_READY:
- if (!src->kid) {
- gst_element_post_message(element,
- gst_missing_element_message_new(element, "giostreamsrc"));
- GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (0), ("no giostreamsrc"));
- return GST_STATE_CHANGE_FAILURE;
- }
- break;
- default:
- break;
- }
-
- ret = GST_ELEMENT_CLASS(parent_class)->change_state(element, transition);
- if (G_UNLIKELY(ret == GST_STATE_CHANGE_FAILURE))
- return ret;
-
- // Downwards state change code should be here, after chaining up
- // to the parent class.
-
- return ret;
-}
-
-/*** GSTURIHANDLER INTERFACE *************************************************/
-
-static GstURIType webkit_data_src_uri_get_type(void)
-{
- return GST_URI_SRC;
-}
-
-static gchar** webkit_data_src_uri_get_protocols(void)
-{
- static gchar* protocols[] = {(gchar*) "data", 0 };
-
- return protocols;
-}
-
-static const gchar* webkit_data_src_uri_get_uri(GstURIHandler* handler)
-{
- WebkitDataSrc* src = WEBKIT_DATA_SRC(handler);
-
- return src->uri;
-}
-
-static gboolean webkit_data_src_uri_set_uri(GstURIHandler* handler, const gchar* uri)
-{
- WebkitDataSrc* src = WEBKIT_DATA_SRC(handler);
-
- // URI as defined in RFC2397:
- // "data:" [ mediatype ] [ ";base64" ] "," data
- // we parse URIs like this one:
- // data:audio/3gpp;base64,AA...
-
- gchar** scheme_and_remains = g_strsplit(uri, ":", 2);
- gchar** mime_type_and_options = g_strsplit(scheme_and_remains[1], ";", 0);
- gint options_size = g_strv_length(mime_type_and_options);
- gchar* data = 0;
- gchar* mime_type = 0;
- gint ret = FALSE;
-
- // we require uris with a specified mime-type and base64-encoded
- // data. It doesn't make much sense anyway to play plain/text data
- // with very few allowed characters (as per the RFC).
-
- if (GST_STATE(src) >= GST_STATE_PAUSED) {
- GST_ERROR_OBJECT(src, "Element already configured. Reset it and retry");
- } else if (!options_size)
- GST_ERROR_OBJECT(src, "A mime-type is needed in %s", uri);
- else {
- mime_type = mime_type_and_options[0];
- data = mime_type_and_options[options_size-1];
-
- guchar* decoded_data = 0;
- gsize decoded_size;
-
- if (!g_str_has_prefix(data, "base64"))
- GST_ERROR_OBJECT(src, "Data has to be base64-encoded in %s", uri);
- else {
- decoded_data = g_base64_decode(data+7, &decoded_size);
- GInputStream* stream = g_memory_input_stream_new_from_data(decoded_data,
- decoded_size,
- g_free);
- g_object_set(src->kid, "stream", stream, NULL);
- g_object_unref(stream);
-
- if (src->uri) {
- g_free(src->uri);
- src->uri = 0;
- }
-
- src->uri = g_strdup(uri);
- ret = TRUE;
- }
- }
-
- g_strfreev(scheme_and_remains);
- g_strfreev(mime_type_and_options);
- return ret;
-}
-
-static void webkit_data_src_uri_handler_init(gpointer g_iface, gpointer iface_data)
-{
- GstURIHandlerInterface* iface = (GstURIHandlerInterface *) g_iface;
-
- iface->get_type = webkit_data_src_uri_get_type;
- iface->get_protocols = webkit_data_src_uri_get_protocols;
- iface->get_uri = webkit_data_src_uri_get_uri;
- iface->set_uri = webkit_data_src_uri_set_uri;
-}
-
-#endif // USE(GSTREAMER)
diff --git a/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.h b/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.h
deleted file mode 100644
index d462ccc..0000000
--- a/WebCore/platform/graphics/gstreamer/DataSourceGStreamer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2009 Igalia S.L
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef DataSourceGStreamer_h
-#define DataSourceGStreamer_h
-
-#if USE(GSTREAMER)
-
-#include <glib-object.h>
-#include <gst/base/gstbasesrc.h>
-
-G_BEGIN_DECLS
-
-#define WEBKIT_TYPE_DATA_SRC (webkit_data_src_get_type ())
-#define WEBKIT_DATA_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), WEBKIT_TYPE_DATA_SRC, WebkitDataSrc))
-#define WEBKIT_DATA_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), WEBKIT_TYPE_DATA_SRC, WebkitDataSrcClass))
-#define WEBKIT_IS_DATA_SRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WEBKIT_TYPE_DATA_SRC))
-#define WEBKIT_IS_DATA_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), WEBKIT_TYPE_DATA_SRC))
-
-typedef struct _WebkitDataSrc WebkitDataSrc;
-typedef struct _WebkitDataSrcClass WebkitDataSrcClass;
-
-
-struct _WebkitDataSrc {
- GstBin parent;
-
- /* explicit pointers to stuff used */
- GstElement* kid;
- GstPad* pad;
- gchar* uri;
-};
-
-struct _WebkitDataSrcClass {
- GstBinClass parent_class;
-};
-
-GType webkit_data_src_get_type(void);
-
-G_END_DECLS
-
-#endif // USE(GSTREAMER)
-#endif
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index f1fdf69..7bfdea2 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -27,7 +27,6 @@
#if USE(GSTREAMER)
#include "ColorSpace.h"
-#include "DataSourceGStreamer.h"
#include "Document.h"
#include "Frame.h"
#include "FrameView.h"
@@ -283,16 +282,12 @@ static bool doGstInit()
if (!gstInitialized) {
GOwnPtr<GError> error;
gstInitialized = gst_init_check(0, 0, &error.outPtr());
- if (!gstInitialized) {
+ if (!gstInitialized)
LOG_VERBOSE(Media, "Could not initialize GStreamer: %s",
error ? error->message : "unknown error occurred");
- } else {
- gst_element_register(0, "webkitmediasrc", GST_RANK_PRIMARY,
- WEBKIT_TYPE_DATA_SRC);
+ else
gst_element_register(0, "webkitwebsrc", GST_RANK_PRIMARY + 100,
WEBKIT_TYPE_WEB_SRC);
- }
-
}
return gstInitialized;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list