FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mpegdemux: rename plugin to mpegpsdemux

Browse Source
This commit is contained in:
Tim-Philipp Müller 2012-06-16 16:49:10 +01:00
parent 61bad24f81
commit a3fc64d153
5 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gst/mpegdemux/Makefile.am
View File

@ -1,18 +1,18 @@
plugin_LTLIBRARIES = libgstmpegdemux.la plugin_LTLIBRARIES = libgstmpegpsdemux.la
libgstmpegdemux_la_SOURCES = \ libgstmpegpsdemux_la_SOURCES = \
flumpegdemux.c \ plugin.c \
gstmpegdemux.c \ gstmpegdemux.c \
gstpesfilter.c gstpesfilter.c
libgstmpegdemux_la_CFLAGS = \ libgstmpegpsdemux_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstmpegdemux_la_LIBADD = \ libgstmpegpsdemux_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \ $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
libgstmpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmpegpsdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstmpegdemux_la_LIBTOOLFLAGS = --tag=disable-static libgstmpegpsdemux_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = \ noinst_HEADERS = \
gstmpegdefs.h \ gstmpegdefs.h \
@ -21,13 +21,13 @@ noinst_HEADERS = \
Android.mk: Makefile.am $(BUILT_SOURCES) Android.mk: Makefile.am $(BUILT_SOURCES)
androgenizer \ androgenizer \
-:PROJECT libgstmpegdemux -:SHARED libgstmpegdemux \ -:PROJECT libgstmpegpsdemux -:SHARED libgstmpegpsdemux \
-:TAGS eng debug \ -:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(libgstmpegdemux_la_SOURCES) \ -:SOURCES $(libgstmpegpsdemux_la_SOURCES) \
-:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmpegdemux_la_CFLAGS) \ -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmpegpsdemux_la_CFLAGS) \
-:LDFLAGS $(libgstmpegdemux_la_LDFLAGS) \ -:LDFLAGS $(libgstmpegpsdemux_la_LDFLAGS) \
$(libgstmpegdemux_la_LIBADD) \ $(libgstmpegpsdemux_la_LIBADD) \
-ldl \ -ldl \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \

11
gst/mpegdemux/gstmpegdemux.c
View File

@ -3168,14 +3168,3 @@ gst_segment_set_duration (GstSegment * segment, GstFormat format,
} }
segment->duration = duration; segment->duration = duration;
} }
gboolean
gst_flups_demux_plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "mpegpsdemux",
GST_RANK_PRIMARY, GST_TYPE_FLUPS_DEMUX))
return FALSE;
return TRUE;
}

2
gst/mpegdemux/gstmpegdemux.h
View File

@ -161,7 +161,5 @@ struct _GstFluPSDemuxClass
GType gst_flups_demux_get_type (void); GType gst_flups_demux_get_type (void);
gboolean gst_flups_demux_plugin_init (GstPlugin * plugin);
G_END_DECLS G_END_DECLS
#endif /* __GST_FLUPS_DEMUX_H__ */ #endif /* __GST_FLUPS_DEMUX_H__ */

4
gst/mpegdemux/gstpesfilter.c
View File

@ -48,8 +48,8 @@
#include "gstmpegdefs.h" #include "gstmpegdefs.h"
#include "gstpesfilter.h" #include "gstpesfilter.h"
GST_DEBUG_CATEGORY (gstflupesfilter_debug); GST_DEBUG_CATEGORY (mpegpspesfilter_debug);
#define GST_CAT_DEFAULT (gstflupesfilter_debug) #define GST_CAT_DEFAULT (mpegpspesfilter_debug)
static GstFlowReturn gst_pes_filter_data_push (GstPESFilter * filter, static GstFlowReturn gst_pes_filter_data_push (GstPESFilter * filter,
gboolean first, GstBuffer * buffer); gboolean first, GstBuffer * buffer);

13
gst/mpegdemux/flumpegdemux.c → gst/mpegdemux/plugin.c
View File

@ -47,15 +47,16 @@
#include "gstmpegdemux.h" #include "gstmpegdemux.h"
GST_DEBUG_CATEGORY_EXTERN (gstflupesfilter_debug); GST_DEBUG_CATEGORY_EXTERN (mpegpspesfilter_debug);
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
GST_DEBUG_CATEGORY_INIT (gstflupesfilter_debug, "mpegpesfilter", 0, GST_DEBUG_CATEGORY_INIT (mpegpspesfilter_debug, "mpegpspesfilter", 0,
"MPEG-TS/PS PES filter output"); "MPEG-PS PES filter");
if (!gst_flups_demux_plugin_init (plugin)) if (!gst_element_register (plugin, "mpegpsdemux", GST_RANK_PRIMARY,
GST_TYPE_FLUPS_DEMUX))
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -63,7 +64,7 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
mpegdemux2, mpegpsdemux,
"MPEG demuxers", "MPEG-PS demuxer",
plugin_init, VERSION, plugin_init, VERSION,
GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);