mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 23:32:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

playback: merge playbin and decodebin plugins into one single playback plugin again

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-06-15 00:02:13 +01:00
parent b5ef8efa1a
commit 5fd073e070
5 changed files with 22 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gst/playback/Makefile.am
View file

@ -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' \

7
gst/playback/gstdecodebin2.c
View file

@ -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");

3
gst/playback/gstplayback.c
View file

@ -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;
}

2
gst/playback/gstplayback.h
View file

@ -24,6 +24,8 @@
#include <gst/gst.h>
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);

29
gst/playback/gsturidecodebin.c
View file

@ -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)