diff options
Diffstat (limited to 'DOCS/xml/en')
-rw-r--r-- | DOCS/xml/en/codecs.xml | 24 | ||||
-rw-r--r-- | DOCS/xml/en/containers.xml | 2 | ||||
-rw-r--r-- | DOCS/xml/en/encoding-guide.xml | 36 | ||||
-rw-r--r-- | DOCS/xml/en/usage.xml | 20 | ||||
-rw-r--r-- | DOCS/xml/en/video.xml | 2 |
5 files changed, 42 insertions, 42 deletions
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 3e45b58e10..937b0ec15e 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -359,11 +359,11 @@ satisfied the requirements for <systemitem class="library">x264</systemitem>. Windows Media Audio 9 (WMAv3) (using DMO DLL) </para></listitem> <listitem><para> - AC3 Dolby audio (<emphasis role="bold">native</emphasis> code, with + AC-3 Dolby audio (<emphasis role="bold">native</emphasis> code, with MMX/SSE/3DNow! optimization) </para></listitem> <listitem><para> - AC3 passing through sound card hardware + AC-3 passing through sound card hardware </para></listitem> <listitem><para> AAC @@ -372,7 +372,7 @@ satisfied the requirements for <systemitem class="library">x264</systemitem>. Ogg Vorbis audio codec (<emphasis role="bold">native</emphasis> library) </para></listitem> <listitem><para> - RealAudio: DNET (low bitrate AC3), Cook, Sipro and ATRAC3 + RealAudio: DNET (low bitrate AC-3), Cook, Sipro and ATRAC3 </para></listitem> <listitem><para> QuickTime: Qualcomm and QDesign audio codecs @@ -395,17 +395,17 @@ satisfied the requirements for <systemitem class="library">x264</systemitem>. <!-- ********** --> <sect2 id="swac3"> -<title>Software AC3 decoding</title> +<title>Software AC-3 decoding</title> <para> -This is the default decoder used for files with AC3 audio. +This is the default decoder used for files with AC-3 audio. </para> <para> -The AC3 decoder can create audio output mixes for 2, 4, or 6 speakers. +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 AC3 channels to the sound driver, allowing for full "surround -sound" experience without the external AC3 decoder required to use the +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. </para> @@ -415,7 +415,7 @@ channels. Use <option>-channels 2</option> for a stereo downmix. For a 4 channel downmix (Left Front, Right Front, Left Surround and Right Surround outputs), use <option>-channels 4</option>. In this case, any center channel will be mixed equally to the front channels. -<option>-channels 6</option> will output all the AC3 channels as they are +<option>-channels 6</option> will output all the AC-3 channels as they are encoded - in the order Left, Right, Left Surround, Right Surround, Center and LFE. </para> @@ -436,12 +436,12 @@ also supposed to work). <!-- ********** --> <sect2 id="hwac3"> -<title>Hardware AC3 decoding</title> +<title>Hardware AC-3 decoding</title> <para> -You need an AC3 capable sound card, with digital out (S/PDIF). The card's +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 AC3 decoder to the S/PDIF output, and use the <option>-ac +your AC-3 decoder to the S/PDIF output, and use the <option>-ac hwac3</option> 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. diff --git a/DOCS/xml/en/containers.xml b/DOCS/xml/en/containers.xml index 4f6efcd471..352e99dae2 100644 --- a/DOCS/xml/en/containers.xml +++ b/DOCS/xml/en/containers.xml @@ -61,7 +61,7 @@ MPEG files come in different guises: <listitem><para> VOB: This is the MPEG file format on <emphasis role="bold">DVDs</emphasis>. It is the same as MPG, plus the capability to contain subtitles or non-MPEG - (AC3) audio. It contains encoded MPEG-2 video and usually AC3 audio, but DTS, + (AC-3) audio. It contains encoded MPEG-2 video and usually AC-3 audio, but DTS, MP2 and uncompressed LPCM are allowed, too. <emphasis role="bold">Read the <link linkend="dvd">DVD</link> section</emphasis>! </para></listitem> diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml index 0141e4dba0..fab2e12ab1 100644 --- a/DOCS/xml/en/encoding-guide.xml +++ b/DOCS/xml/en/encoding-guide.xml @@ -1517,14 +1517,14 @@ to get a list of supported codecs. <para> Audio is a much simpler problem to solve: if you care about quality, just leave it as is. -Even AC3 5.1 streams are at most 448Kbit/s, and they are worth every bit. +Even AC-3 5.1 streams are at most 448Kbit/s, and they are worth every bit. You might be tempted to transcode the audio to high quality Vorbis, but -just because you do not have an A/V receiver for AC3 pass-through today +just because you do not have an A/V receiver for AC-3 pass-through today does not mean you will not have one tomorrow. Future-proof your DVD rips by -preserving the AC3 stream. -You can keep the AC3 stream either by copying it directly into the video +preserving the AC-3 stream. +You can keep the AC-3 stream either by copying it directly into the video stream <link linkend="menc-feat-mpeg4">during the encoding</link>. -You can also extract the AC3 stream in order to mux it into containers such +You can also extract the AC-3 stream in order to mux it into containers such as NUT or Matroska. <screen> mplayer <replaceable>source_file.vob</replaceable> -aid 129 -dumpaudio -dumpfile <replaceable>sound.ac3</replaceable> @@ -1569,7 +1569,7 @@ are discontinuities/splices where there are missing or extra audio frames. The correct way to handle this kind of problem is to insert silence or cut audio at these points. However <application>MPlayer</application> cannot do that, so if you -demux the AC3 audio and encode it with a separate app (or dump it to PCM with +demux the AC-3 audio and encode it with a separate app (or dump it to PCM with <application>MPlayer</application>), the splices will be left incorrect and the only way to correct them is to drop/dup video frames at the splice. @@ -1731,7 +1731,7 @@ limitations: Unfortunately, the most efficient codec, Vorbis, does not meet either of these requirements. Therefore, if you plan to store your movie in AVI, you will have to - use a less efficient codec such as MP3 or AC3. + use a less efficient codec such as MP3 or AC-3. </para></listitem> </orderedlist> @@ -2600,7 +2600,7 @@ mencoder dvd://2 -o <replaceable>title2.avi</replaceable> -ovc lavc -lavcopts vc </row> <row> <entry>ac3</entry> - <entry>AC3, AKA Dolby Digital</entry> + <entry>AC-3, AKA Dolby Digital</entry> </row> <row> <entry>adpcm_ima_wav</entry> @@ -2635,7 +2635,7 @@ The first column contains the codec names that should be passed after the </para> <informalexample><para> -An example with AC3 compression: +An example with AC-3 compression: <screen> mencoder dvd://2 -o <replaceable>title2.avi</replaceable> -oac lavc -lavcopts acodec=ac3 -ovc copy </screen> @@ -4746,7 +4746,7 @@ compliant. <entry>MPEG-2</entry> <entry>9800 kbps</entry> <entry>48000 Hz</entry> - <entry>AC3,PCM</entry> + <entry>AC-3,PCM</entry> <entry>1536 kbps (max)</entry> <entry>30000/1001, 24000/1001</entry> <entry>4:3, 16:9 (only for 720x480)</entry> @@ -4759,7 +4759,7 @@ compliant. <entry>MPEG-1</entry> <entry>1856 kbps</entry> <entry>48000 Hz</entry> - <entry>AC3,PCM</entry> + <entry>AC-3,PCM</entry> <entry>1536 kbps (max)</entry> <entry>30000/1001, 24000/1001</entry> <entry>4:3, 16:9</entry> @@ -4792,7 +4792,7 @@ compliant. <entry>MPEG-2</entry> <entry>9800 kbps</entry> <entry>48000 Hz</entry> - <entry>MP2,AC3,PCM</entry> + <entry>MP2,AC-3,PCM</entry> <entry>1536 kbps (max)</entry> <entry>25</entry> <entry>4:3, 16:9 (only for 720x576)</entry> @@ -4803,7 +4803,7 @@ compliant. <entry>MPEG-1</entry> <entry>1856 kbps</entry> <entry>48000 Hz</entry> - <entry>MP2,AC3,PCM</entry> + <entry>MP2,AC-3,PCM</entry> <entry>1536 kbps (max)</entry> <entry>25</entry> <entry>4:3, 16:9</entry> @@ -5169,7 +5169,7 @@ support it too well. <para> For DVD audio, <systemitem class="library">libavcodec</systemitem>'s -AC3 codec is used. +AC-3 codec is used. </para> @@ -5255,10 +5255,10 @@ keyint=18:vstrict=0:acodec=ac3:abitrate=192:aspect=16/9 -ofps 30000/1001 \ <sect3 id="menc-feat-vcd-dvd-all-pal-ac3-copy"> -<title>PAL AVI Containing AC3 Audio to DVD</title> +<title>PAL AVI Containing AC-3 Audio to DVD</title> <para> -If the source already has AC3 audio, use -oac copy instead of re-encoding it. +If the source already has AC-3 audio, use -oac copy instead of re-encoding it. <screen> mencoder -oac copy -ovc lavc -of mpeg -mpegopts format=dvd:tsaf \ -vf scale=720:576,harddup -ofps 25 \ @@ -5270,10 +5270,10 @@ keyint=15:vstrict=0:aspect=16/9 -o <replaceable>movie.mpg</replaceable> <replace <sect3 id="menc-feat-vcd-dvd-all-ntsc-ac3-copy"> -<title>NTSC AVI Containing AC3 Audio to DVD</title> +<title>NTSC AVI Containing AC-3 Audio to DVD</title> <para> -If the source already has AC3 audio, and is NTSC @ 24000/1001 fps: +If the source already has AC-3 audio, and is NTSC @ 24000/1001 fps: <screen> mencoder -oac copy -ovc lavc -of mpeg -mpegopts format=dvd:tsaf:telecine \ -vf scale=720:480,harddup -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:\ diff --git a/DOCS/xml/en/usage.xml b/DOCS/xml/en/usage.xml index f337b6507f..7a19fcdccd 100644 --- a/DOCS/xml/en/usage.xml +++ b/DOCS/xml/en/usage.xml @@ -541,10 +541,10 @@ explanation. <sect3 id="advaudio-surround-passthrough"> -<title>AC3/DTS Passthrough</title> +<title>AC-3/DTS Passthrough</title> <para> -DVDs usually have surround audio encoded in AC3 (Dolby Digital) or DTS +DVDs usually have surround audio encoded in AC-3 (Dolby Digital) or DTS (Digital Theater System) format. Some modern audio equipment is capable of decoding these formats internally. <application>MPlayer</application> can be configured to relay the audio data without decoding it. This will only work if @@ -552,7 +552,7 @@ you have a S/PDIF (Sony/Philips Digital Interface) jack in your sound card. </para> <para> -If your audio equipment can decode both AC3 and DTS, you can safely enable +If your audio equipment can decode both AC-3 and DTS, you can safely enable passthrough for both formats. Otherwise, enable passthrough for only the format your equipment supports. </para> @@ -560,13 +560,13 @@ your equipment supports. <itemizedlist> <title>To enable passthrough on the command line:</title> <listitem><para> - For AC3 only, use <option>-ac hwac3</option> + For AC-3 only, use <option>-ac hwac3</option> </para></listitem> <listitem><para> For DTS only, use <option>-ac hwdts</option> </para></listitem> <listitem><para> - For both AC3 and DTS, use <option>-afm hwac3</option> + For both AC-3 and DTS, use <option>-afm hwac3</option> </para></listitem> </itemizedlist> @@ -574,13 +574,13 @@ your equipment supports. <title>To enable passthrough in the <application>MPlayer</application> configuration file: </title> <listitem><para> - For AC3 only, use <option>ac=hwac3,</option> + For AC-3 only, use <option>ac=hwac3,</option> </para></listitem> <listitem><para> For DTS only, use <option>ac=hwdts,</option> </para></listitem> <listitem><para> - For both AC3 and DTS, use <option>afm=hwac3</option> + For both AC-3 and DTS, use <option>afm=hwac3</option> </para></listitem> </itemizedlist> @@ -588,7 +588,7 @@ your equipment supports. Note that there is a comma (",") at the end of <option>ac=hwac3,</option> and <option>ac=hwdts,</option>. This will make <application>MPlayer</application> fall back on the codecs it normally uses when -playing a file that does not have AC3 or DTS audio. +playing a file that does not have AC-3 or DTS audio. <option>afm=hwac3</option> does not need a comma; <application>MPlayer</application> will fall back anyway when an audio family is specified. @@ -708,7 +708,7 @@ audio outputs are often muted and set to zero volume by default. <para> Unfortunately, there is no standard for how channels are ordered. The orders -listed below are those of AC3 and are fairly typical; try them and see if your +listed below are those of AC-3 and are fairly typical; try them and see if your source matches. Channels are numbered starting with 0. <orderedlist spacing="compact"> @@ -996,7 +996,7 @@ downmixing. Here is a way to downmix PCM using <option>pan</option>: since we only care about the output of the first two channels, we only need to make two sets; the remaining four sets can be omitted. Beware that not all multichannel audio files have the same channel order! This example - demonstrates downmixing a file with the same channels as AC3 5.1: + demonstrates downmixing a file with the same channels as AC-3 5.1: <programlisting> 0 - front left 1 - front right diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml index fb84c14ea8..48ba322dc5 100644 --- a/DOCS/xml/en/video.xml +++ b/DOCS/xml/en/video.xml @@ -2116,7 +2116,7 @@ problems, or DVD subtitle problems, give <option>:sync</option> a try. <varlistentry> <term><option>-ac hwac3</option></term> <listitem><para> - The em8300 supports playing back AC3 audio (surround sound) through the + The em8300 supports playing back AC-3 audio (surround sound) through the digital audio output of the card. See the <option>-ao oss</option> option above, it must be used to specify the DXR3's output instead of a sound card. </para></listitem> |