mpegdemux: rename plugin to mpegpsdemux

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

diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c
index e87642d..787ac05 100644 (file)
--- a/gst/mpegdemux/gstmpegdemux.c
+++ b/gst/mpegdemux/gstmpegdemux.c
@@ -3168,14 +3168,3 @@ gst_segment_set_duration (GstSegment * segment, GstFormat format,
   }
   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;
-}

diff --git a/gst/mpegdemux/gstmpegdemux.h b/gst/mpegdemux/gstmpegdemux.h
index 6cf7aed..bea4dc4 100644 (file)
--- a/gst/mpegdemux/gstmpegdemux.h
+++ b/gst/mpegdemux/gstmpegdemux.h
@@ -161,7 +161,5 @@ struct _GstFluPSDemuxClass
 
 GType gst_flups_demux_get_type (void);
 
-gboolean gst_flups_demux_plugin_init (GstPlugin * plugin);
-
 G_END_DECLS
 #endif /* __GST_FLUPS_DEMUX_H__ */

diff --git a/gst/mpegdemux/gstpesfilter.c b/gst/mpegdemux/gstpesfilter.c
index f728e4b..d58c726 100644 (file)
--- a/gst/mpegdemux/gstpesfilter.c
+++ b/gst/mpegdemux/gstpesfilter.c
@@ -48,8 +48,8 @@
 #include "gstmpegdefs.h"
 #include "gstpesfilter.h"
 
-GST_DEBUG_CATEGORY (gstflupesfilter_debug);
-#define GST_CAT_DEFAULT (gstflupesfilter_debug)
+GST_DEBUG_CATEGORY (mpegpspesfilter_debug);
+#define GST_CAT_DEFAULT (mpegpspesfilter_debug)
 
 static GstFlowReturn gst_pes_filter_data_push (GstPESFilter * filter,
     gboolean first, GstBuffer * buffer);

diff --git a/gst/mpegdemux/flumpegdemux.c b/gst/mpegdemux/plugin.c
similarity index 87%
rename from gst/mpegdemux/flumpegdemux.c
rename to gst/mpegdemux/plugin.c
index 38a3520..28c691c 100644 (file)
--- a/gst/mpegdemux/flumpegdemux.c
+++ b/gst/mpegdemux/plugin.c
@@ -47,15 +47,16 @@
 
 #include "gstmpegdemux.h"
 
-GST_DEBUG_CATEGORY_EXTERN (gstflupesfilter_debug);
+GST_DEBUG_CATEGORY_EXTERN (mpegpspesfilter_debug);
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  GST_DEBUG_CATEGORY_INIT (gstflupesfilter_debug, "mpegpesfilter", 0,
-      "MPEG-TS/PS PES filter output");
+  GST_DEBUG_CATEGORY_INIT (mpegpspesfilter_debug, "mpegpspesfilter", 0,
+      "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 TRUE;
@@ -63,7 +64,7 @@ plugin_init (GstPlugin * plugin)
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    mpegdemux2,
-    "MPEG demuxers",
+    mpegpsdemux,
+    "MPEG-PS demuxer",
     plugin_init, VERSION,
     GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);