[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[78] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[78] mplayerxp
|
From: <nic...@us...> - 2010-01-06 13:50:23
|
Revision: 78
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=78&view=rev
Author: nickols_k
Date: 2010-01-06 13:34:27 +0000 (Wed, 06 Jan 2010)
Log Message:
-----------
add: -afm (-vfm) help
Modified Paths:
--------------
mplayerxp/libmpcodecs/ad.c
mplayerxp/libmpcodecs/ad.h
mplayerxp/libmpcodecs/ad_a52.c
mplayerxp/libmpcodecs/ad_acm.c
mplayerxp/libmpcodecs/ad_dca.c
mplayerxp/libmpcodecs/ad_dmo.c
mplayerxp/libmpcodecs/ad_dshow.c
mplayerxp/libmpcodecs/ad_dvdpcm.c
mplayerxp/libmpcodecs/ad_faad.c
mplayerxp/libmpcodecs/ad_ffmp3.c
mplayerxp/libmpcodecs/ad_hwac3.c
mplayerxp/libmpcodecs/ad_mp3.c
mplayerxp/libmpcodecs/ad_null.c
mplayerxp/libmpcodecs/ad_pcm.c
mplayerxp/libmpcodecs/ad_qtaudio.c
mplayerxp/libmpcodecs/ad_real.c
mplayerxp/libmpcodecs/ad_twin.c
mplayerxp/libmpcodecs/ad_vorbis.c
mplayerxp/libmpcodecs/dec_audio.h
mplayerxp/libmpcodecs/dec_video.h
mplayerxp/libmpcodecs/vd.c
mplayerxp/libmpcodecs/vd.h
mplayerxp/libmpcodecs/vd_divx4.c
mplayerxp/libmpcodecs/vd_dmo.c
mplayerxp/libmpcodecs/vd_dshow.c
mplayerxp/libmpcodecs/vd_ffmpeg.c
mplayerxp/libmpcodecs/vd_huffyuv.c
mplayerxp/libmpcodecs/vd_libmpeg2.c
mplayerxp/libmpcodecs/vd_mpegpes.c
mplayerxp/libmpcodecs/vd_null.c
mplayerxp/libmpcodecs/vd_nuv.c
mplayerxp/libmpcodecs/vd_qtvideo.c
mplayerxp/libmpcodecs/vd_raw.c
mplayerxp/libmpcodecs/vd_real.c
mplayerxp/libmpcodecs/vd_theora.c
mplayerxp/libmpcodecs/vd_vfw.c
mplayerxp/libmpcodecs/vd_xanim.c
mplayerxp/libmpcodecs/vd_xvid.c
mplayerxp/mplayer.c
Modified: mplayerxp/libmpcodecs/ad.c
===================================================================
--- mplayerxp/libmpcodecs/ad.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -69,3 +69,12 @@
m_config_register_options(cfg,mpcodecs_ad_drivers[i]->options);
}
}
+
+void afm_help(void) {
+ unsigned i;
+ for(i=0;i<nddrivers;i++) {
+ if(mpcodecs_ad_drivers[i])
+ if(mpcodecs_ad_drivers[i]->options)
+ MSG_INFO(" %-10s %s\n",mpcodecs_ad_drivers[i]->info->driver_name,mpcodecs_ad_drivers[i]->info->descr);
+ }
+}
Modified: mplayerxp/libmpcodecs/ad.h
===================================================================
--- mplayerxp/libmpcodecs/ad.h 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad.h 2010-01-06 13:34:27 UTC (rev 78)
@@ -6,14 +6,14 @@
typedef struct ad_info_s
{
- /* codec long name ("Autodesk FLI/FLC Animation decoder" */
- const char *codec_name;
+ /* driver description ("Autodesk FLI/FLC Animation decoder" */
+ const char *descr;
/* driver name ("dshow") */
const char *driver_name;
/* interface author/maintainer */
- const char *maintainer;
- /* any additional comments */
- const char *comment;
+ const char *author;
+ /* URL of homepage */
+ const char *url;
} ad_info_t;
#define CONTROL_OK 1
Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_a52.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -29,10 +29,10 @@
static const ad_info_t info =
{
- "AC3-liba52",
+ "liba52 AC3 driver",
"liba52",
"Nickols_K",
- ""
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_acm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_acm.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -10,12 +10,12 @@
#include "../libmpdemux/aviprint.h"
#include "help_mp.h"
-static const ad_info_t info =
+static const ad_info_t info =
{
- "DivX audio (WMA)",
+ "Win32/ACM decoders",
"acm",
"Nickols_K",
- ""
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_dca.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_dca.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -38,7 +38,7 @@
"DTS Coherent Acoustics",
"libdca",
"Nickols_K",
- ""
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_dmo.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -15,7 +15,7 @@
"Win32/DMO decoders",
"dmo",
"A'rpi",
- "avifile.sf.net"
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_dshow.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -10,10 +10,10 @@
static const ad_info_t info =
{
- "Win32 direct show audio",
+ "Win32/DirectShow decoders",
"dshow",
"Nickols_K",
- ""
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -7,10 +7,10 @@
static const ad_info_t info =
{
- "Uncompressed DVD PCM audio decoder",
+ "Uncompressed DVD/VOB LPCM audio decoder",
"dvdpcm",
"Nickols_K",
- ""
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_faad.c
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_faad.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -26,7 +26,7 @@
"AAC (MPEG2/4 Advanced Audio Coding)",
"faad",
"Felix Buenemann",
- "faad2"
+ "http://www.audiocoding.com/faad2.html"
};
static const config_t options[] = {
@@ -82,7 +82,7 @@
/* configure maximum supported channels, *
* this is theoretically max. 64 chans */
#define FAAD_MAX_CHANNELS 6
-#define FAAD_BUFFLEN (FAAD_MIN_STREAMSIZE*FAAD_MAX_CHANNELS)
+#define FAAD_BUFFLEN (FAAD_MIN_STREAMSIZE*FAAD_MAX_CHANNELS)
#ifdef _WIN32
#pragma pack(push, 8)
#ifndef NEAACDECAPI
@@ -138,7 +138,7 @@
static void *dll_handle;
static int load_dll(const char *libname)
{
- if(!(dll_handle=ld_codec(libname,"http://www.audiocoding.com/faad2.html"))) return 0;
+ if(!(dll_handle=ld_codec(libname,mpcodecs_ad_faad.info->url))) return 0;
NeAACDecOpen_ptr = ld_sym(dll_handle,"NeAACDecOpen");
NeAACDecGetCurrentConfiguration_ptr = ld_sym(dll_handle,"NeAACDecGetCurrentConfiguration");
NeAACDecSetConfiguration_ptr = ld_sym(dll_handle,"NeAACDecSetConfiguration");
Modified: mplayerxp/libmpcodecs/ad_ffmp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmp3.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_ffmp3.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -24,10 +24,10 @@
static const ad_info_t info =
{
- "FFmpeg layer-123 audio decoder - integer only",
+ "FFmpeg/libavcodec audio decoders",
"ffmpeg",
"Nickols_K",
- ""
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_hwac3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_hwac3.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -143,10 +143,10 @@
static const ad_info_t info =
{
- "AC3 through SPDIF",
+ "AC3/DTS pass-through S/PDIF",
"hwac3",
"Nickols_K",
- ""
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -17,7 +17,7 @@
"MPEG layer-123",
"mp3lib",
"Nickols_K",
- "Optimized to MMX/SSE/3Dnow!"
+ "http://www.mpg123.de"
};
static const config_t options[] = {
@@ -216,7 +216,7 @@
static void *dll_handle;
static int load_dll(const char *libname)
{
- if(!(dll_handle=ld_codec(libname,"http://www.mpg123.de"))) return 0;
+ if(!(dll_handle=ld_codec(libname,mpcodecs_ad_mp3.info->url))) return 0;
mpg123_init_ptr = ld_sym(dll_handle,"mpg123_init");
mpg123_exit_ptr = ld_sym(dll_handle,"mpg123_exit");
mpg123_new_ptr = ld_sym(dll_handle,"mpg123_new");
Modified: mplayerxp/libmpcodecs/ad_null.c
===================================================================
--- mplayerxp/libmpcodecs/ad_null.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_null.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -8,7 +8,7 @@
"Null audio decoder",
"null",
"Nickols_K",
- ""
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_pcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_pcm.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -9,7 +9,7 @@
"Uncompressed PCM audio decoder",
"pcm",
"Nickols_K",
- ""
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_qtaudio.c
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_qtaudio.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -21,7 +21,7 @@
"QuickTime Audio Decoder",
"qtaudio",
"A'rpi & Sascha Sommer",
- "uses win32 quicktime DLLs"
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_real.c
===================================================================
--- mplayerxp/libmpcodecs/ad_real.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_real.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -15,7 +15,7 @@
"RealAudio decoder",
"realaud",
"A'rpi",
- "Florian Schneider"
+ "build-in"
};
static const config_t options[] = {
@@ -188,7 +188,7 @@
static int init(sh_audio_t *sh_audio){
// initialize the decoder, set tables etc...
-
+
// set sample format/rate parameters if you didn't do it in preinit() yet.
return 1; // return values: 1=OK 0=ERROR
Modified: mplayerxp/libmpcodecs/ad_twin.c
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_twin.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -17,7 +17,7 @@
"TWinVQ decoder",
"vqf",
"Nickols_K",
- ""
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/ad_vorbis.c
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/ad_vorbis.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -13,7 +13,7 @@
"Ogg/Vorbis audio decoder",
"libvorbis",
"Felix Buenemann, A'rpi",
- "buggy"
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/dec_audio.h
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.h 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/dec_audio.h 2010-01-06 13:34:27 UTC (rev 78)
@@ -20,3 +20,5 @@
int in_samplerate, int in_channels, int in_format, int in_bps,
int out_samplerate, int out_channels, int out_format, int out_bps,
int out_minsize, int out_maxsize);
+
+extern void afm_help(void);
Modified: mplayerxp/libmpcodecs/dec_video.h
===================================================================
--- mplayerxp/libmpcodecs/dec_video.h 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/dec_video.h 2010-01-06 13:34:27 UTC (rev 78)
@@ -14,3 +14,5 @@
extern void resync_video_stream(sh_video_t *sh_video);
extern int divx_quality;
+
+extern void vfm_help(void);
Modified: mplayerxp/libmpcodecs/vd.c
===================================================================
--- mplayerxp/libmpcodecs/vd.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -79,6 +79,15 @@
}
}
+void vfm_help(void) {
+ unsigned i;
+ for(i=0;i<nddrivers;i++) {
+ if(mpcodecs_vd_drivers[i])
+ if(mpcodecs_vd_drivers[i]->options)
+ MSG_INFO(" %-10s %s\n",mpcodecs_vd_drivers[i]->info->driver_name,mpcodecs_vd_drivers[i]->info->descr);
+ }
+}
+
#include "libvo/video_out.h"
extern const vd_functions_t* mpvdec; // FIXME!
Modified: mplayerxp/libmpcodecs/vd.h
===================================================================
--- mplayerxp/libmpcodecs/vd.h 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd.h 2010-01-06 13:34:27 UTC (rev 78)
@@ -1,15 +1,13 @@
typedef struct vd_info_s
{
- /* codec long name ("Autodesk FLI/FLC Animation decoder" */
- const char *codec_name;
+ /* driver description ("Autodesk FLI/FLC Animation decoder" */
+ const char *descr;
/* driver name ("dshow") */
const char *driver_name;
/* interface author/maintainer */
- const char *maintainer;
- /* codec author ("Aaron Holtzman <aho...@es...>") */
const char *author;
- /* any additional comments */
- const char *comment;
+ /* URL of homepage */
+ const char *url;
} vd_info_t;
/* interface of video decoder drivers */
Modified: mplayerxp/libmpcodecs/vd_divx4.c
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_divx4.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -25,8 +25,7 @@
"DivX4Linux lib (divx4/5 mode)",
"divx4",
"Nickols_K",
- "http://www.divx.com",
- "native codecs"
+ "http://labs.divx.com/DivXLinuxCodec"
};
static const config_t options[] = {
@@ -60,9 +59,9 @@
#define DEC_PAR_SMOOTH 9 ///< Use smooth playback when pParam is set to 1.
#define DEC_PAR_SHOWPP 10 ///< Show the postprocessing level in use on the top left corner of the output image.
-// Decoder return values.
+// Decoder return values.
-#define DEC_OK 0 ///< Decoder call succeded.
+#define DEC_OK 0 ///< Decoder call succeded.
#define DEC_INVALID_SYNTAX -1 ///< A semantic error occourred while parsing the stream.
#define DEC_FAIL 1 ///< General failure message. An unexpected problem occourred.
#define DEC_INVALID_ARGUMENT 3 ///< One of the arguments passed to the decoder is invalid.
@@ -180,7 +179,7 @@
static int load_lib( const char *libname )
{
- if(!(dll_handle=ld_codec(libname,"http://labs.divx.com/DivXLinuxCodec"))) return 0;
+ if(!(dll_handle=ld_codec(libname,mpcodecs_vd_divx4.info->url))) return 0;
getDecore_ptr = ld_sym(dll_handle,"getDecore");
return getDecore_ptr != NULL;
}
Modified: mplayerxp/libmpcodecs/vd_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_dmo.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -15,11 +15,10 @@
#include "vd_msg.h"
static const vd_info_t info = {
- "DMO video codecs",
+ "Win32/DMO video codecs",
"dmo",
"A'rpi",
- "based on http://avifile.sf.net",
- "win32 codecs"
+ "build-in
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/vd_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dshow.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_dshow.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -13,11 +13,10 @@
#include "codecs_ld.h"
static const vd_info_t info = {
- "DirectShow video codecs",
+ "Win32/DirectShow video codecs",
"dshow",
"A'rpi",
- "based on http://avifile.sf.net",
- "win32 codecs"
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/vd_ffmpeg.c
===================================================================
--- mplayerxp/libmpcodecs/vd_ffmpeg.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_ffmpeg.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -19,8 +19,7 @@
"FFmpeg's libavcodec codec family",
"ffmpeg",
"A'rpi",
- "http://ffmpeg.sf.net",
- "native codecs"
+ "build-in"
};
static int lavc_param_error_resilience=2;
Modified: mplayerxp/libmpcodecs/vd_huffyuv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_huffyuv.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_huffyuv.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -27,9 +27,8 @@
static const 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)",
+ "build-in"
};
static const config_t options[] = {
@@ -55,7 +54,7 @@
#define DECORR_FLAG 64
#define METHOD_LEFT_DECORR (METHOD_LEFT | DECORR_FLAG)
#define METHOD_GRAD_DECORR (METHOD_GRAD | DECORR_FLAG)
-#define METHOD_OLD -2
+#define METHOD_OLD -2
#define FOURCC_HFYU mmioFOURCC('H','F','Y','U')
@@ -151,13 +150,13 @@
* Internal function prototypes
*/
unsigned char* InitializeDecodeTable(unsigned char* hufftable,
- unsigned char* shift, DecodeTable* decode_table);
+ unsigned char* shift, DecodeTable* decode_table);
unsigned char* InitializeShiftAddTables(unsigned char* hufftable,
- unsigned char* shift, unsigned* add_shifted);
+ unsigned char* shift, unsigned* add_shifted);
unsigned char* DecompressHuffmanTable(unsigned char* hufftable,
- unsigned char* dst);
+ unsigned char* dst);
unsigned char huff_decompress(unsigned int* in, unsigned int *pos,
- DecodeTable *decode_table, unsigned char *decode_shift);
+ DecodeTable *decode_table, unsigned char *decode_shift);
@@ -710,7 +709,7 @@
unsigned char* InitializeDecodeTable(unsigned char* hufftable,
- unsigned char* shift, DecodeTable* decode_table)
+ unsigned char* shift, DecodeTable* decode_table)
{
unsigned int add_shifted[256];
char code_lengths[256];
@@ -773,7 +772,7 @@
unsigned char* InitializeShiftAddTables(unsigned char* hufftable,
- unsigned char* shift, unsigned* add_shifted)
+ unsigned char* shift, unsigned* add_shifted)
{
int i, j;
unsigned int bits; // must be 32bit unsigned
@@ -822,7 +821,7 @@
unsigned char* DecompressHuffmanTable(unsigned char* hufftable,
- unsigned char* dst)
+ unsigned char* dst)
{
int val;
int repeat;
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -20,11 +20,10 @@
static const vd_info_t info =
{
- "MPEG 1/2 Video decoder",
+ "libmpeg2 MPEG 1/2 Video decoder",
"libmpeg2",
"A'rpi",
- "Aaron & Walken",
- "native"
+ "http://libmpeg2.sourceforge.net"
};
static const config_t options[] = {
@@ -151,7 +150,7 @@
static void *dll_handle;
static int load_lib( const char *libname )
{
- if(!(dll_handle=ld_codec(libname,"http://libmpeg2.sourceforge.net"))) return 0;
+ if(!(dll_handle=ld_codec(libname,mpcodecs_vd_libmpeg2.info->url))) return 0;
mpeg2_init_ptr = ld_sym(dll_handle,"mpeg2_init");
mpeg2_close_ptr = ld_sym(dll_handle,"mpeg2_close");
mpeg2_info_ptr = ld_sym(dll_handle,"mpeg2_info");
Modified: mplayerxp/libmpcodecs/vd_mpegpes.c
===================================================================
--- mplayerxp/libmpcodecs/vd_mpegpes.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_mpegpes.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -10,8 +10,7 @@
"MPEG 1/2 Video passthrough",
"mpegpes",
"A'rpi",
- "A'rpi",
- "for hw decoders"
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/vd_null.c
===================================================================
--- mplayerxp/libmpcodecs/vd_null.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_null.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -10,8 +10,7 @@
"Null video decoder",
"null",
"A'rpi",
- "A'rpi",
- ""
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/vd_nuv.c
===================================================================
--- mplayerxp/libmpcodecs/vd_nuv.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_nuv.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -8,9 +8,8 @@
static const vd_info_t info = {
"NuppelVideo decoder",
"nuv",
- "A'rpi",
- "Alex & Panagiotis Issaris <ta...@lu...>",
- "native codecs"
+ "A'rpi (Alex & Panagiotis Issaris <ta...@lu...>)",
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/vd_qtvideo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_qtvideo.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -18,9 +18,8 @@
static const vd_info_t info = {
"Quicktime Video decoder",
"qtvideo",
- "A'rpi",
- "Faust3",
- "win32"
+ "A'rpi & Faust3",
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/vd_raw.c
===================================================================
--- mplayerxp/libmpcodecs/vd_raw.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_raw.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -8,9 +8,8 @@
static const vd_info_t info = {
"RAW Uncompressed Video",
"raw",
- "A'rpi",
"A'rpi & Alex",
- "uncompressed"
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/vd_real.c
===================================================================
--- mplayerxp/libmpcodecs/vd_real.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_real.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -11,11 +11,10 @@
#include "vd_msg.h"
static const vd_info_t info = {
- "RealPlayer 8 video codecs",
+ "RealPlayer video codecs",
"realvid",
- "Florian Schneider",
- "using original closed source codecs for Linux",
- "binary real video codecs"
+ "Florian Schneider (using original closed source codecs for Linux)",
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/vd_theora.c
===================================================================
--- mplayerxp/libmpcodecs/vd_theora.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_theora.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -14,11 +14,10 @@
#include "vd_msg.h"
static const vd_info_t info = {
- "Theora/VP3",
+ "Theora/VP3 video decoder",
"theora",
- "David Kuehling",
- "www.theora.org",
- "Theora project's VP3 codec"
+ "David Kuehling (www.theora.org)",
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/vd_vfw.c
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_vfw.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -19,16 +19,14 @@
"Win32/VfW video codecs",
"vfw",
"A'rpi",
- "based on http://avifile.sf.net",
- "win32 codecs"
+ "build-in"
};
static const vd_info_t info_vfwex = {
"Win32/VfWex video codecs",
"vfwex",
"A'rpi",
- "based on http://avifile.sf.net",
- "win32 codecs"
+ "build-in"
};
static const config_t options[] = {
Modified: mplayerxp/libmpcodecs/vd_xanim.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_xanim.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -31,9 +31,8 @@
static const vd_info_t info = {
"XAnim codecs",
"xanim",
- "A'rpi & Alex",
- "Xanim (http://xanim.va.pubnix.com/)",
- "binary codec plugins"
+ "A'rpi & Alex <Xanim (http://xanim.va.pubnix.com/)>",
+ "build-in"
};
static const config_t options[] = {
@@ -275,7 +274,7 @@
dlclose(codec_driver->file_handler);
return(0);
}
-
+
MSG_INFO( "=== XAnim Codec ===\n");
MSG_INFO( " Filename: %s (API revision: %x)\n", filename, mod_hdr->api_rev);
MSG_INFO( " Codec: %s. Rev: %s\n", mod_hdr->desc, mod_hdr->rev);
@@ -301,7 +300,7 @@
dlclose(codec_driver->file_handler);
return(0);
}
-
+
MSG_DBG2( "Exported functions by codec: [functable: 0x%08x entries: %d]\n",
mod_hdr->funcs, mod_hdr->num_funcs);
for (i = 0; i < mod_hdr->num_funcs; i++)
@@ -370,7 +369,7 @@
char dll[1024];
XA_CODEC_HDR codec_hdr;
int i;
-
+
xacodec_driver = realloc(xacodec_driver, sizeof(struct xacodec_driver));
if (xacodec_driver == NULL)
{
@@ -581,7 +580,7 @@
MSG_DBG2( "body\n");
return NULL;
}
-
+
return NULL;
}
@@ -794,7 +793,7 @@
// scale U,V planes by 2:
imagex>>=2;
imagey>>=2;
-
+
uvstride=(yuv->uv_w)?yuv->uv_w:imagex;
for(y=0;y<imagey;y++){
@@ -925,7 +924,7 @@
static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
mp_image_t* mpi;
xacodec_image_t* image;
-
+
if(len<=0) return NULL; // skipped frame
image=xacodec_decode_frame(data,len,(flags&3)?1:0);
@@ -941,7 +940,7 @@
mpi->stride[0]=image->stride[0];
mpi->stride[1]=image->stride[1];
mpi->stride[2]=image->stride[2];
-
+
return mpi;
}
Modified: mplayerxp/libmpcodecs/vd_xvid.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xvid.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/libmpcodecs/vd_xvid.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -19,9 +19,8 @@
static const vd_info_t info = {
"XviD MPEG4 codec ",
"xvid",
- "Nickols_K",
- "http://www.xvid.org <(C) Christoph Lampert (gr...@we...)>",
- "native codecs"
+ "Nickols_K <(C) Christoph Lampert (gr...@we...)>",
+ "http://www.xvid.org",
};
typedef struct {
@@ -192,7 +191,7 @@
static int load_lib( const char *libname )
{
- if(!(dll_handle=ld_codec(libname,"http://www.xvid.org"))) return 0;
+ if(!(dll_handle=ld_codec(libname,mpcodecs_vd_xvid.info->url))) return 0;
xvid_decore_ptr = ld_sym(dll_handle,"xvid_decore");
xvid_global_ptr = ld_sym(dll_handle,"xvid_global");
return xvid_decore_ptr != NULL && xvid_global_ptr!=NULL;
Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c 2010-01-06 11:16:09 UTC (rev 77)
+++ mplayerxp/mplayer.c 2010-01-06 13:34:27 UTC (rev 78)
@@ -977,6 +977,20 @@
MSG_INFO("\n");
exit(0);
}
+
+ if(video_family && strcmp(video_family,"help")==0){
+ MSG_INFO("Available video codec families/drivers:\n");
+ vfm_help();
+ MSG_INFO("\n");
+ exit(0);
+ }
+
+ if(audio_family && strcmp(audio_family,"help")==0){
+ MSG_INFO("Available audio codec families/drivers:\n");
+ afm_help();
+ MSG_INFO("\n");
+ exit(0);
+ }
}
int decore_audio( int xp_id )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
