diff --git a/ChangeLog b/ChangeLog index 9727b6be8a..519439af7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-08-12 Mark Nauwelaerts + + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-bad-plugins-docs.sgml: + * docs/plugins/gst-plugins-bad-plugins-sections.txt: + * docs/plugins/gst-plugins-bad-plugins.hierarchy: + * docs/plugins/inspect/plugin-mplex.xml: + * ext/mplex/gstmplex.cc: + Update and add documentation for mplex. + * ext/mpeg2enc/gstmpeg2enc.cc: + Documentation update. + 2008-08-12 Mark Nauwelaerts * docs/plugins/Makefile.am: diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 5a4c69ab1d..826fa568ee 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -109,6 +109,7 @@ EXTRA_HFILES = \ $(top_srcdir)/ext/metadata/gstmetadatademux.h \ $(top_srcdir)/ext/metadata/gstmetadatamux.h \ $(top_srcdir)/ext/mpeg2enc/gstmpeg2enc.hh \ + $(top_srcdir)/ext/mplex/gstmplex.hh \ $(top_srcdir)/ext/mythtv/gstmythtvsrc.h \ $(top_srcdir)/ext/sdl/sdlaudiosink.h \ $(top_srcdir)/ext/sdl/sdlvideosink.h \ diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml index edf3714b9f..ecf67a218e 100644 --- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml @@ -37,6 +37,7 @@ + @@ -91,6 +92,7 @@ + diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt index e0462f9257..b3f05be4f8 100644 --- a/docs/plugins/gst-plugins-bad-plugins-sections.txt +++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt @@ -347,6 +347,25 @@ GST_MPEG2ENC_WAIT gst_mpeg2enc_get_type +
+element-mplex +mplex +GstMplex + +GstMplexClass +GST_MPLEX +GST_MPLEX_CLASS +GST_IS_MPLEX +GST_IS_MPLEX_CLASS +GST_TYPE_MPLEX +GST_MPLEX_MUTEX_LOCK +GST_MPLEX_MUTEX_UNLOCK +GST_MPLEX_SIGNAL +GST_MPLEX_SIGNAL_ALL +GST_MPLEX_WAIT +gst_mplex_get_type +
+
element-mythtvsrc mythtvsrc @@ -723,5 +742,7 @@ GST_Y4M_ENCODE GST_Y4M_ENCODE_CLASS GST_IS_Y4M_ENCODE GST_IS_Y4M_ENCODE_CLASS +GST_Y4M_ENCODE_GET_CLASS GST_TYPE_Y4M_ENCODE +gst_y4m_encode_get_type
diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy index 2c1f5d3737..fbe6fff41b 100644 --- a/docs/plugins/gst-plugins-bad-plugins.hierarchy +++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy @@ -107,6 +107,7 @@ GObject GstGSMEnc GstGSMDec GstMpeg2enc + GstMplex GstMusepackDec GstTRM GstPitch diff --git a/docs/plugins/inspect/plugin-mplex.xml b/docs/plugins/inspect/plugin-mplex.xml new file mode 100644 index 0000000000..91a2776df3 --- /dev/null +++ b/docs/plugins/inspect/plugin-mplex.xml @@ -0,0 +1,42 @@ + + mplex + High-quality MPEG/DVD/SVCD/VCD video/audio multiplexer + ../../ext/mplex/.libs/libgstmplex.so + libgstmplex.so + 0.10.8 + GPL + gst-plugins-bad + GStreamer Bad Plug-ins source release + Unknown package origin + + + mplex + mplex video multiplexer + Codec/Muxer + High-quality MPEG/DVD/SVCD/VCD video/audio multiplexer + Andrew Stevens <andrew.stevens@nexgo.de> + Ronald Bultje <rbultje@ronald.bitfreak.net> + Mark Nauwelaerts <mnauw@users.sourceforge.net + + + audio_%d + sink + request +
audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ], channels=(int)[ 1, 8 ], rate=(int)[ 8000, 96000 ]; audio/x-ac3, channels=(int)[ 1, 8 ], rate=(int)[ 8000, 96000 ]; audio/x-dts; audio/x-raw-int, endianness=(int)4321, signed=(boolean)true, width=(int){ 16, 20, 24 }, depth=(int){ 16, 20, 24 }, rate=(int){ 48000, 96000 }, channels=(int)[ 1, 6 ]
+ + + video_%d + sink + request +
video/mpeg, mpegversion=(int){ 1, 2 }, systemstream=(boolean)false, width=(int)[ 16, 4096 ], height=(int)[ 16, 4096 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
+ + + src + source + always +
video/mpeg, systemstream=(boolean)true
+ + + + + \ No newline at end of file diff --git a/ext/mpeg2enc/gstmpeg2enc.cc b/ext/mpeg2enc/gstmpeg2enc.cc index 87902da9ad..e96e8124fe 100644 --- a/ext/mpeg2enc/gstmpeg2enc.cc +++ b/ext/mpeg2enc/gstmpeg2enc.cc @@ -24,13 +24,13 @@ * SECTION:element-mpeg2enc * @see_also: mpeg2dec * - * This element encodes raw video into an MPEG ?? stream using the + * This element encodes raw video into an MPEG-1/2 elementary stream using the * mjpegtools library. * Documentation on MPEG encoding in general can be found in the - * MJPEG Howto + * MJPEG Howto * and on the various available parameters in the documentation * of the mpeg2enc tool in particular, which shares options with this element. - * + * * * Example pipeline * |[ diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index 297bdcddcd..253e9cf31a 100644 --- a/ext/mplex/gstmplex.cc +++ b/ext/mplex/gstmplex.cc @@ -28,10 +28,10 @@ * and (un)compressed audio streams such as AC3, MPEG layer I/II/III. * It is based on the mjpegtools library. * Documentation on creating MPEG videos in general can be found in the - * MJPEG Howto + * MJPEG Howto * and the man-page of the mplex tool documents the properties of this element, * which are shared with the mplex tool. - * + * * * Example pipeline * |[