From 91748b4278a02f4c9b0e42ebfe917e43fcb39155 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 22 Dec 2008 09:20:18 +0000 Subject: libavcodec/i386/ was renamed to libavcodec/x86/. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28177 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c6c376326f..0ff4058fd2 100644 --- a/Makefile +++ b/Makefile @@ -725,11 +725,11 @@ DIRS = . \ libavcodec/alpha \ libavcodec/arm \ libavcodec/bfin \ - libavcodec/i386 \ libavcodec/mlib \ libavcodec/ppc \ libavcodec/sh4 \ libavcodec/sparc \ + libavcodec/x86 \ libavformat \ libavutil \ libdvdcss \ -- cgit v1.2.3 From 08de71edb1234a58084f0431e2d1887a9f500d8c Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 22 Dec 2008 09:20:38 +0000 Subject: Sync with latest FFmpeg changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28178 b3059339-0415-0410-9bf9-f77b7e298cf2 --- common.mak | 4 ++-- subdir.mak | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.mak b/common.mak index d4c1f14862..8ac6ee07ad 100644 --- a/common.mak +++ b/common.mak @@ -91,10 +91,10 @@ $(SUBDIR)%-test.o: $(SUBDIR)%.c $(SUBDIR)%-test.o: $(SUBDIR)%-test.c $(CC) $(CFLAGS) -DTEST -c -o $$@ $$^ -$(SUBDIR)i386/%.o: $(SUBDIR)i386/%.asm +$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm $(YASM) $(YASMFLAGS) -I $$( $$@ clean:: diff --git a/subdir.mak b/subdir.mak index 7c38b77619..df5bb8a09a 100644 --- a/subdir.mak +++ b/subdir.mak @@ -29,7 +29,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIB_CREATE_DEF_CMD) - $(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$^ $(FFEXTRALIBS) $(EXTRAOBJS) + $(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter-out $(DEP_LIBS),$$^) $(FFEXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) ifdef SUBDIR -- cgit v1.2.3 From a4b7f5a01b8379cdf7f6538406866d49546902b6 Mon Sep 17 00:00:00 2001 From: compn Date: Mon, 22 Dec 2008 16:51:06 +0000 Subject: re-add codecs: sif1 (directshow version) and acdsee mjpeg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28179 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/etc/codecs.conf b/etc/codecs.conf index bd375117dc..a8a6e211fb 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1173,6 +1173,14 @@ videocodec LEAD dll "LCodcCMP.dll" out BGR24,BGR15 +videocodec acdsee + info "ACDSee mjpeg" + status working + fourcc ACDV + driver vfw + dll "ACDV.dll" + out BGR32,BGR24,BGR15 flip + videocodec imagepower info "ImagePower MJPEG2000" status buggy @@ -1944,6 +1952,16 @@ videocodec sif1vfw dll "Sif1_vfw.dll" out YV12,YUY2 +videocodec sif1ds + info "sif1 alpha4" + status buggy + comment "one frame every 5 seconds?" + fourcc SIF1 + driver dshow + dll "Sif1Dec.ax" + guid 0x31666973, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71 + out BGR32 + videocodec ffamv info "Modified MJPEG, used in AMV files" status working @@ -3875,4 +3893,4 @@ audiocodec uleaddva format 0x215 format 0x216 driver acm - dll "dvacm.acm" \ No newline at end of file + dll "dvacm.acm" -- cgit v1.2.3 From b39c0022edb5ebacc8138486f4a8c2beb8bcfdcb Mon Sep 17 00:00:00 2001 From: cehoyos Date: Mon, 22 Dec 2008 22:56:51 +0000 Subject: Allow compilation of 32bit mplayer on 64 bit systems with --cc='cc -m32'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28180 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 51f49fe0fb..97a784ff76 100755 --- a/configure +++ b/configure @@ -1339,8 +1339,8 @@ if test -z "$_target" ; then i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;; ia64) host_arch=ia64 ;; x86_64|amd64) - if [ -n "`$_cc -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p'`" -a \ - -z "`echo $CFLAGS | grep -- -m32`" ]; then + if [ -n "$($_cc -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p')" -a \ + -z "$(echo $CFLAGS $_cc | grep -- -m32)" ]; then host_arch=x86_64 else host_arch=i386 -- cgit v1.2.3 From cf828c1dd5596c154da6e414b901b8aff872487c Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 23 Dec 2008 04:24:07 +0000 Subject: fix poorly worded changelog entries git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28181 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index e7c56af62a..2d08deabe5 100644 --- a/Changelog +++ b/Changelog @@ -66,8 +66,8 @@ MPlayer (1.0) * VIDIX driver for SuperH Mobile VEU hardware block. * support -border on vo_gl/gl2 in x11 * Direct3D Windows video output driver added. - * initial code duplication cleanup between vo_wii and vo_fbdev2 - * initial code duplication cleanup between vo_x11,vo_xv,vo_xvmc + * factorize code in vo_wii + * removed unnecessary code from vo x11,xv,xvmc MEncoder: * check for system-wide configuration file in MEncoder -- cgit v1.2.3 From 693c9737eee4948aaf536c14ccc01e3356b46f15 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 23 Dec 2008 11:42:11 +0000 Subject: Define HAVE_FAST_64BIT if appropriate git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28182 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure b/configure index 97a784ff76..d5a44b3afe 100755 --- a/configure +++ b/configure @@ -1919,6 +1919,7 @@ EOF ia64) _arch='IA64' _target_arch='ARCH_IA64 = yes' + def_fast_64bit='#define HAVE_FAST_64BIT 1' iproc='ia64' ;; @@ -1927,6 +1928,7 @@ EOF _target_arch='ARCH_X86_64 = yes' _target_arch_x86="ARCH_X86 = yes" _def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' + def_fast_64bit='#define HAVE_FAST_64BIT 1' iproc='x86_64' # gcc >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead @@ -2011,6 +2013,7 @@ EOF if test "$host_arch" = "sparc64" ; then _vis='yes' proc='ultrasparc' + def_fast_64bit='#define HAVE_FAST_64BIT 1' elif sunos ; then echocheck "CPU type" karch=`uname -m` @@ -2050,6 +2053,9 @@ EOF _def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' iproc='ppc' + if test "$host_arch" = "ppc64" -o "$host_arch" = "powerpc64" ; then + def_fast_64bit='#define HAVE_FAST_64BIT 1' + fi echocheck "CPU type" case $system_name in Linux) @@ -8532,6 +8538,7 @@ $_def_libswscale_so $_def_dcbzl $_def_extern_prefix +$def_fast_64bit $_def_fast_unaligned $_def_mkstemp $_def_pthreads -- cgit v1.2.3 From fc9625633bd5e165517ff68e02e2f11196d8ad0f Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 23 Dec 2008 11:42:24 +0000 Subject: Set fast_cmov for all x86_64 systems, except for P4-based systems this should be better, in particular cmov is recommended for future systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28183 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index d5a44b3afe..c3d37a5bc9 100755 --- a/configure +++ b/configure @@ -1937,6 +1937,7 @@ EOF else cpuopt=-mcpu fi + test $_fast_cmov = "auto" && _fast_cmov=yes if test "$_runtime_cpudetection" = no ; then case "$pvendor" in AuthenticAMD) @@ -1948,7 +1949,6 @@ EOF # 64-bit prescotts exist, but as far as GCC is concerned they # have the same capabilities as a nocona. proc=nocona - test $_fast_cmov = "auto" && _fast_cmov=no ;; esac ;; -- cgit v1.2.3 From d76a585366948e04676b48de0265a655b6eccb35 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 23 Dec 2008 13:31:04 +0000 Subject: Remove pointless forward declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28184 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_x11.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index c1c8ef79ce..73062bce35 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -53,7 +53,6 @@ static const vo_info_t info = { const LIBVO_EXTERN(x11) /* private prototypes */ -static void Display_Image(XImage * myximage, unsigned char *ImageData); static void (*draw_alpha_fnc) (int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride); -- cgit v1.2.3 From 0f3263605359c369f8990908ce1c852a2321b081 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 23 Dec 2008 18:11:55 +0000 Subject: updates git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28185 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Changelog | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 2d08deabe5..a64264234a 100644 --- a/Changelog +++ b/Changelog @@ -13,6 +13,32 @@ MPlayer (1.0) * image decoders: Sun rasterfile, PCX image * MLP decoder via lavc * use lavc ADPCM codecs by default + * support for progressive jpeg in ffmjpeg + * ACDSystems mjpeg (ACDV) via binary DLL and lavc + * SIF1 via binary DLL + * wincam screen capture (WCMV) via binary DLL + * Creative Labs Video Blaster Webcam mjpeg (CJPG) via binary DLL and ijpg library + * kensington webcam (AJPG,ABYR) via binary DLL + * centre for wavelets (wavc) via binary DLL + * GeoVision Advanced MPEG-4 (GMP4,GM40) via binary DLL + * Xiricam jpg from Veo PC Camera (XJPG) via binary DLL + * WorldConnect Wavelet Video (SMSV) via binary DLL + * VDOWave 3 advanced (VDO3,VDOM,VDOW) via binary DLL + * VoxWare MetaVoice (format 0x0074) via binary DLL + * Ulead DV Audio (0x215,0x216) via binary DLL + * GoToMeeting codec (G2M2,G2M3) via binary DLL + * SP4x codec - used by Aiptek MegaCam (SP4x) via binary DLL + * Broadway MPEG Capture Codec (BW10) via binary DLL + * ZDSoft screen recorder (ZDSV) via binary DLL + * WebTrain Communication lossless screen recorder (WTVC) via binary DLL + * xfire video (XFR1) via binary DLL + * VFAPI rgb transcode (vifp) via binary DLL + * ETI CamCorder EYECON (NUB0,NUB1,NUB2) via binary DLL + * fox motion (FMVC) via binary DLL + * Trident video (TY2C,TY2N,TY0N) via binary DLL + * 10-bit video (v210) via Cinewave binary DLL + * Brooktree YUV 4:1:1 Raw (Y41P) via binary DLL + * many rare/obscure fourccs for known formats added Demuxers: * -lavfdopts cryptokey allows decrypting MXF and ASF files @@ -53,6 +79,9 @@ MPlayer (1.0) * VP3 decoder speedup * Split-Radix FFT (speedup multiple audio codecs) * MMX/SSE/ARM and other misc speedups + * QCELP decoder + * RV30 decoder + * RV40 decoder libmpeg2: * enable Alpha/ARM optimizations in libmpeg2 @@ -67,7 +96,7 @@ MPlayer (1.0) * support -border on vo_gl/gl2 in x11 * Direct3D Windows video output driver added. * factorize code in vo_wii - * removed unnecessary code from vo x11,xv,xvmc + * removed unnecessary code from vo x11, xv, xvmc MEncoder: * check for system-wide configuration file in MEncoder -- cgit v1.2.3 From 082b91fc9fe8acace3151beb198ba9d73452411a Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 23 Dec 2008 19:10:40 +0000 Subject: Reduce the priority of the rv3040 native Linux RealVideo decoders since it crashes on SMP systems git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28186 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/codecs.conf b/etc/codecs.conf index a8a6e211fb..2002835574 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1516,7 +1516,7 @@ videocodec 3ivX videocodec rv3040 info "Linux RealPlayer 10 RV30/40 decoder" - status working + status buggy ; tries to use multi-threaded decoding on SMP systems and crashes on exit fourcc RV30,rv30 fourcc RV40,rv40 driver realvid -- cgit v1.2.3 From 8eda502f59a13cfd1f9a21db4b72f6a911cdf70d Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 23 Dec 2008 19:31:56 +0000 Subject: Do not default to rectangle=2, it is at least for ATI HD4850 cards with 8.12 drivers 20% slower at HD resolutions git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28187 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 7f59aee55c..128dc4def5 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -407,7 +407,7 @@ static void autodetectGlExtensions(void) { int is_ati = strstr(vendor, "ATI") != NULL; if (ati_hack == -1) ati_hack = is_ati; if (force_pbo == -1) force_pbo = strstr(extensions, "_pixel_buffer_object") ? is_ati : 0; - if (use_rectangle == -1) use_rectangle = strstr(extensions, "_texture_non_power_of_two") ? 2 : 0; + if (use_rectangle == -1) use_rectangle = strstr(extensions, "_texture_non_power_of_two") ? 0 : 0; } /** -- cgit v1.2.3 From 5be3fc9c94df700a903f1f67b9f15297df5efc1d Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 23 Dec 2008 20:56:45 +0000 Subject: Warn when using features that are broken due to ATI driver bugs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28188 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_gl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 128dc4def5..4f6cb3acea 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -408,6 +408,9 @@ static void autodetectGlExtensions(void) { if (ati_hack == -1) ati_hack = is_ati; if (force_pbo == -1) force_pbo = strstr(extensions, "_pixel_buffer_object") ? is_ati : 0; if (use_rectangle == -1) use_rectangle = strstr(extensions, "_texture_non_power_of_two") ? 0 : 0; + if (is_ati && (lscale == 1 || lscale == 2 || cscale == 1 || cscale == 2)) + mp_msg(MSGT_VO, MSGL_WARN, "Selected scaling mode may be broken on ATI cards.\n" + "Tell _them_ to fix GL_REPEAT if you have issues.\n"); } /** -- cgit v1.2.3 From 9af21d57c1bcce7d0883bdedeac359545043d13c Mon Sep 17 00:00:00 2001 From: compn Date: Wed, 24 Dec 2008 04:33:51 +0000 Subject: add zygo audio (SPXN) qtaudio codec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28189 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/etc/codecs.conf b/etc/codecs.conf index 2002835574..9447901d4c 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2922,6 +2922,13 @@ audiocodec qtmace6 driver qtaudio dll "QuickTime.qts" +audiocodec zygoaudio + info "Zygo audio" + status working + fourcc SPXN + driver qtaudio + dll "ZyGoAudioS.qtx" + audiocodec ffra144 info "FFmpeg RealAudio 1.0" status working -- cgit v1.2.3 From 69132d6b4b189cb5ffa1b8cd64ced52742d0d897 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 24 Dec 2008 16:05:20 +0000 Subject: Increase MAX_PACK_BYTES from 8 or 32 MB (with/without CONFIG_TV_BSDBT848) to always 32 MB. Firstly 32 MB is not that much with HD video and the different values depending on whether CONFIG_TV_BSDBT848 is set or not makes debugging harder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28190 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 3a65792d39..6d986fcffd 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -20,11 +20,7 @@ #endif #define MAX_PACKS 4096 -#ifdef CONFIG_TV_BSDBT848 #define MAX_PACK_BYTES 0x2000000 -#else -#define MAX_PACK_BYTES 0x800000 -#endif #define DEMUXER_TYPE_UNKNOWN 0 #define DEMUXER_TYPE_MPEG_ES 1 -- cgit v1.2.3 From 1e1de192f881ea3e697f34408e9cf81180504bf9 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 24 Dec 2008 16:57:35 +0000 Subject: Remove unused variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28191 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/x11_common.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 937be5754b..9b6ee47b9b 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -598,7 +598,6 @@ void vo_x11_putkey(int key) { static const char *passthrough_keys = " -+*/<>`~!@#$%^&()_{}:;\"\',.?\\|=[]"; int mpkey = 0; - int i; if ((key >= 'a' && key <= 'z') || (key >= 'A' && key <= 'Z') || (key >= '0' && key <= '9') || -- cgit v1.2.3 From 7f1d183b1c13823b45f01e45f7eeec0860736415 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 24 Dec 2008 18:13:18 +0000 Subject: =?UTF-8?q?Add=20nomsgmodule=20option,=20patch=20by=20Onur=20K?= =?UTF-8?q?=C3=BC=C3=A7=C3=BCk,=20onur=20delipenguen=20net.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28192 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common-opts.h | 1 + 1 file changed, 1 insertion(+) diff --git a/cfg-common-opts.h b/cfg-common-opts.h index 8319fd26e2..f9badb64b5 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -12,6 +12,7 @@ {"msgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"nomsgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, {"msgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"nomsgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, #ifdef CONFIG_ICONV {"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif -- cgit v1.2.3 From 2e6e799109005d1863005d0f74bd26e0352e1eb2 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 25 Dec 2008 18:28:10 +0000 Subject: grammar fix by Vineeth N, nvineeth gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28193 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/codec-devel.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCS/tech/codec-devel.txt b/DOCS/tech/codec-devel.txt index a9ca1ddcad..1b2c26918c 100644 --- a/DOCS/tech/codec-devel.txt +++ b/DOCS/tech/codec-devel.txt @@ -143,7 +143,7 @@ with the parameters passed into the decoding function (if you set it up to take those parameters). Such data should match up. If it doesn't, issue a warning and make an executive decision in the code about which data to believe (personally, I always lend more weight to the data that was passed -into the decoder function, the data that comes from the container file's +into the decoder function, than the data that comes from the container file's header). If there's supposed to be a magic number embedded in, or computed from, the chunk's header, issue a warning if it isn't correct. -- cgit v1.2.3 From 333e050fdfef8c17927b67a770d8dd7dc7452696 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 27 Dec 2008 11:33:54 +0000 Subject: consistency cosmetics: Rename POWERPC identifiers to PPC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28194 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 577d09333e..dabc7c4962 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -949,11 +949,11 @@ static inline void yuv2rgbXinC_full(SwsContext *c, int16_t *lumFilter, int16_t * #define COMPILE_C #endif -#ifdef ARCH_POWERPC +#ifdef ARCH_PPC #if (defined (HAVE_ALTIVEC) || defined (RUNTIME_CPUDETECT)) && defined (CONFIG_GPL) #define COMPILE_ALTIVEC #endif //HAVE_ALTIVEC -#endif //ARCH_POWERPC +#endif //ARCH_PPC #if defined(ARCH_X86) @@ -1628,7 +1628,7 @@ static SwsFunc getSwsFunc(int flags){ return swScale_C; #else -#ifdef ARCH_POWERPC +#ifdef ARCH_PPC if (flags & SWS_CPU_CAPS_ALTIVEC) return swScale_altivec; else -- cgit v1.2.3 From 8787793a7887c9fdc4a1ee96205c14d58c0cb261 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 27 Dec 2008 11:45:46 +0000 Subject: Avoid POSIX-reserved _t namespace. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28195 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/yuv2rgb_bfin.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libswscale/yuv2rgb_bfin.c b/libswscale/yuv2rgb_bfin.c index a473652382..58cc5b6a35 100644 --- a/libswscale/yuv2rgb_bfin.c +++ b/libswscale/yuv2rgb_bfin.c @@ -47,8 +47,8 @@ void ff_bfin_yuv2rgb565_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, void ff_bfin_yuv2rgb24_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, int w, uint32_t *coeffs) L1CODE; -typedef void (* ltransform_t)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, - int w, uint32_t *coeffs); +typedef void (* ltransform)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, + int w, uint32_t *coeffs); static void bfin_prepare_coefficients (SwsContext *c, int rgb, int masks) @@ -92,7 +92,7 @@ static int core_yuv420_rgb (SwsContext *c, uint8_t **in, int *instrides, int srcSliceY, int srcSliceH, uint8_t **oplanes, int *outstrides, - ltransform_t lcscf, int rgb, int masks) + ltransform lcscf, int rgb, int masks) { uint8_t *py,*pu,*pv,*op; int w = instrides[0]; -- cgit v1.2.3 From ce7fc9babc01b8c3c177400dfbf891e31e63d649 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 27 Dec 2008 12:00:11 +0000 Subject: Set and use only ARCH_PPC, not also ARCH_POWERPC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28196 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 6 +++--- cpudetect.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index c3d37a5bc9..4ef38def50 100755 --- a/configure +++ b/configure @@ -1681,7 +1681,7 @@ EOF fi -_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM SH POWERPC PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC' +_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM SH PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC' case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) _arch='X86 X86_32' @@ -2047,9 +2047,9 @@ EOF ;; ppc|ppc64|powerpc|powerpc64) - _arch='POWERPC PPC' + _arch='PPC' _def_dcbzl='#undef HAVE_DCBZL' - _target_arch='ARCH_POWERPC = yes' + _target_arch='ARCH_PPC = yes' _def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' iproc='ppc' diff --git a/cpudetect.c b/cpudetect.c index a20baa88cd..3860cc9a17 100644 --- a/cpudetect.c +++ b/cpudetect.c @@ -570,7 +570,7 @@ void GetCpuCaps( CpuCaps *caps) mp_msg(MSGT_CPUDETECT,MSGL_INFO,"CPU: ARM\n"); #endif -#ifdef ARCH_POWERPC +#ifdef ARCH_PPC mp_msg(MSGT_CPUDETECT,MSGL_INFO,"CPU: PowerPC\n"); #endif -- cgit v1.2.3 From 47044eb841770cff33be22ba5c037188e1d14030 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 27 Dec 2008 12:03:51 +0000 Subject: Avoid u_ BSD type names. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28197 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/pe_image.c | 26 +++++++++++++------------- stream/tcp.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/loader/pe_image.c b/loader/pe_image.c index 7af23d3476..1b069b82ac 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -72,9 +72,9 @@ static void dump_exports( HMODULE hModule ) { char *Module; unsigned int i, j; - u_short *ordinal; - u_long *function,*functions; - u_char **name; + unsigned short *ordinal; + unsigned long *function,*functions; + unsigned char **name; unsigned int load_addr = hModule; DWORD rva_start = PE_HEADER(hModule)->OptionalHeader @@ -88,9 +88,9 @@ static void dump_exports( HMODULE hModule ) TRACE("Module name is %s, %ld functions, %ld names\n", Module, pe_exports->NumberOfFunctions, pe_exports->NumberOfNames); - ordinal=(u_short*) RVA(pe_exports->AddressOfNameOrdinals); - functions=function=(u_long*) RVA(pe_exports->AddressOfFunctions); - name=(u_char**) RVA(pe_exports->AddressOfNames); + ordinal=(unsigned short*) RVA(pe_exports->AddressOfNameOrdinals); + functions=function=(unsigned long*) RVA(pe_exports->AddressOfFunctions); + name=(unsigned char**) RVA(pe_exports->AddressOfNames); TRACE(" Ord RVA Addr Name\n" ); for (i=0;iNumberOfFunctions;i++, function++) @@ -126,15 +126,15 @@ FARPROC PE_FindExportedFunction( LPCSTR funcName, WIN_BOOL snoop ) { - u_short * ordinals; - u_long * function; - u_char ** name; + unsigned short * ordinals; + unsigned long * function; + unsigned char ** name; const char *ename = NULL; int i, ordinal; PE_MODREF *pem = &(wm->binfmt.pe); IMAGE_EXPORT_DIRECTORY *exports = pem->pe_export; unsigned int load_addr = wm->module; - u_long rva_start, rva_end, addr; + unsigned long rva_start, rva_end, addr; char * forward; if (HIWORD(funcName)) @@ -149,9 +149,9 @@ FARPROC PE_FindExportedFunction( WARN("Module %08x(%s)/MODREF %p doesn't have a exports table.\n",wm->module,wm->modname,pem); return NULL; } - ordinals= (u_short*) RVA(exports->AddressOfNameOrdinals); - function= (u_long*) RVA(exports->AddressOfFunctions); - name = (u_char **) RVA(exports->AddressOfNames); + ordinals= (unsigned short*) RVA(exports->AddressOfNameOrdinals); + function= (unsigned long*) RVA(exports->AddressOfFunctions); + name = (unsigned char **) RVA(exports->AddressOfNames); forward = NULL; rva_start = PE_HEADER(wm->module)->OptionalHeader .DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress; diff --git a/stream/tcp.c b/stream/tcp.c index fd5a849cad..69072f80fa 100644 --- a/stream/tcp.c +++ b/stream/tcp.c @@ -76,7 +76,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) { char buf[255]; #ifdef HAVE_WINSOCK2_H - u_long val; + unsigned long val; int to; #else struct timeval to; -- cgit v1.2.3 From a3654508d2f651539b86150f2793e825b17d4d9e Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 27 Dec 2008 12:46:06 +0000 Subject: Reorder sections: Put FAQ at the end, group usage sections together. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28198 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/documentation.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml index 01f9b69f95..54546bb301 100644 --- a/DOCS/xml/en/documentation.xml +++ b/DOCS/xml/en/documentation.xml @@ -166,17 +166,17 @@ can be distributed under the terms of the GNU General Public License Version 2. &usage.xml; &cd-dvd.xml; -&faq.xml; +&tvinput.xml; +&radio.xml; &codecs.xml; &video.xml; &audio.xml; -&tvinput.xml; -&radio.xml; &ports.xml; &mencoder.xml; &encoding-guide.xml; +&faq.xml; &bugreports.xml; &bugs.xml; &skin.xml; -- cgit v1.2.3 From 256c9152fe705f4c7e4e7ec8c6dfa4c67ab539cc Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 27 Dec 2008 13:00:03 +0000 Subject: Fix ugly borders problem with ati-hack git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28199 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_gl.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 4f6cb3acea..6560b325fb 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -785,6 +785,18 @@ static uint32_t get_image(mp_image_t *mpi) { return VO_TRUE; } +static void clear_border(uint8_t *dst, int start, int stride, int height, int full_height, int value) { + int right_border = stride - start; + int bottom_border = full_height - height; + while (height > 0) { + memset(dst + start, value, right_border); + dst += stride; + height--; + } + if (bottom_border > 0) + memset(dst, value, stride * bottom_border); +} + static uint32_t draw_image(mp_image_t *mpi) { int slice = slice_height; int stride[3]; @@ -802,6 +814,13 @@ static uint32_t draw_image(mp_image_t *mpi) { memcpy_pic(mpi2.planes[1], mpi->planes[1], mpi->w >> 1, mpi->h >> 1, mpi2.stride[1], mpi->stride[1]); memcpy_pic(mpi2.planes[2], mpi->planes[2], mpi->w >> 1, mpi->h >> 1, mpi2.stride[2], mpi->stride[2]); } + if (ati_hack) { // since we have to do a full upload we need to clear the borders + clear_border(mpi2.planes[0], mpi->w * bpp / 8, mpi2.stride[0], mpi->h, mpi2.height, 0); + if (mpi->imgfmt == IMGFMT_YV12) { + clear_border(mpi2.planes[1], mpi->w >> 1, mpi2.stride[1], mpi->h >> 1, mpi2.height >> 1, 128); + clear_border(mpi2.planes[2], mpi->w >> 1, mpi2.stride[2], mpi->h >> 1, mpi2.height >> 1, 128); + } + } mpi = &mpi2; } stride[0] = mpi->stride[0]; stride[1] = mpi->stride[1]; stride[2] = mpi->stride[2]; -- cgit v1.2.3 From 46a94a70071d62a4460e3f587fdfe83757bee443 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 27 Dec 2008 13:09:42 +0000 Subject: Add entry about mysterious coredumps. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28200 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/faq.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml index b63255858f..deed18237e 100644 --- a/DOCS/xml/en/faq.xml +++ b/DOCS/xml/en/faq.xml @@ -240,6 +240,18 @@ if it doesn't contain your codec, read the + + +I get a core dump when trying to dump streams, what's wrong? + + +Don't panic. Make sure you know where your towel is. + +Seriously, notice the smiley and start looking for files that end in +.dump. + + + When I start playing, I get this message but everything seems fine: -- cgit v1.2.3 From 3b1c39d69caf317af75f76f303ea7b4e3e4d64e6 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 27 Dec 2008 13:49:24 +0000 Subject: Remove known bugs section, it contains little useful information. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28201 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/bugreports.xml | 3 +- DOCS/xml/en/bugs.xml | 137 ------------------------------------------ DOCS/xml/en/documentation.xml | 1 - 3 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 DOCS/xml/en/bugs.xml diff --git a/DOCS/xml/en/bugreports.xml b/DOCS/xml/en/bugreports.xml index 6891891b40..d40afa362f 100644 --- a/DOCS/xml/en/bugreports.xml +++ b/DOCS/xml/en/bugreports.xml @@ -154,8 +154,7 @@ so please use only Subversion to report bugs. This includes binary packages of MPlayer. Subversion instructions can be found at the bottom of this page or in -the README. If this did not help please refer to the list of -known bugs and the rest of the documentation. +the README. If this did not help please refer to the rest of the documentation. If your problem is not known or not solvable by our instructions, then please report the bug. diff --git a/DOCS/xml/en/bugs.xml b/DOCS/xml/en/bugs.xml deleted file mode 100644 index 565dedf200..0000000000 --- a/DOCS/xml/en/bugs.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - -Known bugs - - -Special system/CPU-specific bugs/problems - - - - General SIGILL (signal 4): - - Problem: you compiled and run MPlayer on - different machines (for example compiled on P3 and running on Celeron) - - - Solution: compile MPlayer on the same machine - where you will use it! - - - Workaround: You can forget all this by configuring with the - option or you can - disable particular CPU instruction sets with more specific options (like - , , etc). - - - - - Crashes when dumping streams: - Problem: core dump - Solution: Don't panic. Make sure you know where your towel is. - - - - - - - - - -Various A-V sync and other audio problems - - -General audio delay or jerky sound - (exists with all or many files) - - - - most common: buggy audio driver! - try to use different drivers, try ALSA OSS - emulation with , also try , - sometimes it helps. If your file plays fine with , - then you can be sure it's sound card (driver) problem. - - - - audio buffer problems (buffer size badly detected) - - Workaround: MPlayer's option - - - - - samplerate problems - maybe your card doesn't support the samplerate used in - your files - try the resampling filter () - - - - slow machine (CPU or VGA) - - try with , if it plays well, then you have slow - VGA card/driver - - - Workaround: buy a faster card or read this documentation about how to speed up - - Also try - - - - - - - -Audio delay/desync specific to one or a few files - - - - bad file - - Workaround: - - - - or option - (for non-interleaved or bad files) - - and/or - - - - - (required for files with badly interleaved VBR audio) - - and/or - - - - or +/- - keys at runtime to adjust delay - - - - If none of these help, please upload the file, we'll check (and fix). - - - - - your sound card doesn't support 48kHz playback - - Workaround: buy a better sound card... or try to decrease fps by 10% - (use for a 30fps movie) or use the resample filter - - - - - - slow machine (if A-V is not around 0, - and the last number in the status line increasing) - - Workaround: - - - - - - - diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml index 54546bb301..22bc46df53 100644 --- a/DOCS/xml/en/documentation.xml +++ b/DOCS/xml/en/documentation.xml @@ -178,6 +178,5 @@ can be distributed under the terms of the GNU General Public License Version 2. &encoding-guide.xml; &faq.xml; &bugreports.xml; -&bugs.xml; &skin.xml; &history.xml; -- cgit v1.2.3 From 0f62db895eebd10db001d821d496bc36d0f8ca6c Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 27 Dec 2008 13:58:20 +0000 Subject: Remove/fix ancient CVS references. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28202 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/README | 4 ++-- DOCS/tech/codec-devel.txt | 7 ++++--- DOCS/tech/release-howto.txt | 12 ++++-------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/DOCS/README b/DOCS/README index 486a0e9036..94d28c6e8c 100644 --- a/DOCS/README +++ b/DOCS/README @@ -6,7 +6,7 @@ Thanks for reading MPlayer documentation !!! -1. For "release" version users (i.e. non-CVS): +1. For "release" version users (i.e. non-Subversion): a, Enter the HTML/ directory, and there you'll find the documentation, each language in its own subdirectory. @@ -19,7 +19,7 @@ Thanks for reading MPlayer documentation !!! try the subdirectories in this very same folder. -2. For "development" version users (i.e. CVS or CVS snapshots): +2. For "development" version users (i.e. Subversion or Subversion snapshots): a, Enter the xml/ directory, and read the README file there to find out how to build a HTML version of the XML documentation. It will diff --git a/DOCS/tech/codec-devel.txt b/DOCS/tech/codec-devel.txt index 1b2c26918c..86eb8db922 100644 --- a/DOCS/tech/codec-devel.txt +++ b/DOCS/tech/codec-devel.txt @@ -49,8 +49,8 @@ data, search for sample media of both types. If a video codec is known to work at 7 different bit depths, then, as painful as it may be, do what you can to obtain sample media encoded for each of the 7 bit depths. -- Latest CVS snapshot: It's always useful to develop code for the very -latest development version of MPlayer. Be sure to update your local CVS +- Latest Subversion snapshot: It's always useful to develop code for the very +latest development version of MPlayer. Be sure to update your local Subversion copy often. - General programming knowledge, working Linux development environment: I @@ -190,7 +190,8 @@ files: - ad.c or vd.c Of course, you will need to include your newly-created file(s): vd_.c -OR- ad_.c. If you contribute enough decoders, the -development team may even grant you write privileges to the CVS repository. +development team may even grant you write privileges to the Subversion +repository. 5) Wait for bug reports to start rolling in You may think you're finished when you release the codec and if you're diff --git a/DOCS/tech/release-howto.txt b/DOCS/tech/release-howto.txt index 504f522d9e..5cf0fef514 100644 --- a/DOCS/tech/release-howto.txt +++ b/DOCS/tech/release-howto.txt @@ -7,22 +7,18 @@ preparations: all docs are up to date, etc. - Verify man page, remove obsolete options, mention new ones. - Ask translation maintainers to update their help_mp*.h file. -- Update the ChangeLog file (according to CVS log), ask other developers +- Update the ChangeLog file (according to Subversion log), ask other developers to verify their parts, etc. Ask Diego to spellcheck it. - Consult at -dev-eng about unstable parts of the code which should be disabled for the release. - Find a codename for the release create the release tree: -- tag cvs with release name +- tag Subversion with release name - update release.sh script with version number ***the following steps are done automatically by release.sh script*** -- cvs checkout the mplayer src tree -- check out libavcodec and libavformat from FFmpeg CVS -- remove the CVS subdirs: - find main -name CVS -exec rm -rf {} \; -- remove the .cvsignore files: - find main -name .cvsignore -exec rm {} \; +- checkout the mplayer src tree +- check out FFmpeg subdirs - remove obsolete DOCS translations, help files - replace version.sh with this (change version number too...): -- cgit v1.2.3 From 66d42f0df48895683fa7ab5b37e694a8ccb9a4b5 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 27 Dec 2008 14:38:42 +0000 Subject: Convert Win32 codec importing HOWTO into a text document in the tech section. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28203 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/win32-codec-howto.txt | 87 ++++++++++++++++++++++ DOCS/xml/en/codecs.xml | 161 +--------------------------------------- DOCS/xml/en/faq.xml | 3 +- 3 files changed, 91 insertions(+), 160 deletions(-) create mode 100644 DOCS/tech/win32-codec-howto.txt diff --git a/DOCS/tech/win32-codec-howto.txt b/DOCS/tech/win32-codec-howto.txt new file mode 100644 index 0000000000..cbf13cf72e --- /dev/null +++ b/DOCS/tech/win32-codec-howto.txt @@ -0,0 +1,87 @@ +============================ +Win32 codecs importing HOWTO +============================ + +This document describes how to extract the information necessary to hook +up Win32 binary codecs in MPlayer from a Windows system. Different methods +exist depending on which video API your codec uses and which Windows +version you have. + +If you have gathered all the necessary information (fourcc, GUID, codec file, +sample file) as described below, notify the mplayer-dev-eng mailing list. +If you want to add a codec yourself, read DOCS/tech/codecs.conf.txt. + + + +VFW codecs +~~~~~~~~~~ + +VFW (Video for Windows) is the old video API for Windows. Its codecs have +the '.dll' or (rarely) '.drv' extension. If MPlayer fails at playing your +AVI with this kind of message: + +UNKNOWN video codec: HFYU (0x55594648) + +It means your AVI is encoded with a codec which has the HFYU fourcc (HFYU = +HuffYUV codec, DIV3 = DivX Low Motion, etc.). Now that you know this, you +have to find out which DLL Windows loads in order to play this file. In our +case, the 'system.ini' contains this information in a line that reads: + +VIDC.HFYU=huffyuv.dll + +So you need the 'huffyuv.dll' file. Note that the audio codecs are +specified by the MSACM prefix: + +msacm.l3acm=L3codeca.acm + +This is the MP3 codec. + + + +DirectShow codecs: +~~~~~~~~~~~~~~~~~~ + +DirectShow is the newer video API, which is even worse than its predecessor. +Things are harder with DirectShow, since 'system.ini' does not contain the +needed information, instead it is stored in the registry and we need the +GUID of the codec. + + +New Method: +----------- + +Using Microsoft GraphEdit (fast) + +- Get GraphEdit from either DirectX SDK or doom9. +- Start 'graphedit.exe'. +- From the menu select "Graph -> Insert Filters". +- Expand item "DirectShow Filters". +- Select the right codec name and expand item. +- In the entry "DisplayName" look at the text in winged brackets after the + backslash and write it down (five dash-delimited blocks, the GUID). +- The codec binary is the file specified in the "Filename" entry. + +If there is no "Filename" and "DisplayName" contains something like +'device:dmo', then it is a DMO-Codec. + + +Old Method: +----------- + +Take a deep breath and start searching the registry... + +- Start 'regedit'. +- Press "Ctrl-F", disable the first two checkboxes, and enable the third. + Type in the fourcc of the codec (e.g. "TM20"). +- You should see a field which contains the path and the filename (e.g. + "C:\WINDOWS\SYSTEM\TM20DEC.AX"). +- Now that you have the file, we need the GUID. Try searching again, but + now search for the codec's name, not the fourcc. Its name can be acquired + when Media Player is playing the file, by checking + "File -> Properties -> Advanced". + If not, you are out of luck. Try guessing (e.g. search for TrueMotion). +- If the GUID is found you should see a "FriendlyName" and a "CLSID" field. + Write down the 16 byte CLSID, this is the GUID we need. + +If searching fails, try enabling all the checkboxes. You may have +false hits, but you may get lucky... diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 42af3a1be8..25c9ae743a 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -12,8 +12,8 @@ of our homepage. -If you have a Win32 codec which is not supported yet, -please read the codec importing HOWTO +If you have a Win32 codec which is not supported yet, please read the +Win32 codec HOWTO and help us add support for it. @@ -96,161 +96,4 @@ only white noise). - - - - - -Win32 codecs importing HOWTO - - - - -VFW codecs - - -VFW (Video for Windows) is the old Video API for Windows. Its codecs have -the .DLL or (rarely) .DRV -extension. If MPlayer fails at playing your AVI -with this kind of message: -UNKNOWN video codec: HFYU (0x55594648) -It means your AVI is encoded with a codec which has the HFYU fourcc (HFYU = -HuffYUV codec, DIV3 = DivX Low Motion, etc.). Now that you know this, you -have to find out which DLL Windows loads in order to play this file. In our -case, the system.ini contains this information in a -line that reads: -VIDC.HFYU=huffyuv.dll - - - -So you need the huffyuv.dll file. Note that the audio -codecs are specified by the MSACM prefix: -msacm.l3acm=L3codeca.acm - - - -This is the MP3 codec. Now that you have all the necessary information -(fourcc, codec file, sample AVI), submit your codec support request by -mail, and upload these files to the FTP site: -ftp://upload.mplayerhq.hu/MPlayer/incoming/<codecname>/ - - - -On Windows NT/2000/XP search for this info in the registry, -e.g. search for "VIDC.HFYU". To find out how to do this, look at -the old DirectShow method below. - - - - - - -DirectShow codecs - - -DirectShow is the newer Video API, which is even worse than its predecessor. -Things are harder with DirectShow, since - - - system.ini does not contain the needed information, - instead it is stored in the registry and - - - we need the GUID of the codec. - - - - - -New Method: - -Using Microsoft GraphEdit (fast) - - - Get GraphEdit from either DirectX SDK or - doom9. - - - Start graphedit.exe. - - - From the menu select - Graph - Insert Filters. - - - Expand item DirectShow Filters. - - - Select the right codec name and expand item. - - - In the entry DisplayName look at the text in - winged brackets after the backslash and write it down (five dash-delimited - blocks, the GUID). - - - The codec binary is the file specified in the - Filename entry. - - - - -If there is no Filename and -DisplayName contains something like -device:dmo, then it is a DMO-Codec. - - - -Old Method: - -Take a deep breath and start searching the registry... - - - Start regedit. - - - Press CtrlF, disable - the first two checkboxes, and enable the third. Type in the fourcc of the - codec (e.g. TM20). - - - You should see a field which contains the path and the filename (e.g. - C:\WINDOWS\SYSTEM\TM20DEC.AX). - - - Now that you have the file, we need the GUID. Try searching again, but - now search for the codec's name, not the fourcc. Its name can be acquired - when Media Player is playing the file, by checking - File Properties - Advanced. - If not, you are out of luck. Try guessing (e.g. search for TrueMotion). - - - If the GUID is found you should see a FriendlyName - and a CLSID field. Write down the 16 byte CLSID, - this is the GUID we need. - - - - -If searching fails, try enabling all the checkboxes. You may have -false hits, but you may get lucky... - - - -Now that you have all the necessary information (fourcc, GUID, codec file, -sample AVI), submit your codec support request by mail, and upload these files -to the FTP site: -ftp://upload.mplayerhq.hu/MPlayer/incoming/<codecname>/ - - - -If you want to add a codec yourself, read -DOCS/tech/codecs.conf.txt. - - - - - diff --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml index deed18237e..f26481a329 100644 --- a/DOCS/xml/en/faq.xml +++ b/DOCS/xml/en/faq.xml @@ -236,7 +236,8 @@ I have problems playing files with the ... codec. Can I use them? Check the codec status, if it doesn't contain your codec, read the codec documentation, especially the -codec importing HOWTO and contact us. +Win32 codec HOWTO +and contact us. -- cgit v1.2.3 From 4f6c6ba61a1fc213c7356b9ae1b9467f177a67a5 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 27 Dec 2008 15:28:51 +0000 Subject: Remove (audio) codecs section, its contents are part of the usage section. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28204 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/codecs.xml | 99 ------------------------------------------- DOCS/xml/en/documentation.xml | 2 - DOCS/xml/en/faq.xml | 1 - 3 files changed, 102 deletions(-) delete mode 100644 DOCS/xml/en/codecs.xml diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml deleted file mode 100644 index 25c9ae743a..0000000000 --- a/DOCS/xml/en/codecs.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - -Codecs - - -The codec status table is a -complete list of all supported codecs, regenerated daily. -Some binary codecs for use with MPlayer are available in the -download section -of our homepage. - - - -If you have a Win32 codec which is not supported yet, please read the -Win32 codec HOWTO -and help us add support for it. - - - - - - - -Audio codecs - - - -Software AC-3 decoding - - -This is the default decoder used for files with AC-3 audio. - - - -The AC-3 decoder can create audio output mixes for 2, 4, or 6 speakers. -When configured for 6 speakers, this decoder provides separate output of -all the AC-3 channels to the sound driver, allowing for full "surround -sound" experience without the external AC-3 decoder required to use the -hwac3 codec. - - - -Use the option to select the number of output -channels. Use for a stereo downmix. For a 4 -channel downmix (Left Front, Right Front, Left Surround and Right Surround -outputs), use . In this case, any center -channel will be mixed equally to the front channels. - will output all the AC-3 channels as they are -encoded - in the order Left, Right, Left Surround, Right Surround, Center and -LFE. - - - -The default number of output channels is 2. - - - -To use more than 2 output channels, you will need to use OSS, and have a -sound card that supports the appropriate number of output channels via the -SNDCTL_DSP_CHANNELS ioctl. An example of a suitable driver is emu10k1 -(used by Soundblaster Live! cards) from August 2001 or newer (ALSA CVS is -also supposed to work). - - - - - - -Hardware AC-3 decoding - - -You need an AC-3 capable sound card, with digital out (S/PDIF). The card's -driver must properly support the AFMT_AC3 format (C-Media does). Connect -your AC-3 decoder to the S/PDIF output, and use the option. It is experimental but known to work with C-Media -cards and Soundblaster Live! + ALSA (but not OSS) drivers and DXR3/Hollywood+ -MPEG decoder cards. - - - - - - -Hardware MPEG audio codec - - -This codec (selected by ) passes through MPEG audio -packets to hardware decoders, such as the ones found in full-featured DVB cards -and DXR2 adapters. -Don't use it in combination with any other audio output device -(such as OSS and ALSA) that isn't able to decode it (you will hear -only white noise). - - - - - - diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml index 22bc46df53..f87259847a 100644 --- a/DOCS/xml/en/documentation.xml +++ b/DOCS/xml/en/documentation.xml @@ -168,8 +168,6 @@ can be distributed under the terms of the GNU General Public License Version 2. &cd-dvd.xml; &tvinput.xml; &radio.xml; - -&codecs.xml; &video.xml; &audio.xml; diff --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml index f26481a329..01b95ec046 100644 --- a/DOCS/xml/en/faq.xml +++ b/DOCS/xml/en/faq.xml @@ -235,7 +235,6 @@ I have problems playing files with the ... codec. Can I use them? Check the codec status, if it doesn't contain your codec, read the -codec documentation, especially the Win32 codec HOWTO and contact us. -- cgit v1.2.3