Commit a1e81377 authored by Gildas Bazin's avatar Gildas Bazin

* modules/*: sanitization of the modules description strings.
parent 5d2949dc
......@@ -2,7 +2,7 @@
* directory.c: expands a directory (directory: access plug-in)
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: directory.c,v 1.3 2003/03/24 17:15:29 gbazin Exp $
* $Id: directory.c,v 1.4 2003/03/30 18:14:35 gbazin Exp $
*
* Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
*
......@@ -79,7 +79,7 @@ static ssize_t Read ( input_thread_t *, byte_t *, size_t );
*****************************************************************************/
vlc_module_begin();
set_description( _("Standard filesystem directory reading") );
set_description( _("Standard filesystem directory input") );
set_capability( "access", 55 );
add_shortcut( "directory" );
add_shortcut( "dir" );
......
......@@ -2,7 +2,7 @@
* dvd.c : DVD input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: dvd.c,v 1.5 2003/02/20 01:52:45 sigmunau Exp $
* $Id: dvd.c,v 1.6 2003/03/30 18:14:35 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -88,13 +88,14 @@ vlc_module_begin();
add_string_from_list( "dvdcss-method", NULL, cssmethod_list, NULL,
CSSMETHOD_TEXT, CSSMETHOD_LONGTEXT, VLC_TRUE );
#ifdef GOD_DAMN_DMCA
set_description( _("DVD input module, uses libdvdcss if installed") );
set_description( _("DVD input (uses libdvdcss if installed)") );
i = 90;
#else
set_description( _("DVD input module, uses libdvdcss") );
set_description( _("DVD input (uses libdvdcss)") );
i = 100;
#endif
add_shortcut( "dvdold" );
add_shortcut( "dvdsimple" );
add_submodule();
set_capability( "access", i );
set_callbacks( E_(DVDOpen), E_(DVDClose) );
......
......@@ -7,7 +7,7 @@
*****************************************************************************
*
* Copyright (C) 2001 VideoLAN
* $Id: dvd.c,v 1.4 2003/03/30 11:54:29 sigmunau Exp $
* $Id: dvd.c,v 1.5 2003/03/30 18:14:35 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -49,7 +49,7 @@ void E_(CloseIntf) ( vlc_object_t * );
*****************************************************************************/
vlc_module_begin();
add_usage_hint( N_("[dvdplay:][device][@[title][,[chapter][,angle]]]") );
set_description( _("dvdplay input module") );
set_description( _("DVD input with menus support") );
add_submodule();
set_capability( "access", 120 );
set_callbacks( E_(OpenDVD), E_(CloseDVD) );
......
......@@ -2,7 +2,7 @@
* dvdread.c : DvdRead input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: dvdread.c,v 1.5 2003/03/29 13:15:33 sigmunau Exp $
* $Id: dvdread.c,v 1.6 2003/03/30 18:14:35 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -42,7 +42,7 @@ void E_(EndDVD) ( vlc_object_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("DVDRead input module") );
set_description( _("DVD input (using libdvdread)") );
add_submodule();
set_capability( "access", 110 );
set_callbacks( E_(OpenDVD), E_(CloseDVD) );
......
......@@ -2,7 +2,7 @@
* file.c: file input (file: access plug-in)
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: file.c,v 1.14 2003/03/24 17:15:29 gbazin Exp $
* $Id: file.c,v 1.15 2003/03/30 18:14:35 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -72,7 +72,7 @@ static ssize_t Read ( input_thread_t *, byte_t *, size_t );
"value should be set in miliseconds units." )
vlc_module_begin();
set_description( _("Standard filesystem file reading") );
set_description( _("Standard filesystem file input") );
add_category_hint( N_("file"), NULL, VLC_TRUE );
add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
set_capability( "access", 50 );
......
......@@ -2,7 +2,7 @@
* ftp.c:
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: ftp.c,v 1.13 2003/03/24 23:04:07 gbazin Exp $
* $Id: ftp.c,v 1.14 2003/03/30 18:14:35 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -89,7 +89,7 @@ static int ftp_StopStream ( input_thread_t *);
"value should be set in miliseconds units." )
vlc_module_begin();
set_description( _("ftp access module") );
set_description( _("FTP input") );
set_capability( "access", 0 );
add_category_hint( "stream", NULL, VLC_FALSE );
add_integer( "ftp-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL,
......
......@@ -2,7 +2,7 @@
* http.c: HTTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: http.c,v 1.31 2003/03/24 23:04:07 gbazin Exp $
* $Id: http.c,v 1.32 2003/03/30 18:14:35 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -86,7 +86,7 @@ vlc_module_begin();
add_category_hint( N_("http"), NULL, VLC_FALSE );
add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, VLC_FALSE );
add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
set_description( _("HTTP access module") );
set_description( _("HTTP input") );
set_capability( "access", 0 );
add_shortcut( "http" );
add_shortcut( "http4" );
......
......@@ -2,7 +2,7 @@
* mms.c: MMS access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: mms.c,v 1.30 2003/03/24 20:00:51 gbazin Exp $
* $Id: mms.c,v 1.31 2003/03/30 18:14:35 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -132,7 +132,7 @@ static void mms_ParseURL( url_t *p_url, char *psz_url );
"value should be set in miliseconds units." )
vlc_module_begin();
set_description( _("MMS access module") );
set_description( _("Microsoft Media Server (MMS) input") );
set_capability( "access", 0 );
add_category_hint( "stream", NULL, VLC_TRUE );
add_integer( "mms-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
......
......@@ -78,7 +78,7 @@ vlc_module_begin();
LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT, VLC_FALSE );
add_integer( "lnb-slof", 11700, NULL,
LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT, VLC_FALSE );
set_description( _("satellite input module") );
set_description( _("satellite input") );
set_capability( "access", 0 );
add_shortcut( "sat" );
set_callbacks( E_(Open), E_(Close) );
......
......@@ -2,7 +2,7 @@
* slp.c: SLP access plugin
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: slp.c,v 1.9 2003/03/24 17:15:29 gbazin Exp $
* $Id: slp.c,v 1.10 2003/03/30 18:14:35 gbazin Exp $
*
* Authors: Loc Minier <lool@videolan.org>
*
......@@ -75,7 +75,7 @@ static int Demux ( input_thread_t * );
"default locale; it is used in all SLP queries"
vlc_module_begin();
set_description( _("SLP access module") );
set_description( _("SLP input") );
add_category_hint( N_("slp"), NULL, VLC_TRUE );
add_string( "slp-attrids", "", NULL, ATTRIDS_TEXT, ATTRIDS_LONGTEXT, VLC_TRUE );
add_string( "slp-scopelist", "", NULL, SCOPELIST_TEXT,
......
......@@ -2,7 +2,7 @@
* udp.c: raw UDP & RTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: udp.c,v 1.18 2003/03/24 20:00:51 gbazin Exp $
* $Id: udp.c,v 1.19 2003/03/30 18:14:35 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Tristan Leteurtre <tooney@via.ecp.fr>
......@@ -75,7 +75,7 @@ static ssize_t RTPChoose( input_thread_t *, byte_t *, size_t );
"value should be set in miliseconds units." )
vlc_module_begin();
set_description( _("raw UDP access module") );
set_description( _("UDP/RTP input") );
add_category_hint( N_("udp"), NULL , VLC_TRUE );
add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
set_capability( "access", 0 );
......
......@@ -2,7 +2,7 @@
* v4l.c : Video4Linux input module for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: v4l.c,v 1.3 2003/03/24 17:15:30 gbazin Exp $
* $Id: v4l.c,v 1.4 2003/03/30 18:14:36 gbazin Exp $
*
* Author: Samuel Hocevar <sam@zoy.org>
*
......@@ -42,7 +42,7 @@ static int V4lRead ( input_thread_t *, byte_t *, size_t );
* Module descriptior
*****************************************************************************/
vlc_module_begin();
set_description( _("Video4Linux input module") );
set_description( _("Video4Linux input") );
set_capability( "access", 80 );
set_callbacks( V4lOpen, V4lClose );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* vcd.c : VCD input module for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: vcd.c,v 1.17 2003/03/24 17:15:30 gbazin Exp $
* $Id: vcd.c,v 1.18 2003/03/30 18:14:36 gbazin Exp $
*
* Author: Johan Bilien <jobi@via.ecp.fr>
*
......@@ -76,7 +76,7 @@ static int VCDEntryPoints ( input_thread_t * );
* Module descriptior
*****************************************************************************/
vlc_module_begin();
set_description( _("VCD input module") );
set_description( _("VCD input") );
set_capability( "access", 80 );
set_callbacks( VCDOpen, VCDClose );
add_shortcut( "svcd" );
......
......@@ -4,7 +4,7 @@
* (http://liba52.sf.net/).
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: a52tofloat32.c,v 1.14 2003/02/24 17:06:21 jlj Exp $
* $Id: a52tofloat32.c,v 1.15 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -84,7 +84,7 @@ struct aout_filter_sys_t
vlc_module_begin();
add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
set_description( _("ATSC A/52 aka AC-3 audio decoder module") );
set_description( _("ATSC A/52 aka AC-3 audio decoder") );
set_capability( "audio filter", 100 );
set_callbacks( Create, Destroy );
vlc_module_end();
......
......@@ -3,7 +3,7 @@
* using MAD (MPEG Audio Decoder)
*****************************************************************************
* Copyright (C) 2001 by Jean-Paul Saman
* $Id: mpgatofixed32.c,v 1.7 2003/02/21 16:31:37 hartman Exp $
* $Id: mpgatofixed32.c,v 1.8 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Jean-Paul Saman <jpsaman@wxs.nl>
......@@ -58,7 +58,7 @@ struct aout_filter_sys_t
*****************************************************************************/
vlc_module_begin();
add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );
set_description( _("MPEG audio decoder module") );
set_description( _("MPEG audio decoder") );
set_capability( "audio filter", 100 );
set_callbacks( Create, Destroy );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* float32.c : precise float32 audio mixer implementation
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: float32.c,v 1.8 2002/11/20 16:43:33 sam Exp $
* $Id: float32.c,v 1.9 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -42,7 +42,7 @@ static void DoWork ( aout_instance_t *, aout_buffer_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("float32 audio mixer module") );
set_description( _("float32 audio mixer") );
set_capability( "audio mixer", 10 );
set_callbacks( Create, NULL );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* spdif.c : dummy mixer for S/PDIF output (1 input only)
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: spdif.c,v 1.8 2002/11/20 16:43:33 sam Exp $
* $Id: spdif.c,v 1.9 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -42,7 +42,7 @@ static void DoWork ( aout_instance_t *, aout_buffer_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("dummy spdif audio mixer module") );
set_description( _("dummy spdif audio mixer") );
set_capability( "audio mixer", 1 );
set_callbacks( Create, NULL );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* trivial.c : trivial mixer plug-in (1 input, no downmixing)
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: trivial.c,v 1.11 2002/11/20 16:43:33 sam Exp $
* $Id: trivial.c,v 1.12 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -42,7 +42,7 @@ static void DoWork ( aout_instance_t *, aout_buffer_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("trivial audio mixer module") );
set_description( _("trivial audio mixer") );
set_capability( "audio mixer", 1 );
set_callbacks( Create, NULL );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* alsa.c : alsa plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: alsa.c,v 1.24 2003/02/20 16:07:38 gbazin Exp $
* $Id: alsa.c,v 1.25 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Henri Fallon <henri@videolan.org> - Original Author
* Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
......@@ -91,7 +91,7 @@ vlc_module_begin();
add_category_hint( N_("ALSA"), NULL, VLC_FALSE );
add_string( "alsadev", DEFAULT_ALSA_DEVICE, aout_FindAndRestart,
N_("ALSA device name"), NULL, VLC_FALSE );
set_description( _("ALSA audio module") );
set_description( _("ALSA audio output") );
set_capability( "audio output", 50 );
set_callbacks( Open, Close );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* arts.c : aRts module
*****************************************************************************
* Copyright (C) 2001-2002 VideoLAN
* $Id: arts.c,v 1.17 2003/01/29 09:54:45 sam Exp $
* $Id: arts.c,v 1.18 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Emmanuel Blindauer <manu@agat.net>
* Samuel Hocevar <sam@zoy.org>
......@@ -63,7 +63,7 @@ static void Play ( aout_instance_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("aRts audio module") );
set_description( _("aRts audio output") );
set_capability( "audio output", 50 );
set_callbacks( Open, Close );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* directx.c: Windows DirectX audio output method
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: directx.c,v 1.15 2003/03/03 14:21:08 gbazin Exp $
* $Id: directx.c,v 1.16 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -212,7 +212,7 @@ static void InterleaveS16 ( int16_t *, int16_t *, int *, int );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("DirectX audio module") );
set_description( _("DirectX audio output") );
set_capability( "audio output", 100 );
add_shortcut( "directx" );
set_callbacks( OpenAudio, CloseAudio );
......
......@@ -2,7 +2,7 @@
* esd.c : EsounD module
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: esd.c,v 1.17 2003/01/28 22:52:30 sam Exp $
* $Id: esd.c,v 1.18 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -61,7 +61,7 @@ static void Play ( aout_instance_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("EsounD audio module") );
set_description( _("EsounD audio output") );
set_capability( "audio output", 50 );
set_callbacks( Open, Close );
add_shortcut( "esound" );
......
......@@ -2,7 +2,7 @@
* file.c : audio output which writes the samples to a file
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: file.c,v 1.19 2003/03/30 14:24:20 gbazin Exp $
* $Id: file.c,v 1.20 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -111,7 +111,7 @@ vlc_module_begin();
add_file( "audiofile", "audiofile.wav", NULL, FILE_TEXT,
FILE_LONGTEXT, VLC_FALSE );
add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, VLC_TRUE );
set_description( N_("file audio output module") );
set_description( N_("file audio output") );
set_capability( "audio output", 0 );
add_shortcut( "file" );
add_shortcut( "audiofile" );
......
......@@ -2,7 +2,7 @@
* oss.c : OSS /dev/dsp module for vlc
*****************************************************************************
* Copyright (C) 2000-2002 VideoLAN
* $Id: oss.c,v 1.54 2003/03/10 10:41:22 massiot Exp $
* $Id: oss.c,v 1.55 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -110,7 +110,7 @@ vlc_module_begin();
add_file( "dspdev", "/dev/dsp", aout_FindAndRestart,
N_("OSS dsp device"), NULL, VLC_FALSE );
add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, VLC_TRUE );
set_description( _("Linux OSS /dev/dsp module") );
set_description( _("Linux OSS audio output") );
set_capability( "audio output", 100 );
add_shortcut( "oss" );
set_callbacks( Open, Close );
......
......@@ -2,7 +2,7 @@
* sdl.c : SDL audio output plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2002 VideoLAN
* $Id: sdl.c,v 1.20 2003/01/13 16:58:58 massiot Exp $
* $Id: sdl.c,v 1.21 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -65,7 +65,7 @@ static void SDLCallback ( void *, byte_t *, int );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("Simple DirectMedia Layer audio module") );
set_description( _("Simple DirectMedia Layer audio output") );
set_capability( "audio output", 40 );
add_shortcut( "sdl" );
set_callbacks( Open, Close );
......
......@@ -2,7 +2,7 @@
* waveout.c : Windows waveOut plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: waveout.c,v 1.20 2003/03/28 17:02:25 gbazin Exp $
* $Id: waveout.c,v 1.21 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -127,7 +127,7 @@ static void InterleaveS16( int16_t *, int *, int );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("Win32 waveOut extension module") );
set_description( _("Win32 waveOut extension output") );
set_capability( "audio output", 50 );
set_callbacks( Open, Close );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* decoder.c: AAC decoder using libfaad2
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: decoder.c,v 1.21 2003/01/28 16:57:28 sam Exp $
* $Id: decoder.c,v 1.22 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -52,7 +52,7 @@ static void EndThread ( adec_thread_t * );
*****************************************************************************/
vlc_module_begin();
set_description( _("AAC decoder module (libfaad2)") );
set_description( _("AAC audio decoder (using libfaad2)") );
set_capability( "decoder", 60 );
set_callbacks( OpenDecoder, NULL );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* postprocessing.c
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: postprocessing.c,v 1.2 2002/08/08 22:28:22 sam Exp $
* $Id: postprocessing.c,v 1.3 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -46,16 +46,16 @@ static int pp_postprocess( picture_t *,
*****************************************************************************/
vlc_module_begin();
#ifdef MODULE_NAME_IS_postprocessing_c
set_description( _("C Post Processing module") );
set_description( _("C Post Processing") );
set_capability( "postprocessing", 50 );
add_shortcut( "c" );
#elif defined( MODULE_NAME_IS_postprocessing_mmx )
set_description( _("MMX Post Processing module") );
set_description( _("MMX Post Processing") );
set_capability( "postprocessing", 100 );
add_requirement( MMX );
add_shortcut( "mmx" );
#elif defined( MODULE_NAME_IS_postprocessing_mmxext )
set_description( _("MMXEXT Post Processing module") );
set_description( _("MMXEXT Post Processing") );
set_capability( "postprocessing", 150 );
add_requirement( MMXEXT );
add_shortcut( "mmxext" );
......
......@@ -2,7 +2,7 @@
* flac.c: flac decoder module making use of libflac
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: flacdec.c,v 1.1 2003/02/23 16:31:48 sigmunau Exp $
* $Id: flacdec.c,v 1.2 2003/03/30 18:14:36 gbazin Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -104,7 +104,7 @@ static void decoder_state_error( dec_thread_t *p_dec, FLAC__StreamDecoderState s
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("flac decoder module") );
set_description( _("flac audio decoder") );
set_capability( "decoder", 100 );
set_callbacks( OpenDecoder, NULL );
vlc_module_end();
......
/*****************************************************************************
* libmpeg2.c: mpeg2 video decoder module making use of libmpeg2.
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: libmpeg2.c,v 1.5 2003/03/26 22:56:39 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <vlc/vlc.h>
#include <vlc/vout.h>
#include <vlc/input.h>
#include <vlc/decoder.h>
#include <stdlib.h> /* malloc(), free() */
#include <string.h> /* memcpy(), memset() */
#include <mpeg2dec/mpeg2.h>
/* Aspect ratio (ISO/IEC 13818-2 section 6.3.3, table 6-3) */
#define AR_SQUARE_PICTURE 1 /* square pixels */
#define AR_3_4_PICTURE 2 /* 3:4 picture (TV) */
#define AR_16_9_PICTURE 3 /* 16:9 picture (wide screen) */
#define AR_221_1_PICTURE 4 /* 2.21:1 picture (movie) */
/*****************************************************************************
* dec_thread_t : libmpeg2 decoder thread descriptor
*****************************************************************************/
typedef struct dec_thread_t
{
/*
* libmpeg2 properties
*/
mpeg2dec_t *p_mpeg2dec;
const mpeg2_info_t *p_info;
/*
* Input properties
*/
decoder_fifo_t *p_fifo; /* stores the PES stream data */
pes_packet_t *p_pes; /* current PES we are decoding */
mtime_t i_pts;
mtime_t i_previous_pts;
mtime_t i_current_pts;
mtime_t i_period_remainder;
/*
* Output properties
*/
vout_thread_t *p_vout;
} dec_thread_t;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int OpenDecoder ( vlc_object_t * );
static int RunDecoder ( decoder_fifo_t * );
static void CloseDecoder ( dec_thread_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("libmpeg2 decoder module") );
set_capability( "decoder", 40 );
set_callbacks( OpenDecoder, NULL );
add_shortcut( "libmpeg2" );
vlc_module_end();
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
*****************************************************************************/
static int OpenDecoder( vlc_object_t *p_this )
{
decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this;
if( p_fifo->i_fourcc != VLC_FOURCC('m','p','g','v') )
{
return VLC_EGENERIC;
}
p_fifo->pf_run = RunDecoder;
return VLC_SUCCESS;
}
/*****************************************************************************
* RunDecoder: the libmpeg2 decoder
*****************************************************************************/
static int RunDecoder( decoder_fifo_t *p_fifo )
{
dec_thread_t *p_dec;
data_packet_t *p_data = NULL;
mpeg2_state_t state;
picture_t *p_pic;
int i_aspect, i_chroma;
/* Allocate the memory needed to store the thread's structure */
if( (p_dec = (dec_thread_t *)malloc (sizeof(dec_thread_t)) )
== NULL)
{
msg_Err( p_fifo, "out of memory" );
goto error;
}
/* Initialize the thread properties */
memset( p_dec, 0, sizeof(dec_thread_t) );
p_dec->p_fifo = p_fifo;
p_dec->p_pes = NULL;
p_dec->p_vout = NULL;
p_dec->p_mpeg2dec = NULL;