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(-) (limited to 'DOCS') 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 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(-) (limited to 'DOCS') 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 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(+) (limited to 'DOCS') 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 (limited to 'DOCS') 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(-) (limited to 'DOCS') 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 (limited to 'DOCS') 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 (limited to 'DOCS') 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