From fa1069902caf729ef4d06fb080d51b0326bcfde2 Mon Sep 17 00:00:00 2001 From: ptt Date: Thu, 1 Apr 2010 17:37:13 +0000 Subject: updated table of libavcodec's audio codecs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30981 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/it/encoding-guide.xml | 72 ++++++++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 20 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/it/encoding-guide.xml b/DOCS/xml/it/encoding-guide.xml index e0f1f4da07..dd326c2fa4 100644 --- a/DOCS/xml/it/encoding-guide.xml +++ b/DOCS/xml/it/encoding-guide.xml @@ -1,5 +1,5 @@ - + La codifica con <application>MEncoder</application> @@ -2360,18 +2360,18 @@ tipi. - About encoding parameters and quality: + Riguardo i parameti di codifica e la qualità: - Just because I recommend here does not mean it - should not be used elsewhere. Along with , - is one of the two - libavcodec options that - increases quality the most, and you should always use at least those - two unless the drop in encoding speed is prohibitive (e.g. realtime - encoding). There are many other options to - libavcodec that increase - encoding quality (and decrease encoding speed) but that is beyond - the scope of this document. + Il fatto che qui venga cosigliata non significa che + non si debba usare altrimenti. Insieme con , + è una delle due opzioni di + libavcodec che ottimizzano al + meglio la qualità e sarebbero sempre da utilizzare entrambe a meno che + l'aumento della velocità di codifica sua proibitivo (ad es. per la codifica + in tempo reale (realtime)). Ci sono molte altre opzioni di + libavcodec che aumentano la + qualità (e rallentano la codifica), ma questo non è l'obiettivo di + questa documentaziione. @@ -2569,17 +2569,49 @@ mencoder dvd://2 -o title2.avi -ovc lavc -lavcopts vc Audio codec nameDescription + + ac3 + Dolby Digital (AC-3) + + + adpcm_* + Adaptive PCM formats - see supplementary table + + + flac + Free Lossless Audio Codec (FLAC) + + + g726 + G.726 ADPCM + + + libfaac + Advanced Audio Coding (AAC) - using FAAC + + + libgsm + ETSI GSM 06.10 full rate + + + libgsm_ms + Microsoft GSM + + + libmp3lame + MPEG-1 audio layer 3 (MP3) - using LAME + mp2 - MPEG Layer 2 + MPEG-1 audio layer 2 (MP2) - ac3 - AC-3, AKA Dolby Digital + pcm_* + PCM formats - see supplementary table - adpcm_ima_wav - IMA adaptive PCM (4 bits per sample, 4:1 compression) + roq_dpcm + Id Software RoQ DPCM sonic @@ -2591,15 +2623,15 @@ mencoder dvd://2 -o title2.avi -ovc lavc -lavcopts vc vorbis - Xiph Ogg Vorbis codec + Vorbis wmav1 - Windows Media Audio v1 codec + Windows Media Audio v1 wmav2 - Windows Media Audio v2 codec + Windows Media Audio v2 -- cgit v1.2.3 From a300074bd2cb7c40bf57111aa46ded0ccfc6f286 Mon Sep 17 00:00:00 2001 From: ptt Date: Thu, 1 Apr 2010 17:37:51 +0000 Subject: updated example line for encoding to psp (acodec faac is now libfaac) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30982 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/cs/mencoder.xml | 6 +++--- DOCS/xml/de/mencoder.xml | 2 +- DOCS/xml/en/mencoder.xml | 8 ++++---- DOCS/xml/fr/mencoder.xml | 6 +++--- DOCS/xml/hu/mencoder.xml | 6 +++--- DOCS/xml/it/mencoder.xml | 6 +++--- DOCS/xml/pl/mencoder.xml | 6 +++--- DOCS/xml/ru/mencoder.xml | 6 +++--- DOCS/xml/zh_CN/mencoder.xml | 6 +++--- 9 files changed, 26 insertions(+), 26 deletions(-) (limited to 'DOCS') diff --git a/DOCS/xml/cs/mencoder.xml b/DOCS/xml/cs/mencoder.xml index 19c289d137..3b3ff87f3c 100644 --- a/DOCS/xml/cs/mencoder.xml +++ b/DOCS/xml/cs/mencoder.xml @@ -402,9 +402,9 @@ Budete-li respektovat následující omezení, neměli byste narazit na potíže Enkódování do PSP -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ vstupní.video -o výstupní.psp Poznamenejme, že můžete nastavit jméno videa pomocí diff --git a/DOCS/xml/de/mencoder.xml b/DOCS/xml/de/mencoder.xml index 299aa9f907..90afe5b91b 100644 --- a/DOCS/xml/de/mencoder.xml +++ b/DOCS/xml/de/mencoder.xml @@ -344,7 +344,7 @@ mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ + -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ -lavfopts format=psp \ input.video -o output.psp diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml index 8914d229d1..e866016740 100644 --- a/DOCS/xml/en/mencoder.xml +++ b/DOCS/xml/en/mencoder.xml @@ -401,9 +401,9 @@ You should be safe if you respect the following constraints: encode for PSP -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ input.video -o output.psp Note that you can set the title of the video with @@ -615,7 +615,7 @@ mencoder mf://@list.txt -mf w=800:h=600:fps=25:type=j You can mix different types of images, regardless of the method you use -— individual filenames, wildcard or file with list — provided of +t — individual filenames, wildcard or file with list — provided of course they have the same dimensions. So you can e.g. take title frame from PNG file, and then put a slideshow of your JPEG photos. diff --git a/DOCS/xml/fr/mencoder.xml b/DOCS/xml/fr/mencoder.xml index f147cd1de7..a10ad2101f 100644 --- a/DOCS/xml/fr/mencoder.xml +++ b/DOCS/xml/fr/mencoder.xml @@ -417,9 +417,9 @@ mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:mbd=2:trell:vpass=2 \ Encodage pour PSP -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ entree.video -o sortie.psp Vous pouvez définir le titre de la vidéo avec diff --git a/DOCS/xml/hu/mencoder.xml b/DOCS/xml/hu/mencoder.xml index 8ab02d7a54..aa44999324 100644 --- a/DOCS/xml/hu/mencoder.xml +++ b/DOCS/xml/hu/mencoder.xml @@ -400,9 +400,9 @@ Nyugodt lehetsz, ha a következő korlátokat figyelembe veszed: kódolás PSP-be -mencoder -ofps 30000/1001 -af resample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ bemenet.video -o kimenet.psp Figyelj rá, hogy beállíthatod a videó címét a diff --git a/DOCS/xml/it/mencoder.xml b/DOCS/xml/it/mencoder.xml index 35745d8413..dedd53c31f 100644 --- a/DOCS/xml/it/mencoder.xml +++ b/DOCS/xml/it/mencoder.xml @@ -401,9 +401,9 @@ Dovresti accertarti di rispettare i seguenti vincoli: codificare per PSP -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ input.video -o output.psp Nota che puoi impostare il titolo del video con diff --git a/DOCS/xml/pl/mencoder.xml b/DOCS/xml/pl/mencoder.xml index 3ad695a522..f14583bf38 100644 --- a/DOCS/xml/pl/mencoder.xml +++ b/DOCS/xml/pl/mencoder.xml @@ -387,9 +387,9 @@ Powinieneś byś bezpieczny, jeśli respektujesz poniższe ograniczenia: kodowanie dla PSP -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp:i_certify_that_my_video_stream_does_not_use_b_frames \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ wejściowe.video -o wyjście.psp Możesz też ustawić tytuł filmu dzięki diff --git a/DOCS/xml/ru/mencoder.xml b/DOCS/xml/ru/mencoder.xml index d5376e4e33..e45ee509f1 100644 --- a/DOCS/xml/ru/mencoder.xml +++ b/DOCS/xml/ru/mencoder.xml @@ -394,9 +394,9 @@ Sony PSP, но, в зависимости от ревизии программн Кодирование для PSP -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ input.video -o output.psp Заметьте, что можно задать заголовок видео опцией diff --git a/DOCS/xml/zh_CN/mencoder.xml b/DOCS/xml/zh_CN/mencoder.xml index 81ab1170dc..878e2f4bec 100644 --- a/DOCS/xml/zh_CN/mencoder.xml +++ b/DOCS/xml/zh_CN/mencoder.xml @@ -364,9 +364,9 @@ PSP软件修改，对不同软件限制也许会有不同。 编码到PSP -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp:i_certify_that_my_video_stream_does_not_use_b_frames \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ input.video -o output.psp 注意你可以通过 -- cgit v1.2.3 From 0a49e5e96c87375322be56417109ff12632a0323 Mon Sep 17 00:00:00 2001 From: attila Date: Fri, 2 Apr 2010 17:29:22 +0000 Subject: dont mention base64 about sending attachments. this may (and has) confused people, beside that 99.9% of all MUA will do the right thing here anyways. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30986 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/tech/patches.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DOCS') diff --git a/DOCS/tech/patches.txt b/DOCS/tech/patches.txt index 692666d1a8..dfff16bf85 100644 --- a/DOCS/tech/patches.txt +++ b/DOCS/tech/patches.txt @@ -56,8 +56,8 @@ that your patch will be included. and committed separately. Logical units should stay together, though, i.e. do not send a patch for every file or directory you change. - 9. Send your patch to the mplayer-dev-eng mailing list as a base64-encoded - attachment with the subject line: + 9. Send your patch to the mplayer-dev-eng mailing list as attachment with + the subject line: '[PATCH] very short description of the patch'. In the mail, describe in a few sentences what you change and why. The subject line is very important if you do not want your patch to get -- cgit v1.2.3