# HG changeset patch
# User arpi
# Date 1030799363 0
# Node ID 1eadce15446c9c529086d3e0029dcc4a9365742e
# Parent  5137e9fb57e761c231b4c4c495759aea7b4e8610
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments

diff -r 5137e9fb57e7 -r 1eadce15446c help_mp-en.h
--- a/help_mp-en.h	Sat Aug 31 13:05:33 2002 +0000
+++ b/help_mp-en.h	Sat Aug 31 13:09:23 2002 +0000
@@ -127,6 +127,8 @@
 #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 -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/ad_acm.c
--- a/libmpcodecs/ad_acm.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/ad_acm.c	Sat Aug 31 13:09:23 2002 +0000
@@ -12,7 +12,7 @@
 
 static ad_info_t info = 
 {
-	"Win32 ACM audio decoder",
+	"Win32/ACM decoders",
 	"acm",
 	"Nick Kurshev",
 	"avifile.sf.net",
diff -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/ad_dk3adpcm.c
--- a/libmpcodecs/ad_dk3adpcm.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/ad_dk3adpcm.c	Sat Aug 31 13:09:23 2002 +0000
@@ -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 -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/ad_dvdpcm.c
--- a/libmpcodecs/ad_dvdpcm.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/ad_dvdpcm.c	Sat Aug 31 13:09:23 2002 +0000
@@ -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 -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/ad_faad.c
--- a/libmpcodecs/ad_faad.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/ad_faad.c	Sat Aug 31 13:09:23 2002 +0000
@@ -19,7 +19,7 @@
 	"faad",
 	"Felix Buenemann",
 	"faad2",
-	"Under development!"
+	"uses libfaad2"
 };
 
 LIBAD_EXTERN(faad)
diff -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/ad_ffmpeg.c
--- a/libmpcodecs/ad_ffmpeg.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/ad_ffmpeg.c	Sat Aug 31 13:09:23 2002 +0000
@@ -14,7 +14,7 @@
 
 static ad_info_t info = 
 {
-	"FFmpeg audio decoders",
+	"FFmpeg/libavcodec audio decoders",
 	"ffmpeg",
 	"Nick Kurshev",
 	"ffmpeg.sf.net",
diff -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/ad_hwac3.c
--- a/libmpcodecs/ad_hwac3.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/ad_hwac3.c	Sat Aug 31 13:09:23 2002 +0000
@@ -18,7 +18,7 @@
 
 static ad_info_t info = 
 {
-	"AC3 through SPDIF",
+	"AC3 pass-through SP/DIF",
 	"hwac3",
 	"Nick Kurshev",
 	"???",
diff -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/ad_liba52.c
--- a/libmpcodecs/ad_liba52.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/ad_liba52.c	Sat Aug 31 13:09:23 2002 +0000
@@ -21,7 +21,7 @@
 
 static ad_info_t info = 
 {
-	"AC3-liba52",
+	"AC3 decoding with liba52",
 	"liba52",
 	"Nick Kurshev",
 	"Michel LESPINASSE",
diff -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/ad_libvorbis.c
--- a/libmpcodecs/ad_libvorbis.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/ad_libvorbis.c	Sat Aug 31 13:09:23 2002 +0000
@@ -14,7 +14,7 @@
 	"libvorbis",
 	"Felix Buenemann, A'rpi",
 	"libvorbis",
-	"buggy"
+	""
 };
 
 LIBAD_EXTERN(libvorbis)
diff -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/ad_roqaudio.c
--- a/libmpcodecs/ad_roqaudio.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/ad_roqaudio.c	Sat Aug 31 13:09:23 2002 +0000
@@ -11,8 +11,8 @@
 	"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 -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/dec_audio.c
--- a/libmpcodecs/dec_audio.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/dec_audio.c	Sat Aug 31 13:09:23 2002 +0000
@@ -26,6 +26,22 @@
 
 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 -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/dec_audio.h
--- a/libmpcodecs/dec_audio.h	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/dec_audio.h	Sat Aug 31 13:09:23 2002 +0000
@@ -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 -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/dec_video.c
--- a/libmpcodecs/dec_video.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/dec_video.c	Sat Aug 31 13:09:23 2002 +0000
@@ -140,6 +140,17 @@
     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 -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/dec_video.h
--- a/libmpcodecs/dec_video.h	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/dec_video.h	Sat Aug 31 13:09:23 2002 +0000
@@ -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 -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/vd_divx4.c
--- a/libmpcodecs/vd_divx4.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/vd_divx4.c	Sat Aug 31 13:09:23 2002 +0000
@@ -21,7 +21,7 @@
 	"divx4",
 	"A'rpi",
 	"http://www.divx.com",
-	"native codecs"
+	"native binary codec"
 };
 
 LIBVD_EXTERN(divx4)
diff -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/vd_huffyuv.c
--- a/libmpcodecs/vd_huffyuv.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/vd_huffyuv.c	Sat Aug 31 13:09:23 2002 +0000
@@ -29,8 +29,8 @@
 	"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 -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/vd_libdv.c
--- a/libmpcodecs/vd_libdv.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/vd_libdv.c	Sat Aug 31 13:09:23 2002 +0000
@@ -26,7 +26,7 @@
 	"libdv",
 	"Alexander Neundorf <neundorf@kde.org>",
 	"http://libdv.sf.net",
-	""
+	"native codec"
 };
 
 LIBVD_EXTERN(libdv)
diff -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/vd_null.c
--- a/libmpcodecs/vd_null.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/vd_null.c	Sat Aug 31 13:09:23 2002 +0000
@@ -10,10 +10,9 @@
 {
 	"Null video decoder",
 	"null",
-	0,
 	"A'rpi",
 	"A'rpi",
-	""
+	"no decoding"
 };
 
 LIBVD_EXTERN(null)
diff -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/vd_odivx.c
--- a/libmpcodecs/vd_odivx.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/vd_odivx.c	Sat Aug 31 13:09:23 2002 +0000
@@ -27,7 +27,11 @@
 #else
 	"http://www.projectmayo.org",
 #endif
-	"native codecs"
+#ifdef NEW_DECORE
+	"native binary codec"
+#else
+	"native codec"
+#endif
 };
 
 LIBVD_EXTERN(odivx)
diff -r 5137e9fb57e7 -r 1eadce15446c libmpcodecs/vd_zlib.c
--- a/libmpcodecs/vd_zlib.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/libmpcodecs/vd_zlib.c	Sat Aug 31 13:09:23 2002 +0000
@@ -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",
diff -r 5137e9fb57e7 -r 1eadce15446c mplayer.c
--- a/mplayer.c	Sat Aug 31 13:05:33 2002 +0000
+++ b/mplayer.c	Sat Aug 31 13:09:23 2002 +0000
@@ -639,6 +639,16 @@
       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){