diff options
Diffstat (limited to 'DOCS/xml/en')
| -rw-r--r-- | DOCS/xml/en/encoding-guide.xml | 48 | ||||
| -rw-r--r-- | DOCS/xml/en/mencoder.xml | 2 | ||||
| -rw-r--r-- | DOCS/xml/en/tvinput.xml | 8 | ||||
| -rw-r--r-- | DOCS/xml/en/usage.xml | 8 | ||||
| -rw-r--r-- | DOCS/xml/en/video.xml | 2 |
5 files changed, 34 insertions, 34 deletions
diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml index e5af2e3873..706b34dbf5 100644 --- a/DOCS/xml/en/encoding-guide.xml +++ b/DOCS/xml/en/encoding-guide.xml @@ -357,7 +357,7 @@ practice, this means a value high enough so that it poses no limit, like 10000Kbit.) With no real restriction on bitrate, the result is that the codec will use the lowest possible quantizer for each macroblock (as specified by -<option>vqmin</option> for +<option>vqmin</option> for <systemitem class="library">libavcodec</systemitem>, which is 2 by default). As soon as you specify a low enough bitrate that the codec @@ -1327,7 +1327,7 @@ With these things in mind, here is our first example: mencoder <replaceable>capture.avi</replaceable> -mc 0 -oac lavc -ovc lavc -lavcopts \ vcodec=mpeg2video:vbitrate=6000:ilme:ildct:acodec=mp2:abitrate=224 </screen> -Note the <option>ilme</option> and <option>ildct</option> options. +Note the <option>ilme</option> and <option>ildct</option> options. </para> </sect2> @@ -1421,7 +1421,7 @@ which widely depend on personal taste and technical constraints. bugs which have not yet been noticed and which can ruin an encode. This is simply the tradeoff for using bleeding-edge technology. </para> - + <para> What is more, beginning to use a new codec requires that you spend some time becoming familiar with its options, so that you know what @@ -1453,13 +1453,13 @@ which widely depend on personal taste and technical constraints. However, they may have some very advanced options that, if enabled, will make the encode really slow for marginal gains. </para> - + <para> If you are after blazing speed you should stick around the default settings of the video codec (although you should still try the other options which are mentioned in other sections of this guide). </para> - + <para> You may also consider choosing a codec which can do multi-threaded processing, though this is only useful for users of machines with @@ -1605,7 +1605,7 @@ will encode <replaceable>destination_sound.wav</replaceable> with the encoding quality 1, which is roughly equivalent to 80Kb/s, and is the minimum quality at which you should encode if you care about quality. -Please note that <application>MEncoder</application> currently cannot +Please note that <application>MEncoder</application> currently cannot mux Vorbis audio tracks into the output file because it only supports AVI and MPEG containers as an output, each of which may lead to audio/video @@ -1773,7 +1773,7 @@ only cover its usage. </para> <para> -Probably the easiest way to get started with Matroska is to use +Probably the easiest way to get started with Matroska is to use <application>MMG</application>, the graphical frontend shipped with <application>mkvtoolnix</application>, and follow the <ulink url="http://www.bunkus.org/videotools/mkvtoolnix/doc/mkvmerge-gui.html">guide to mkvmerge GUI (mmg)</ulink> @@ -2240,7 +2240,7 @@ will be 24000/1001 frames per second. accurate method available for encoding both telecine and "mixed progressive and telecine". <screen> -mencoder dvd://1 -oac copy -vf pullup,softskip +mencoder dvd://1 -oac copy -vf pullup,softskip -ovc lavc -ofps 24000/1001<!-- --></screen> </para></listitem> @@ -4006,7 +4006,7 @@ random differences in the achieved bitrate. This option is for choosing the motion estimation search method. Altering this option provides a straightforward quality-vs-speed tradeoff. <option>me=dia</option> is only a few percent faster than - the default search, at a cost of under 0.1dB global PSNR. The + the default search, at a cost of under 0.1dB global PSNR. The default setting (<option>me=hex</option>) is a reasonable tradeoff between speed and quality. <option>me=umh</option> gains a little under 0.1dB global PSNR, with a speed penalty that varies depending on @@ -4235,7 +4235,7 @@ random differences in the achieved bitrate. (understanding that there are diminishing returns which may become vanishingly low, or even zero). The video stream will still have seekable points as long as there are some scene changes. -</para></listitem> +</para></listitem> <listitem> <para> <emphasis role="bold">deblock</emphasis>: @@ -4551,17 +4551,17 @@ and other options. This is known to work on x86 on both *NIX and Windows. </para> <para> First you must build the <application>vfw2menc</application> program. -It is located in the <filename class="directory">TOOLS</filename> subdirectory +It is located in the <filename class="directory">TOOLS</filename> subdirectory of the MPlayer source tree. To build on Linux, this can be done using <application>Wine</application>: <screen>winegcc vfw2menc.c -o vfw2menc -lwinmm -lole32</screen> -To build on Windows in <application>MinGW</application> or +To build on Windows in <application>MinGW</application> or <application>Cygwin</application> use: <screen>gcc vfw2menc.c -o vfw2menc.exe -lwinmm -lole32</screen> To build on <application>MSVC</application> you will need getopt. -Getopt can be found in the original <application>vfw2menc</application> +Getopt can be found in the original <application>vfw2menc</application> archive available at: The <ulink url="http://oss.netfarm.it/mplayer-win32.php">MPlayer on win32</ulink> project. </para> @@ -4571,13 +4571,13 @@ Below is an example with the VP6 codec. <screen> vfw2menc -f VP62 -d vp6vfw.dll -s firstpass.mcf </screen> -This will open the VP6 codec dialog window. +This will open the VP6 codec dialog window. Repeat this step for the second pass and use <option>-s <replaceable>secondpass.mcf</replaceable></option>. </para> </informalexample> <para> -Windows users can use +Windows users can use <option>-xvfwopts codec=vp6vfw.dll:compdata=dialog</option> to have the codec dialog display before encoding starts. </para> @@ -4882,11 +4882,11 @@ mp4creator -optimize narnia.mp4</screen> <para> If you want to add tags to your video that show up in iTunes, you can use <ulink url="http://atomicparsley.sourceforge.net/">AtomicParsley</ulink>. - + <screen>AtomicParsley narnia.mp4 --metaEnema --title "The Chronicles of Narnia" --year 2005 --stik Movie --freefree --overWrite</screen> The <option>--metaEnema</option> option removes any existing metadata - (<application>mp4creator</application> inserts its name in the + (<application>mp4creator</application> inserts its name in the "encoding tool" tag), and <option>--freefree</option> reclaims the space from the deleted metadata. The <option>--stik</option> option sets the type of video (such as Movie @@ -4954,7 +4954,7 @@ compliant. <tbody> <row> <entry>NTSC DVD</entry> - <entry>720x480, 704x480, 352x480, 352x240</entry> + <entry>720x480, 704x480, 352x480, 352x240</entry> <entry>MPEG-2</entry> <entry>9800 kbps</entry> <entry>48000 Hz</entry> @@ -4967,7 +4967,7 @@ compliant. <entry>NTSC DVD</entry> <entry>352x240<footnote id='fn-rare-resolutions'><para> These resolutions are rarely used for DVDs because - they are fairly low quality.</para></footnote></entry> + they are fairly low quality.</para></footnote></entry> <entry>MPEG-1</entry> <entry>1856 kbps</entry> <entry>48000 Hz</entry> @@ -5062,7 +5062,7 @@ highly bitrate-starved and require effort to obtain acceptable quality. <title>GOP Size Constraints</title> <para> -DVD, VCD, and SVCD also constrain you to relatively low +DVD, VCD, and SVCD also constrain you to relatively low GOP (Group of Pictures) sizes. For 30 fps material the largest allowed GOP size is 18. For 25 or 24 fps, the maximum is 15. @@ -5078,7 +5078,7 @@ The GOP size is set using the <option>keyint</option> option. VCD video is required to be CBR at 1152 kbps. This highly limiting constraint also comes along with an extremely low vbv buffer size of 327 kilobits. -SVCD allows varying video bitrates up to 2500 kbps, and a somewhat less +SVCD allows varying video bitrates up to 2500 kbps, and a somewhat less restrictive vbv buffer size of 917 kilobits is allowed. DVD video bitrates may range anywhere up to 9800 kbps (though typical bitrates are about half that), and the vbv buffer size is 1835 kilobits. @@ -5125,7 +5125,7 @@ DVD (with timestamps on every frame, if possible): <para> DVD with NTSC Pullup: <screen>-of mpeg -mpegopts format=dvd:tsaf:telecine -ofps 24000/1001</screen> -This allows 24000/1001 fps progressive content to be encoded at 30000/1001 +This allows 24000/1001 fps progressive content to be encoded at 30000/1001 fps whilst maintaining DVD-compliance. </para> @@ -5191,7 +5191,7 @@ or in the manual page. <para> If the audio sample rate in the original file is not the same as required by the target format, sample rate conversion is required. -This is achieved using the <option>-srate</option> option and +This is achieved using the <option>-srate</option> option and the <option>-af lavcresample</option> audio filter together. </para> @@ -5259,7 +5259,7 @@ or DVD: Used to set the GOP size. 18 for 30fps material, or 15 for 25/24 fps material. Commercial producers seem to prefer keyframe intervals of 12. - It is possible to make this much larger and still retain compatibility + It is possible to make this much larger and still retain compatibility with most players. A <option>keyint</option> of 25 should never cause any problems. </para></listitem> diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml index 5180a57d40..8914d229d1 100644 --- a/DOCS/xml/en/mencoder.xml +++ b/DOCS/xml/en/mencoder.xml @@ -608,7 +608,7 @@ mencoder mf://<replaceable>frame001.jpg,frame002.jpg</replaceable> -mf w=800:h=6 Creating an MPEG-4 file from explicit list of JPEG files (list.txt in current directory contains the list of files to use as source, one per line): <screen> -mencoder mf://<replaceable>@list.txt</replaceable> -mf w=800:h=600:fps=25:type=jpg \ +mencoder mf://<replaceable>@list.txt</replaceable> -mf w=800:h=600:fps=25:type=jpg \ -ovc lavc -lavcopts vcodec=mpeg4:mbd=2:trell -oac copy -o <replaceable>output.avi</replaceable> </screen> </para> diff --git a/DOCS/xml/en/tvinput.xml b/DOCS/xml/en/tvinput.xml index f0d3641034..c89b7acf00 100644 --- a/DOCS/xml/en/tvinput.xml +++ b/DOCS/xml/en/tvinput.xml @@ -52,7 +52,7 @@ Here are just a few tips: <listitem><para> Choose some sane image dimensions. The dimensions of the resulting image should be divisible by 16. -</para></listitem> +</para></listitem> <listitem> <para> If you capture the video with the vertical resolution higher than half @@ -88,7 +88,7 @@ Here are just a few tips: time. If you have a large capture buffer, <application>MEncoder</application> can survive an overload for few seconds but nothing more. It's better to turn off the 3D OpenGL screensavers and similar stuff. -</para></listitem> +</para></listitem> <listitem><para> Don't mess with the system clock. <application>MEncoder</application> uses the system clock for doing A/V sync. If you adjust the system clock (especially @@ -118,7 +118,7 @@ Here are just a few tips: <filename>linux/Documentation/sound/btaudio</filename> file (in the kernel tree, not <application>MPlayer</application>'s) for some instructions on using this driver. -</para></listitem> +</para></listitem> <listitem><para> If <application>MEncoder</application> cannot open the audio device, make sure that it is really available. There can be some trouble with the sound @@ -251,7 +251,7 @@ Here is an example for Russian: </row> <row> <entry>C</entry> - <entry>Cycle through teletext rendering modes (opaque, transparent, inverted opaque, + <entry>Cycle through teletext rendering modes (opaque, transparent, inverted opaque, inverted transparent</entry> </row> <row> diff --git a/DOCS/xml/en/usage.xml b/DOCS/xml/en/usage.xml index bc573a25d7..ea74911b3f 100644 --- a/DOCS/xml/en/usage.xml +++ b/DOCS/xml/en/usage.xml @@ -602,11 +602,11 @@ is specified. <title>MPEG audio Passthrough</title> <para> -Digital TV transmissions (such as DVB and ATSC) and some DVDs usually have +Digital TV transmissions (such as DVB and ATSC) and some DVDs usually have MPEG audio streams (in particular MP2). -Some MPEG hardware decoders such as full-featured DVB cards and DXR2 -adapters can natively decode this format. -<application>MPlayer</application> can be configured to relay the audio data +Some MPEG hardware decoders such as full-featured DVB cards and DXR2 +adapters can natively decode this format. +<application>MPlayer</application> can be configured to relay the audio data without decoding it. </para> diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml index 5d58a9fbb3..d4eda61ae8 100644 --- a/DOCS/xml/en/video.xml +++ b/DOCS/xml/en/video.xml @@ -2007,7 +2007,7 @@ the native OSD feature of DVB cards. <application>MPlayer</application> supports hardware accelerated playback with the Creative DXR2 card. </para> - + <para> First of all you will need properly installed DXR2 drivers. You can find the drivers and installation instructions at the |