From c2e3aede74201d7f4d0a3b670e149923fd7ad5ac Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Wed, 28 May 2008 11:43:01 +0000 Subject: [PATCH] Random doc of the day. Also print human readable format of newsegment in log message if we complain about it. Original commit message from CVS: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-ugly-plugins-docs.sgml: * docs/plugins/gst-plugins-ugly-plugins-sections.txt: * docs/plugins/gst-plugins-ugly-plugins.args: * docs/plugins/gst-plugins-ugly-plugins.hierarchy: * docs/plugins/gst-plugins-ugly-plugins.interfaces: * docs/plugins/inspect/plugin-a52dec.xml: * docs/plugins/inspect/plugin-amrnb.xml: * docs/plugins/inspect/plugin-asf.xml: * docs/plugins/inspect/plugin-dvdlpcmdec.xml: * docs/plugins/inspect/plugin-dvdread.xml: * docs/plugins/inspect/plugin-dvdsub.xml: * docs/plugins/inspect/plugin-iec958.xml: * docs/plugins/inspect/plugin-lame.xml: * docs/plugins/inspect/plugin-mad.xml: * docs/plugins/inspect/plugin-mpeg2dec.xml: * docs/plugins/inspect/plugin-mpegaudioparse.xml: * docs/plugins/inspect/plugin-mpegstream.xml: * docs/plugins/inspect/plugin-realmedia.xml: * docs/plugins/inspect/plugin-siddec.xml: * docs/plugins/inspect/plugin-synaesthesia.xml: * ext/a52dec/gsta52dec.c: Random doc of the day. Also print human readable format of newsegment in log message if we complain about it. --- ChangeLog | 27 ++++++++++++ docs/plugins/Makefile.am | 1 + .../gst-plugins-ugly-plugins-docs.sgml | 1 + .../gst-plugins-ugly-plugins-sections.txt | 14 +++++++ docs/plugins/gst-plugins-ugly-plugins.args | 10 +++++ .../gst-plugins-ugly-plugins.hierarchy | 41 +++++++++++-------- .../gst-plugins-ugly-plugins.interfaces | 6 +-- docs/plugins/inspect/plugin-a52dec.xml | 6 +-- docs/plugins/inspect/plugin-amrnb.xml | 40 +++++++++--------- docs/plugins/inspect/plugin-asf.xml | 6 +-- docs/plugins/inspect/plugin-dvdlpcmdec.xml | 6 +-- docs/plugins/inspect/plugin-dvdread.xml | 6 +-- docs/plugins/inspect/plugin-dvdsub.xml | 6 +-- docs/plugins/inspect/plugin-iec958.xml | 6 +-- docs/plugins/inspect/plugin-lame.xml | 6 +-- docs/plugins/inspect/plugin-mad.xml | 6 +-- docs/plugins/inspect/plugin-mpeg2dec.xml | 6 +-- .../plugins/inspect/plugin-mpegaudioparse.xml | 6 +-- docs/plugins/inspect/plugin-mpegstream.xml | 6 +-- docs/plugins/inspect/plugin-realmedia.xml | 6 +-- docs/plugins/inspect/plugin-siddec.xml | 6 +-- docs/plugins/inspect/plugin-synaesthesia.xml | 16 ++++---- ext/a52dec/gsta52dec.c | 28 ++++++++++++- 23 files changed, 174 insertions(+), 88 deletions(-) diff --git a/ChangeLog b/ChangeLog index af00d105de..7ad1258efd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2008-05-28 Stefan Kost + + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-ugly-plugins-docs.sgml: + * docs/plugins/gst-plugins-ugly-plugins-sections.txt: + * docs/plugins/gst-plugins-ugly-plugins.args: + * docs/plugins/gst-plugins-ugly-plugins.hierarchy: + * docs/plugins/gst-plugins-ugly-plugins.interfaces: + * docs/plugins/inspect/plugin-a52dec.xml: + * docs/plugins/inspect/plugin-amrnb.xml: + * docs/plugins/inspect/plugin-asf.xml: + * docs/plugins/inspect/plugin-dvdlpcmdec.xml: + * docs/plugins/inspect/plugin-dvdread.xml: + * docs/plugins/inspect/plugin-dvdsub.xml: + * docs/plugins/inspect/plugin-iec958.xml: + * docs/plugins/inspect/plugin-lame.xml: + * docs/plugins/inspect/plugin-mad.xml: + * docs/plugins/inspect/plugin-mpeg2dec.xml: + * docs/plugins/inspect/plugin-mpegaudioparse.xml: + * docs/plugins/inspect/plugin-mpegstream.xml: + * docs/plugins/inspect/plugin-realmedia.xml: + * docs/plugins/inspect/plugin-siddec.xml: + * docs/plugins/inspect/plugin-synaesthesia.xml: + * ext/a52dec/gsta52dec.c: + Random doc of the day. Also print human readable format of newsegment + in log message if we complain about it. + 2008-05-26 Wim Taymans * ext/a52dec/gsta52dec.c: (gst_a52dec_init), (gst_a52dec_push), diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 55e1303aa8..c4a9d8f4c3 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -83,6 +83,7 @@ IGNORE_CFILES = # $(top_srcdir)/ext/gnomevfs/gstgnomevfssink.c EXTRA_HFILES = \ + $(top_srcdir)/ext/a52dec/gsta52dec.h \ $(top_srcdir)/ext/amrnb/amrnbdec.h \ $(top_srcdir)/ext/amrnb/amrnbenc.h \ $(top_srcdir)/ext/amrnb/amrnbparse.h \ diff --git a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml index 2d8937b658..fb21f97dfc 100644 --- a/docs/plugins/gst-plugins-ugly-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-ugly-plugins-docs.sgml @@ -12,6 +12,7 @@ gst-plugins-ugly Elements + diff --git a/docs/plugins/gst-plugins-ugly-plugins-sections.txt b/docs/plugins/gst-plugins-ugly-plugins-sections.txt index 73a73f055e..ad59628d95 100644 --- a/docs/plugins/gst-plugins-ugly-plugins-sections.txt +++ b/docs/plugins/gst-plugins-ugly-plugins-sections.txt @@ -1,3 +1,17 @@ +
+element-a52dec +a52dec +GstA52Dec + +GstA52DecClass +GST_A52DEC +GST_A52DEC_CLASS +GST_IS_A52DEC +GST_IS_A52DEC_CLASS +GST_TYPE_A52DEC +gst_a52dec_get_type +
+
element-amrnbdec amrnbdec diff --git a/docs/plugins/gst-plugins-ugly-plugins.args b/docs/plugins/gst-plugins-ugly-plugins.args index 8ab18de92e..5133ce3582 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.args +++ b/docs/plugins/gst-plugins-ugly-plugins.args @@ -668,3 +668,13 @@ 200 + +GstAmrnbEnc::band-mode +GstAmrnbEncBandMode + +rwx +Band Mode +Encoding Band Mode (Kbps). +MR122 + + diff --git a/docs/plugins/gst-plugins-ugly-plugins.hierarchy b/docs/plugins/gst-plugins-ugly-plugins.hierarchy index 46e718ca21..fca39d953e 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.hierarchy +++ b/docs/plugins/gst-plugins-ugly-plugins.hierarchy @@ -9,32 +9,39 @@ GObject GstElement GstBin GstPipeline - GstLame - GstSidDec - GstMpeg2dec - GstMad - GstID3TagBase - GstID3Tag - GstBaseSrc - GstPushSrc - GstDvdReadSrc - GstA52Dec GstASFDemux GstRTSPWMS - AC3IEC GstDvdLpcmDec - GstRMDemux - GstRealAudioDemux - GstRDTDepay - GstRDTManager - GstRTSPReal GstDvdSubDec GstDvdSubParse + AC3IEC GstXingMux GstMPEGAudioParse GstMPEGParse GstMPEGDemux GstDVDDemux + GstRMDemux + GstRealAudioDemux + GstRDTDepay + GstRDTManager + GstRTSPReal + GstSynaesthesia + GstA52Dec + GstAmrnbDec + GstAmrnbParse + GstAmrnbEnc + GstBaseSrc + GstPushSrc + GstDvdReadSrc + GstLame + GstMad + GstID3TagBase + GstID3Tag + GstMpeg2dec + GstSidDec + GstBus + GstTask + GstClock GstPlugin GstRegistry GstSignalObject @@ -42,5 +49,5 @@ GInterface GTypePlugin GstChildProxy GstURIHandler - GstTagSetter GstRTSPExtension + GstTagSetter diff --git a/docs/plugins/gst-plugins-ugly-plugins.interfaces b/docs/plugins/gst-plugins-ugly-plugins.interfaces index 8dfc4f25ce..51b0af1b63 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.interfaces +++ b/docs/plugins/gst-plugins-ugly-plugins.interfaces @@ -1,7 +1,7 @@ GstBin GstChildProxy GstPipeline GstChildProxy -GstLame GstTagSetter -GstID3Tag GstTagSetter -GstDvdReadSrc GstURIHandler GstRTSPWMS GstRTSPExtension GstRTSPReal GstRTSPExtension +GstDvdReadSrc GstURIHandler +GstLame GstTagSetter +GstID3Tag GstTagSetter diff --git a/docs/plugins/inspect/plugin-a52dec.xml b/docs/plugins/inspect/plugin-a52dec.xml index 9317212b8d..6128632c3c 100644 --- a/docs/plugins/inspect/plugin-a52dec.xml +++ b/docs/plugins/inspect/plugin-a52dec.xml @@ -3,11 +3,11 @@ Decodes ATSC A/52 encoded audio streams ../../ext/a52dec/.libs/libgsta52dec.so libgsta52dec.so - 0.10.8 + 0.10.8.1 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org a52dec diff --git a/docs/plugins/inspect/plugin-amrnb.xml b/docs/plugins/inspect/plugin-amrnb.xml index 6950e171db..1cd03aa6aa 100644 --- a/docs/plugins/inspect/plugin-amrnb.xml +++ b/docs/plugins/inspect/plugin-amrnb.xml @@ -3,11 +3,11 @@ Adaptive Multi-Rate Narrow-Band ../../ext/amrnb/.libs/libgstamrnb.so libgstamrnb.so - 0.10.6.1 + 0.10.8.1 unknown gst-plugins-ugly GStreamer Ugly Plug-ins CVS/prerelease - Unknown package origin + http://gstreamer.freedesktop.org amrnbdec @@ -16,18 +16,18 @@ Adaptive Multi-Rate Narrow-Band audio decoder Ronald Bultje <rbultje@ronald.bitfreak.net> - - src - source - always -
audio/x-raw-int, width=(int)16, depth=(int)16, signed=(boolean)true, endianness=(int)1234, rate=(int)8000, channels=(int)1
- sink sink always
audio/AMR, rate=(int)8000, channels=(int)1
 + + src + source + always +
audio/x-raw-int, width=(int)16, depth=(int)16, signed=(boolean)true, endianness=(int)1234, rate=(int)8000, channels=(int)1
+ @@ -37,18 +37,18 @@ Adaptive Multi-Rate Narrow-Band audio encoder Ronald Bultje <rbultje@ronald.bitfreak.net>, Wim Taymans <wim.taymans@gmail.com> - - src - source - always -
audio/AMR, rate=(int)8000, channels=(int)1
- sink sink always
audio/x-raw-int, width=(int)16, depth=(int)16, signed=(boolean)true, endianness=(int)1234, rate=(int)8000, channels=(int)1
 + + src + source + always +
audio/AMR, rate=(int)8000, channels=(int)1
+ @@ -58,18 +58,18 @@ Adaptive Multi-Rate Narrow-Band audio parser Ronald Bultje <rbultje@ronald.bitfreak.net> - - src - source - always -
audio/AMR, rate=(int)8000, channels=(int)1
- sink sink always
audio/x-amr-nb-sh
 + + src + source + always +
audio/AMR, rate=(int)8000, channels=(int)1
+ diff --git a/docs/plugins/inspect/plugin-asf.xml b/docs/plugins/inspect/plugin-asf.xml index d8ca3ff400..cad8a03e16 100644 --- a/docs/plugins/inspect/plugin-asf.xml +++ b/docs/plugins/inspect/plugin-asf.xml @@ -3,11 +3,11 @@ Demuxes and muxes audio and video in Microsofts ASF format ../../gst/asfdemux/.libs/libgstasf.so libgstasf.so - 0.10.8 + 0.10.8.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org asfdemux diff --git a/docs/plugins/inspect/plugin-dvdlpcmdec.xml b/docs/plugins/inspect/plugin-dvdlpcmdec.xml index 764037d990..3dba7288a8 100644 --- a/docs/plugins/inspect/plugin-dvdlpcmdec.xml +++ b/docs/plugins/inspect/plugin-dvdlpcmdec.xml @@ -3,11 +3,11 @@ Decode DVD LPCM frames into standard PCM ../../gst/dvdlpcmdec/.libs/libgstdvdlpcmdec.so libgstdvdlpcmdec.so - 0.10.8 + 0.10.8.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org dvdlpcmdec diff --git a/docs/plugins/inspect/plugin-dvdread.xml b/docs/plugins/inspect/plugin-dvdread.xml index 7df9ae600d..8e7c604cd3 100644 --- a/docs/plugins/inspect/plugin-dvdread.xml +++ b/docs/plugins/inspect/plugin-dvdread.xml @@ -3,11 +3,11 @@ Access a DVD with dvdread ../../ext/dvdread/.libs/libgstdvdread.so libgstdvdread.so - 0.10.8 + 0.10.8.1 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org dvdreadsrc diff --git a/docs/plugins/inspect/plugin-dvdsub.xml b/docs/plugins/inspect/plugin-dvdsub.xml index e0e1580df4..f17390e3b5 100644 --- a/docs/plugins/inspect/plugin-dvdsub.xml +++ b/docs/plugins/inspect/plugin-dvdsub.xml @@ -3,11 +3,11 @@ DVD subtitle parser and decoder ../../gst/dvdsub/.libs/libgstdvdsub.so libgstdvdsub.so - 0.10.8 + 0.10.8.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org dvdsubdec diff --git a/docs/plugins/inspect/plugin-iec958.xml b/docs/plugins/inspect/plugin-iec958.xml index 80ce0ba1dc..f5af8603b4 100644 --- a/docs/plugins/inspect/plugin-iec958.xml +++ b/docs/plugins/inspect/plugin-iec958.xml @@ -3,11 +3,11 @@ Convert raw AC3 into IEC958 (S/PDIF) frames ../../gst/iec958/.libs/libgstiec958.so libgstiec958.so - 0.10.8 + 0.10.8.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org ac3iec958 diff --git a/docs/plugins/inspect/plugin-lame.xml b/docs/plugins/inspect/plugin-lame.xml index f56cbbdfc4..dcf15e38e0 100644 --- a/docs/plugins/inspect/plugin-lame.xml +++ b/docs/plugins/inspect/plugin-lame.xml @@ -3,11 +3,11 @@ Encode MP3s with LAME ../../ext/lame/.libs/libgstlame.so libgstlame.so - 0.10.8 + 0.10.8.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org lame diff --git a/docs/plugins/inspect/plugin-mad.xml b/docs/plugins/inspect/plugin-mad.xml index 0548920659..d6321b325c 100644 --- a/docs/plugins/inspect/plugin-mad.xml +++ b/docs/plugins/inspect/plugin-mad.xml @@ -3,11 +3,11 @@ id3 tag manipulation and mp3 decoding based on the mad library ../../ext/mad/.libs/libgstmad.so libgstmad.so - 0.10.8 + 0.10.8.1 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org id3mux diff --git a/docs/plugins/inspect/plugin-mpeg2dec.xml b/docs/plugins/inspect/plugin-mpeg2dec.xml index c64c0184dc..d6a0543e7e 100644 --- a/docs/plugins/inspect/plugin-mpeg2dec.xml +++ b/docs/plugins/inspect/plugin-mpeg2dec.xml @@ -3,11 +3,11 @@ LibMpeg2 decoder ../../ext/mpeg2dec/.libs/libgstmpeg2dec.so libgstmpeg2dec.so - 0.10.8 + 0.10.8.1 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org mpeg2dec diff --git a/docs/plugins/inspect/plugin-mpegaudioparse.xml b/docs/plugins/inspect/plugin-mpegaudioparse.xml index 45f4c71f4e..6569cb0e5e 100644 --- a/docs/plugins/inspect/plugin-mpegaudioparse.xml +++ b/docs/plugins/inspect/plugin-mpegaudioparse.xml @@ -3,11 +3,11 @@ MPEG-1 layer 1/2/3 audio stream elements ../../gst/mpegaudioparse/.libs/libgstmpegaudioparse.so libgstmpegaudioparse.so - 0.10.8 + 0.10.8.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org mp3parse diff --git a/docs/plugins/inspect/plugin-mpegstream.xml b/docs/plugins/inspect/plugin-mpegstream.xml index 7d6fbf978c..29da050500 100644 --- a/docs/plugins/inspect/plugin-mpegstream.xml +++ b/docs/plugins/inspect/plugin-mpegstream.xml @@ -3,11 +3,11 @@ MPEG system stream parser ../../gst/mpegstream/.libs/libgstmpegstream.so libgstmpegstream.so - 0.10.8 + 0.10.8.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org dvddemux diff --git a/docs/plugins/inspect/plugin-realmedia.xml b/docs/plugins/inspect/plugin-realmedia.xml index 83e9d82912..5caef1b92d 100644 --- a/docs/plugins/inspect/plugin-realmedia.xml +++ b/docs/plugins/inspect/plugin-realmedia.xml @@ -3,11 +3,11 @@ RealMedia demuxer and depayloader ../../gst/realmedia/.libs/libgstrmdemux.so libgstrmdemux.so - 0.10.8 + 0.10.8.1 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org rademux diff --git a/docs/plugins/inspect/plugin-siddec.xml b/docs/plugins/inspect/plugin-siddec.xml index 59f62005ed..0127d92380 100644 --- a/docs/plugins/inspect/plugin-siddec.xml +++ b/docs/plugins/inspect/plugin-siddec.xml @@ -3,11 +3,11 @@ Uses libsidplay to decode .sid files ../../ext/sidplay/.libs/libgstsid.so libgstsid.so - 0.10.8 + 0.10.8.1 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins source release - Unknown package origin + GStreamer Ugly Plug-ins CVS/prerelease + http://gstreamer.freedesktop.org siddec diff --git a/docs/plugins/inspect/plugin-synaesthesia.xml b/docs/plugins/inspect/plugin-synaesthesia.xml index 7c42ad3221..23c1c74fba 100644 --- a/docs/plugins/inspect/plugin-synaesthesia.xml +++ b/docs/plugins/inspect/plugin-synaesthesia.xml @@ -3,11 +3,11 @@ Creates video visualizations of audio input, using stereo and pitch information ../../gst/synaesthesia/.libs/libgstsynaesthesia.so libgstsynaesthesia.so - 0.10.6.1 + 0.10.8.1 GPL gst-plugins-ugly GStreamer Ugly Plug-ins CVS/prerelease - Unknown package origin + http://gstreamer.freedesktop.org synaesthesia @@ -16,18 +16,18 @@ Creates video visualizations of audio input, using stereo and pitch information Richard Boulton <richard@tartarus.org> - - sink - sink - always -
audio/x-raw-int, rate=(int)[ 1, 2147483647 ], channels=(int)2, endianness=(int)1234, width=(int)16, depth=(int)16, signed=(boolean)true
- src source always
video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]
 + + sink + sink + always +
audio/x-raw-int, rate=(int)[ 1, 2147483647 ], channels=(int)2, endianness=(int)1234, width=(int)16, depth=(int)16, signed=(boolean)true
+ diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c index 4f49d79964..a6625c48d4 100644 --- a/ext/a52dec/gsta52dec.c +++ b/ext/a52dec/gsta52dec.c @@ -17,6 +17,31 @@ * Boston, MA 02111-1307, USA. */ +/** + * SECTION:element-a52dec + * + * + * + * Dolby Digital (AC-3) audio decoder. + * + * + * + * Example launch line + * + * + * gst-launch dvdreadsrc title=1 ! dvddemux ! a52dec ! audioresample ! audioconvert ! alsasink + * + * Play audio track from a dvd. + * + * + * + * gst-launch filesrc location=abc.ac3 ! a52dec ! audioresample ! audioconvert ! alsasink + * + * Decode a stand alone file and play it. + * + * + */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -410,7 +435,8 @@ gst_a52dec_sink_event (GstPad * pad, GstEvent * event) gst_event_parse_new_segment (event, NULL, NULL, &format, &val, NULL, NULL); if (format != GST_FORMAT_TIME || !GST_CLOCK_TIME_IS_VALID (val)) { - GST_WARNING ("No time in newsegment event %p", event); + GST_WARNING ("No time in newsegment event %p (format is %s)", + event, gst_format_get_name (format)); gst_event_unref (event); a52dec->sent_segment = FALSE; } else {