diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-31 13:09:23 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-31 13:09:23 +0000 |
commit | 09d8c4ddf00a4cbc41a2102f661919f775be65ff (patch) | |
tree | 0ec6dd0a0cddfba3fe0631e9866c0895c7550482 | |
parent | e68ab1115cac4df6eca47d9894bf48508350c4df (diff) | |
download | mpv-09d8c4ddf00a4cbc41a2102f661919f775be65ff.tar.bz2 mpv-09d8c4ddf00a4cbc41a2102f661919f775be65ff.tar.xz |
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7192 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | help_mp-en.h | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_acm.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_dk3adpcm.c | 7 | ||||
-rw-r--r-- | libmpcodecs/ad_dvdpcm.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_faad.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_hwac3.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_liba52.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_libvorbis.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_roqaudio.c | 4 | ||||
-rw-r--r-- | libmpcodecs/dec_audio.c | 16 | ||||
-rw-r--r-- | libmpcodecs/dec_audio.h | 1 | ||||
-rw-r--r-- | libmpcodecs/dec_video.c | 11 | ||||
-rw-r--r-- | libmpcodecs/dec_video.h | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_divx4.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_huffyuv.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vd_libdv.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_null.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vd_odivx.c | 6 | ||||
-rw-r--r-- | libmpcodecs/vd_zlib.c | 2 | ||||
-rw-r--r-- | mplayer.c | 10 |
21 files changed, 67 insertions, 19 deletions
diff --git a/help_mp-en.h b/help_mp-en.h index a37ab861e2..7ec97a8433 100644 --- a/help_mp-en.h +++ b/help_mp-en.h @@ -127,6 +127,8 @@ static char help_text[]= #define MSGTR_AvailableAudioOutputDrivers "Available audio output drivers:\n" #define MSGTR_AvailableAudioCodecs "Available audio codecs:\n" #define MSGTR_AvailableVideoCodecs "Available video codecs:\n" +#define MSGTR_AvailableAudioFm "\nAvailable (compiled-in) audio codec families/drivers:\n" +#define MSGTR_AvailableVideoFm "\nAvailable (compiled-in) video codec families/drivers:\n" #define MSGTR_UsingRTCTiming "Using Linux's hardware RTC timing (%ldHz)\n" #define MSGTR_CannotReadVideoPropertiers "Video: can't read properties\n" #define MSGTR_NoStreamFound "No stream found\n" diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c index ca3890643d..398cdd8669 100644 --- a/libmpcodecs/ad_acm.c +++ b/libmpcodecs/ad_acm.c @@ -12,7 +12,7 @@ static ad_info_t info = { - "Win32 ACM audio decoder", + "Win32/ACM decoders", "acm", "Nick Kurshev", "avifile.sf.net", diff --git a/libmpcodecs/ad_dk3adpcm.c b/libmpcodecs/ad_dk3adpcm.c index a6b2c94639..83f3781dcf 100644 --- a/libmpcodecs/ad_dk3adpcm.c +++ b/libmpcodecs/ad_dk3adpcm.c @@ -2,6 +2,9 @@ DK3 ADPCM Decoder for MPlayer by Mike Melanson + "This format number was used by Duck Corp. but not officially + registered with Microsoft" + This file is responsible for decoding audio data encoded with Duck Corp's DK3 ADPCM algorithm. Details about the data format can be found here: @@ -18,11 +21,11 @@ static ad_info_t info = { - "Duck DK3 ADPCM decoder", + "Duck Corp. DK3 ADPCM decoder", "dk3adpcm", "Nick Kurshev", "Mike Melanson", - "This format number was used by Duck Corp. but not officially registered with Microsoft" + "" }; LIBAD_EXTERN(dk3adpcm) diff --git a/libmpcodecs/ad_dvdpcm.c b/libmpcodecs/ad_dvdpcm.c index 60704c9185..ffa98e8e0e 100644 --- a/libmpcodecs/ad_dvdpcm.c +++ b/libmpcodecs/ad_dvdpcm.c @@ -7,7 +7,7 @@ static ad_info_t info = { - "Uncompressed DVD PCM audio decoder", + "Uncompressed DVD/VOB LPCM audio decoder", "dvdpcm", "Nick Kurshev", "A'rpi", diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index c76257145f..65df5eb137 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -19,7 +19,7 @@ static ad_info_t info = "faad", "Felix Buenemann", "faad2", - "Under development!" + "uses libfaad2" }; LIBAD_EXTERN(faad) diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 7aac9e8418..485bbf1323 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -14,7 +14,7 @@ static ad_info_t info = { - "FFmpeg audio decoders", + "FFmpeg/libavcodec audio decoders", "ffmpeg", "Nick Kurshev", "ffmpeg.sf.net", diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index e645233f3c..78bd66dacd 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -18,7 +18,7 @@ extern int a52_fillbuff(sh_audio_t *sh_audio); static ad_info_t info = { - "AC3 through SPDIF", + "AC3 pass-through SP/DIF", "hwac3", "Nick Kurshev", "???", diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index f6d6df264d..a309fa5e89 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -21,7 +21,7 @@ static uint32_t a52_flags=0; static ad_info_t info = { - "AC3-liba52", + "AC3 decoding with liba52", "liba52", "Nick Kurshev", "Michel LESPINASSE", diff --git a/libmpcodecs/ad_libvorbis.c b/libmpcodecs/ad_libvorbis.c index 630362c829..9a00e24dc6 100644 --- a/libmpcodecs/ad_libvorbis.c +++ b/libmpcodecs/ad_libvorbis.c @@ -14,7 +14,7 @@ static ad_info_t info = "libvorbis", "Felix Buenemann, A'rpi", "libvorbis", - "buggy" + "" }; LIBAD_EXTERN(libvorbis) diff --git a/libmpcodecs/ad_roqaudio.c b/libmpcodecs/ad_roqaudio.c index 3d6454c916..a21c35856d 100644 --- a/libmpcodecs/ad_roqaudio.c +++ b/libmpcodecs/ad_roqaudio.c @@ -11,8 +11,8 @@ static ad_info_t info = "Id RoQ File Audio Decoder", "roqaudio", "Nick Kurshev", - "Mike Melanson" - "RoQA is an internal MPlayer FOURCC" + "Mike Melanson", + "" //"RoQA is an internal MPlayer FOURCC" }; LIBAD_EXTERN(roqaudio) diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index af48c9136c..9878f82907 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -26,6 +26,22 @@ int audio_output_channels = 2; static ad_functions_t* mpadec; +void afm_help(){ + int i; + mp_msg(MSGT_DECAUDIO,MSGL_INFO,MSGTR_AvailableAudioFm); + mp_msg(MSGT_DECAUDIO,MSGL_INFO," afm: info: (comment)\n"); + for (i=0; mpcodecs_ad_drivers[i] != NULL; i++) + if(mpcodecs_ad_drivers[i]->info->comment && mpcodecs_ad_drivers[i]->info->comment[0]) + mp_msg(MSGT_DECAUDIO,MSGL_INFO,"%9s %s (%s)\n", + mpcodecs_ad_drivers[i]->info->short_name, + mpcodecs_ad_drivers[i]->info->name, + mpcodecs_ad_drivers[i]->info->comment); + else + mp_msg(MSGT_DECAUDIO,MSGL_INFO,"%9s %s\n", + mpcodecs_ad_drivers[i]->info->short_name, + mpcodecs_ad_drivers[i]->info->name); +} + int init_audio(sh_audio_t *sh_audio) { unsigned i; diff --git a/libmpcodecs/dec_audio.h b/libmpcodecs/dec_audio.h index 4e9d4ac8ee..f5a2453ca6 100644 --- a/libmpcodecs/dec_audio.h +++ b/libmpcodecs/dec_audio.h @@ -1,5 +1,6 @@ // dec_audio.c: +extern void afm_help(); extern int init_audio(sh_audio_t *sh_audio); extern int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen); extern void resync_audio_stream(sh_audio_t *sh_audio); diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index efcd660f3e..e087644dd4 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -140,6 +140,17 @@ void uninit_video(sh_video_t *sh_video){ sh_video->inited=0; } +void vfm_help(){ + int i; + mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_AvailableVideoFm); + mp_msg(MSGT_DECVIDEO,MSGL_INFO," vfm: info: (comment)\n"); + for (i=0; mpcodecs_vd_drivers[i] != NULL; i++) + mp_msg(MSGT_DECVIDEO,MSGL_INFO,"%8s %s (%s)\n", + mpcodecs_vd_drivers[i]->info->short_name, + mpcodecs_vd_drivers[i]->info->name, + mpcodecs_vd_drivers[i]->info->comment); +} + int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status){ unsigned int orig_fourcc=sh_video->bih?sh_video->bih->biCompression:0; sh_video->codec=NULL; diff --git a/libmpcodecs/dec_video.h b/libmpcodecs/dec_video.h index be29e8e760..53c728dd1d 100644 --- a/libmpcodecs/dec_video.h +++ b/libmpcodecs/dec_video.h @@ -2,6 +2,8 @@ // dec_video.c: extern int video_read_properties(sh_video_t *sh_video); +extern void vfm_help(); + //extern int init_video(sh_video_t *sh_video, int *pitches); extern int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status); extern void uninit_video(sh_video_t *sh_video); diff --git a/libmpcodecs/vd_divx4.c b/libmpcodecs/vd_divx4.c index f6c264b0ca..f253a99dd0 100644 --- a/libmpcodecs/vd_divx4.c +++ b/libmpcodecs/vd_divx4.c @@ -21,7 +21,7 @@ static vd_info_t info = { "divx4", "A'rpi", "http://www.divx.com", - "native codecs" + "native binary codec" }; LIBVD_EXTERN(divx4) diff --git a/libmpcodecs/vd_huffyuv.c b/libmpcodecs/vd_huffyuv.c index ef845a4874..fec66808df 100644 --- a/libmpcodecs/vd_huffyuv.c +++ b/libmpcodecs/vd_huffyuv.c @@ -29,8 +29,8 @@ static vd_info_t info = { "HuffYUV Video decoder", "huffyuv", "Roberto Togni", - "Roberto Togni", - "native codec, original win32 by Ben Rudiak-Gould http://www.math.berkeley.edu/~benrg/huffyuv.html" + "Roberto Togni, original win32 by Ben Rudiak-Gould http://www.math.berkeley.edu/~benrg/huffyuv.html", + "native codec" }; LIBVD_EXTERN(huffyuv) diff --git a/libmpcodecs/vd_libdv.c b/libmpcodecs/vd_libdv.c index 795aac69e6..5d5713bb0b 100644 --- a/libmpcodecs/vd_libdv.c +++ b/libmpcodecs/vd_libdv.c @@ -26,7 +26,7 @@ static vd_info_t info = "libdv", "Alexander Neundorf <neundorf@kde.org>", "http://libdv.sf.net", - "" + "native codec" }; LIBVD_EXTERN(libdv) diff --git a/libmpcodecs/vd_null.c b/libmpcodecs/vd_null.c index 00f4903afd..0d6bb8f441 100644 --- a/libmpcodecs/vd_null.c +++ b/libmpcodecs/vd_null.c @@ -10,10 +10,9 @@ static vd_info_t info = { "Null video decoder", "null", - 0, "A'rpi", "A'rpi", - "" + "no decoding" }; LIBVD_EXTERN(null) diff --git a/libmpcodecs/vd_odivx.c b/libmpcodecs/vd_odivx.c index c7e703cd21..2c3dd92438 100644 --- a/libmpcodecs/vd_odivx.c +++ b/libmpcodecs/vd_odivx.c @@ -27,7 +27,11 @@ static vd_info_t info = { #else "http://www.projectmayo.org", #endif - "native codecs" +#ifdef NEW_DECORE + "native binary codec" +#else + "native codec" +#endif }; LIBVD_EXTERN(odivx) diff --git a/libmpcodecs/vd_zlib.c b/libmpcodecs/vd_zlib.c index 644b55515b..f6935a06e1 100644 --- a/libmpcodecs/vd_zlib.c +++ b/libmpcodecs/vd_zlib.c @@ -11,7 +11,7 @@ #include "vd_internal.h" static vd_info_t info = { - "zlib decoder (avizlib)", + "AVIzlib decoder", "zlib", "Alex", "based on vd_ijpg.c", @@ -639,6 +639,16 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ printf("\n"); exit(0); } + if(video_fm && strcmp(video_fm,"help")==0){ + vfm_help(); + printf("\n"); + exit(0); + } + if(audio_fm && strcmp(audio_fm,"help")==0){ + afm_help(); + printf("\n"); + exit(0); + } if(!filename && !vcd_track && !dvd_title && !dvd_nav && !tv_param_on){ |