From 5fd073e07055786e07eec6bfcfef55cf7e5ce669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 15 Jun 2011 00:02:13 +0100 Subject: [PATCH] playback: merge playbin and decodebin plugins into one single playback plugin again --- gst/playback/Makefile.am | 49 +++++++++++----------------------- gst/playback/gstdecodebin2.c | 7 ----- gst/playback/gstplayback.c | 3 +++ gst/playback/gstplayback.h | 2 ++ gst/playback/gsturidecodebin.c | 29 ++------------------ 5 files changed, 22 insertions(+), 68 deletions(-) diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am index dd6ac2cb04..d0138cecba 100644 --- a/gst/playback/Makefile.am +++ b/gst/playback/Makefile.am @@ -6,9 +6,11 @@ glib_gen_basename = gstplay built_sources = gstplay-marshal.c built_headers = gstplay-marshal.h -plugin_LTLIBRARIES = libgstplaybin.la libgstdecodebin2.la +plugin_LTLIBRARIES = libgstplayback.la -libgstplaybin_la_SOURCES = \ +libgstplayback_la_SOURCES = \ + gstdecodebin2.c \ + gsturidecodebin.c \ gstplayback.c \ gstplaybin2.c \ gstplaysink.c \ @@ -19,24 +21,15 @@ libgstplaybin_la_SOURCES = \ gstplaysinkaudioconvert.c \ gststreamsynchronizer.c -nodist_libgstplaybin_la_SOURCES = $(built_sources) -libgstplaybin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstplaybin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstplaybin_la_LIBADD = \ +nodist_libgstplayback_la_SOURCES = $(built_sources) +libgstplayback_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) +libgstplayback_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstplayback_la_LIBADD = \ $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ $(GST_LIBS) -libgstplaybin_la_LIBTOOLFLAGS = --tag=disable-static - -libgstdecodebin2_la_SOURCES = gstdecodebin2.c gsturidecodebin.c gstplay-enum.c -nodist_libgstdecodebin2_la_SOURCES = $(built_sources) -libgstdecodebin2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstdecodebin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstdecodebin2_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ - $(GST_LIBS) -libgstdecodebin2_la_LIBTOOLFLAGS = --tag=disable-static +libgstplayback_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstplayback.h \ @@ -59,26 +52,14 @@ include $(top_srcdir)/common/gst-glib-gen.mak Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ - -:PROJECT libgstdecodebin2 -:SHARED libgstdecodebin2 \ + -:PROJECT libgstplayback -:SHARED libgstplayback \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstdecodebin2_la_SOURCES) \ - $(nodist_libgstdecodebin2_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdecodebin2_la_CFLAGS) \ - -:LDFLAGS $(libgstdecodebin2_la_LDFLAGS) \ - $(libgstdecodebin2_la_LIBADD) \ - -ldl \ - -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ - LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ - \ - -:PROJECT libgstplaybin -:SHARED libgstplaybin \ - -:TAGS eng debug \ - -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstplaybin_la_SOURCES) \ - $(nodist_libgstplaybin_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstplaybin_la_CFLAGS) \ - -:LDFLAGS $(libgstplaybin_la_LDFLAGS) \ - $(libgstplaybin_la_LIBADD) \ + -:SOURCES $(libgstplayback_la_SOURCES) \ + $(nodist_libgstplayback_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstplayback_la_CFLAGS) \ + -:LDFLAGS $(libgstplayback_la_LDFLAGS) \ + $(libgstplayback_la_LIBADD) \ -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index 701f2d2431..43c176b798 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -3790,13 +3790,6 @@ gst_decode_bin_plugin_init (GstPlugin * plugin) { GST_DEBUG_CATEGORY_INIT (gst_decode_bin_debug, "decodebin", 0, "decoder bin"); -#ifdef ENABLE_NLS - GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE, - LOCALEDIR); - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -#endif /* ENABLE_NLS */ - /* Register some quarks here for the stream topology message */ topology_structure_name = g_quark_from_static_string ("stream-topology"); topology_caps = g_quark_from_static_string ("caps"); diff --git a/gst/playback/gstplayback.c b/gst/playback/gstplayback.c index f7a0432ec4..75eddd74c4 100644 --- a/gst/playback/gstplayback.c +++ b/gst/playback/gstplayback.c @@ -54,6 +54,9 @@ plugin_init (GstPlugin * plugin) res &= gst_play_sink_plugin_init (plugin); res &= gst_subtitle_overlay_plugin_init (plugin); + res &= gst_decode_bin_plugin_init (plugin); + res &= gst_uri_decode_bin_plugin_init (plugin); + return res; } diff --git a/gst/playback/gstplayback.h b/gst/playback/gstplayback.h index 4be121ca21..910b1a3970 100644 --- a/gst/playback/gstplayback.h +++ b/gst/playback/gstplayback.h @@ -24,6 +24,8 @@ #include gboolean gst_decode_bin_plugin_init (GstPlugin * plugin); +gboolean gst_uri_decode_bin_plugin_init (GstPlugin * plugin); + gboolean gst_play_bin_plugin_init (GstPlugin * plugin); gboolean gst_play_bin2_plugin_init (GstPlugin * plugin); diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c index 87332db4cb..ae1313d541 100644 --- a/gst/playback/gsturidecodebin.c +++ b/gst/playback/gsturidecodebin.c @@ -37,6 +37,7 @@ #include "gstplay-marshal.h" #include "gstplay-enum.h" #include "gstrawcaps.h" +#include "gstplayback.h" #define GST_TYPE_URI_DECODE_BIN \ (gst_uri_decode_bin_get_type()) @@ -2544,38 +2545,12 @@ setup_failed: } } -gboolean gst_decode_bin_plugin_init (GstPlugin * plugin); - -static gboolean +gboolean gst_uri_decode_bin_plugin_init (GstPlugin * plugin) { GST_DEBUG_CATEGORY_INIT (gst_uri_decode_bin_debug, "uridecodebin", 0, "URI decoder element"); -#ifdef ENABLE_NLS - GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE, - LOCALEDIR); - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -#endif /* ENABLE_NLS */ - return gst_element_register (plugin, "uridecodebin", GST_RANK_NONE, GST_TYPE_URI_DECODE_BIN); } - -static gboolean -plugin_init (GstPlugin * plugin) -{ - if (!gst_decode_bin_plugin_init (plugin)) - return FALSE; - if (!gst_uri_decode_bin_plugin_init (plugin)) - return FALSE; - - return TRUE; -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "uridecodebin", - "URI Decoder bin", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, - GST_PACKAGE_ORIGIN)