[Mplayer-cvslog] CVS: main/libmpcodecs ad_acm.c,1.4,1.5 ad_dk3adpcm.c,1.5,1.6 ad_dvdpcm.c,1.3,1.4 ad_faad.c,1.6,1.7 ad_ffmpeg.c,1.6,1.7 ad_hwac3.c,1.5,1.6 ad_liba52.c,1.6,1.7 ad_libvorbis.c,1.6,1.7 ad_roqaudio.c,1.6,1.7 dec_audio.c,1.8,1.9 dec_audio.h,1.2,1.3 dec_video.c,1.147,1.148 dec_video.h,1.9,1.10 vd_divx4.c,1.12,1.13 vd_huffyuv.c,1.4,1.5 vd_libdv.c,1.2,1.3 vd_null.c,1.3,1.4 vd_odivx.c,1.11,1.12 vd_zlib.c,1.7,1.8

Arpi of Ize arpi at mplayerhq.hu
Sat Aug 31 15:09:26 CEST 2002


Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv10177/libmpcodecs

Modified Files:
	ad_acm.c ad_dk3adpcm.c ad_dvdpcm.c ad_faad.c ad_ffmpeg.c 
	ad_hwac3.c ad_liba52.c ad_libvorbis.c ad_roqaudio.c 
	dec_audio.c dec_audio.h dec_video.c dec_video.h vd_divx4.c 
	vd_huffyuv.c vd_libdv.c vd_null.c vd_odivx.c vd_zlib.c 
Log Message:
-afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/comments


Index: ad_acm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_acm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ad_acm.c	30 Aug 2002 21:44:20 -0000	1.4
+++ ad_acm.c	31 Aug 2002 13:09:23 -0000	1.5
@@ -12,7 +12,7 @@
 
 static ad_info_t info = 
 {
-	"Win32 ACM audio decoder",
+	"Win32/ACM decoders",
 	"acm",
 	"Nick Kurshev",
 	"avifile.sf.net",

Index: ad_dk3adpcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_dk3adpcm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ad_dk3adpcm.c	30 Aug 2002 21:44:20 -0000	1.5
+++ ad_dk3adpcm.c	31 Aug 2002 13:09:23 -0000	1.6
@@ -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)

Index: ad_dvdpcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_dvdpcm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ad_dvdpcm.c	30 Aug 2002 21:44:20 -0000	1.3
+++ ad_dvdpcm.c	31 Aug 2002 13:09:23 -0000	1.4
@@ -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",

Index: ad_faad.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_faad.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ad_faad.c	30 Aug 2002 21:44:20 -0000	1.6
+++ ad_faad.c	31 Aug 2002 13:09:23 -0000	1.7
@@ -19,7 +19,7 @@
 	"faad",
 	"Felix Buenemann",
 	"faad2",
-	"Under development!"
+	"uses libfaad2"
 };
 
 LIBAD_EXTERN(faad)

Index: ad_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_ffmpeg.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ad_ffmpeg.c	30 Aug 2002 21:44:20 -0000	1.6
+++ ad_ffmpeg.c	31 Aug 2002 13:09:23 -0000	1.7
@@ -14,7 +14,7 @@
 
 static ad_info_t info = 
 {
-	"FFmpeg audio decoders",
+	"FFmpeg/libavcodec audio decoders",
 	"ffmpeg",
 	"Nick Kurshev",
 	"ffmpeg.sf.net",

Index: ad_hwac3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_hwac3.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ad_hwac3.c	30 Aug 2002 21:44:20 -0000	1.5
+++ ad_hwac3.c	31 Aug 2002 13:09:23 -0000	1.6
@@ -18,7 +18,7 @@
 
 static ad_info_t info = 
 {
-	"AC3 through SPDIF",
+	"AC3 pass-through SP/DIF",
 	"hwac3",
 	"Nick Kurshev",
 	"???",

Index: ad_liba52.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_liba52.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ad_liba52.c	30 Aug 2002 21:44:20 -0000	1.6
+++ ad_liba52.c	31 Aug 2002 13:09:23 -0000	1.7
@@ -21,7 +21,7 @@
 
 static ad_info_t info = 
 {
-	"AC3-liba52",
+	"AC3 decoding with liba52",
 	"liba52",
 	"Nick Kurshev",
 	"Michel LESPINASSE",

Index: ad_libvorbis.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_libvorbis.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ad_libvorbis.c	30 Aug 2002 21:44:20 -0000	1.6
+++ ad_libvorbis.c	31 Aug 2002 13:09:23 -0000	1.7
@@ -14,7 +14,7 @@
 	"libvorbis",
 	"Felix Buenemann, A'rpi",
 	"libvorbis",
-	"buggy"
+	""
 };
 
 LIBAD_EXTERN(libvorbis)

Index: ad_roqaudio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_roqaudio.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ad_roqaudio.c	30 Aug 2002 21:44:20 -0000	1.6
+++ ad_roqaudio.c	31 Aug 2002 13:09:23 -0000	1.7
@@ -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)

Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dec_audio.c	30 Aug 2002 21:44:20 -0000	1.8
+++ dec_audio.c	31 Aug 2002 13:09:23 -0000	1.9
@@ -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;

Index: dec_audio.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dec_audio.h	25 May 2002 13:22:28 -0000	1.2
+++ dec_audio.h	31 Aug 2002 13:09:23 -0000	1.3
@@ -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);

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- dec_video.c	30 Aug 2002 21:44:20 -0000	1.147
+++ dec_video.c	31 Aug 2002 13:09:23 -0000	1.148
@@ -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;

Index: dec_video.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dec_video.h	30 Aug 2002 21:44:20 -0000	1.9
+++ dec_video.h	31 Aug 2002 13:09:23 -0000	1.10
@@ -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);

Index: vd_divx4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_divx4.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vd_divx4.c	30 Aug 2002 21:44:20 -0000	1.12
+++ vd_divx4.c	31 Aug 2002 13:09:23 -0000	1.13
@@ -21,7 +21,7 @@
 	"divx4",
 	"A'rpi",
 	"http://www.divx.com",
-	"native codecs"
+	"native binary codec"
 };
 
 LIBVD_EXTERN(divx4)

Index: vd_huffyuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_huffyuv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vd_huffyuv.c	30 Aug 2002 21:44:20 -0000	1.4
+++ vd_huffyuv.c	31 Aug 2002 13:09:23 -0000	1.5
@@ -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)

Index: vd_libdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_libdv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vd_libdv.c	30 Aug 2002 21:44:20 -0000	1.2
+++ vd_libdv.c	31 Aug 2002 13:09:23 -0000	1.3
@@ -26,7 +26,7 @@
 	"libdv",
 	"Alexander Neundorf <neundorf at kde.org>",
 	"http://libdv.sf.net",
-	""
+	"native codec"
 };
 
 LIBVD_EXTERN(libdv)

Index: vd_null.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_null.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vd_null.c	18 Mar 2002 00:55:58 -0000	1.3
+++ vd_null.c	31 Aug 2002 13:09:23 -0000	1.4
@@ -10,10 +10,9 @@
 {
 	"Null video decoder",
 	"null",
-	0,
 	"A'rpi",
 	"A'rpi",
-	""
+	"no decoding"
 };
 
 LIBVD_EXTERN(null)

Index: vd_odivx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_odivx.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vd_odivx.c	30 Aug 2002 21:44:20 -0000	1.11
+++ vd_odivx.c	31 Aug 2002 13:09:23 -0000	1.12
@@ -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)

Index: vd_zlib.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_zlib.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vd_zlib.c	30 Aug 2002 21:44:20 -0000	1.7
+++ vd_zlib.c	31 Aug 2002 13:09:23 -0000	1.8
@@ -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",




More information about the MPlayer-cvslog mailing list