Mercurial > mplayer.hg

changeset 33805:acca18850841

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manual: fix description of b_pyramid x264 option x264 now has several b_pyramid modes instead of just one. Describe the modes and adapt usage examples. Fixes Bugzilla #1725.
author diego
date Sat, 23 Jul 2011 19:33:08 +0000
parents 254e56b1e39d
children 8c31fd7b9a08
files DOCS/man/en/mplayer.1 DOCS/xml/cs/encoding-guide.xml DOCS/xml/de/encoding-guide.xml DOCS/xml/en/encoding-guide.xml DOCS/xml/fr/encoding-guide.xml DOCS/xml/hu/encoding-guide.xml DOCS/xml/it/encoding-guide.xml DOCS/xml/pl/encoding-guide.xml DOCS/xml/ru/encoding-guide.xml
diffstat 9 files changed, 36 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Sat Jul 23 19:33:00 2011 +0000
+++ b/DOCS/man/en/mplayer.1	Sat Jul 23 19:33:08 2011 +0000
@@ -10769,7 +10769,7 @@
 A higher b_bias produces more B-frames (default: 0).
 .
 .TP
-.B (no)b_pyramid
+.B b_pyramid=<normal|strict|none>
 Allows B-frames to be used as references for predicting other frames.
 For example, consider 3 consecutive B-frames: I0 B1 B2 B3 P4.
 Without this option, B-frames follow the same pattern as MPEG-[124].
@@ -10784,6 +10784,17 @@
 may not always help.
 Requires bframes >= 2.
 Disadvantage: increases decoding delay to 2 frames.
+.PD 0
+.RSs
+.IPs normal
+Allow B-frames as references as described above (not Blu-ray compatible).
+.IPs strict
+Disallow P-frames referencing B-frames. Gives worse compression, but is
+required for Blu-ray compatibility.
+.IPs "none\ "
+Disable using B-frames as references.
+.RE
+.PD 1
 .
 .TP
 .B (no)deblock
--- a/DOCS/xml/cs/encoding-guide.xml	Sat Jul 23 19:33:00 2011 +0000
+++ b/DOCS/xml/cs/encoding-guide.xml	Sat Jul 23 19:33:08 2011 +0000
@@ -4189,19 +4189,19 @@
 <tbody>
 <row>
   <entry>Velmi vysoká kvalita</entry>
-  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>6</entry>
   <entry>0</entry>
 </row>
 <row>
   <entry>Vysoká kvalita</entry>
-  <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>13</entry>
   <entry>-0.89</entry>
 </row>
 <row>
   <entry>Rychlé enkódování</entry>
-  <entry><option>subq=4:bframes=2:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=4:bframes=2:b_pyramid=normal:weight_b</option></entry>
   <entry>17</entry>
   <entry>-1.48</entry>
 </row>
--- a/DOCS/xml/de/encoding-guide.xml	Sat Jul 23 19:33:00 2011 +0000
+++ b/DOCS/xml/de/encoding-guide.xml	Sat Jul 23 19:33:08 2011 +0000
@@ -4578,19 +4578,19 @@
             <tbody>
               <row>
                 <entry>Sehr hohe Qualität</entry>
-                <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid:weight_b</option></entry>
+                <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid=normal:weight_b</option></entry>
                 <entry>6fps</entry>
                 <entry>0dB</entry>
               </row>
               <row>
                 <entry>Hohe Qualität</entry>
-                <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b</option></entry>
+                <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid=normal:weight_b</option></entry>
                 <entry>13fps</entry>
                 <entry>-0.89dB</entry>
               </row>
               <row>
                 <entry>Schnell</entry>
-                <entry><option>subq=4:bframes=2:b_pyramid:weight_b</option></entry>
+                <entry><option>subq=4:bframes=2:b_pyramid=normal:weight_b</option></entry>
                 <entry>17fps</entry>
                 <entry>-1.48dB</entry>
               </row>
--- a/DOCS/xml/en/encoding-guide.xml	Sat Jul 23 19:33:00 2011 +0000
+++ b/DOCS/xml/en/encoding-guide.xml	Sat Jul 23 19:33:08 2011 +0000
@@ -4332,19 +4332,19 @@
 <tbody>
 <row>
   <entry>Very high quality</entry>
-  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>6fps</entry>
   <entry>0dB</entry>
 </row>
 <row>
   <entry>High quality</entry>
-  <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>13fps</entry>
   <entry>-0.89dB</entry>
 </row>
 <row>
   <entry>Fast</entry>
-  <entry><option>subq=4:bframes=2:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=4:bframes=2:b_pyramid=normal:weight_b</option></entry>
   <entry>17fps</entry>
   <entry>-1.48dB</entry>
 </row>
--- a/DOCS/xml/fr/encoding-guide.xml	Sat Jul 23 19:33:00 2011 +0000
+++ b/DOCS/xml/fr/encoding-guide.xml	Sat Jul 23 19:33:08 2011 +0000
@@ -4206,19 +4206,19 @@
 <tbody>
 <row>
   <entry>Très haute qualité</entry>
-  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>6</entry>
   <entry>0dB</entry>
 </row>
 <row>
   <entry>Haute qualité</entry>
-  <entry><option>subq=5:partitions=all:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=5:partitions=all:8x8dct:frameref=2:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>13</entry>
   <entry>-0.89dB</entry>
 </row>
 <row>
   <entry>Rapide</entry>
-  <entry><option>subq=4:bframes=2:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=4:bframes=2:b_pyramid=normal:weight_b</option></entry>
   <entry>17</entry>
   <entry>-1.48dB</entry>
 </row>
--- a/DOCS/xml/hu/encoding-guide.xml	Sat Jul 23 19:33:00 2011 +0000
+++ b/DOCS/xml/hu/encoding-guide.xml	Sat Jul 23 19:33:08 2011 +0000
@@ -4294,19 +4294,19 @@
 <tbody>
 <row>
   <entry>Nagyon jó minőség</entry>
-  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>6fps</entry>
   <entry>0dB</entry>
 </row>
 <row>
   <entry>Jó minőség</entry>
-  <entry><option>subq=5:partitions=all:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=5:partitions=all:8x8dct:frameref=2:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>13fps</entry>
   <entry>-0.89dB</entry>
 </row>
 <row>
   <entry>Gyors</entry>
-  <entry><option>subq=4:bframes=2:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=4:bframes=2:b_pyramid=normal:weight_b</option></entry>
   <entry>17fps</entry>
   <entry>-1.48dB</entry>
 </row>
--- a/DOCS/xml/it/encoding-guide.xml	Sat Jul 23 19:33:00 2011 +0000
+++ b/DOCS/xml/it/encoding-guide.xml	Sat Jul 23 19:33:08 2011 +0000
@@ -4135,19 +4135,19 @@
 <tbody>
 <row>
   <entry>Very high quality</entry>
-  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>6fps</entry>
   <entry>0dB</entry>
 </row>
 <row>
   <entry>High quality</entry>
-  <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>13fps</entry>
   <entry>-0.89dB</entry>
 </row>
 <row>
   <entry>Fast</entry>
-  <entry><option>subq=4:bframes=2:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=4:bframes=2:b_pyramid=normal:weight_b</option></entry>
   <entry>17fps</entry>
   <entry>-1.48dB</entry>
 </row>
--- a/DOCS/xml/pl/encoding-guide.xml	Sat Jul 23 19:33:00 2011 +0000
+++ b/DOCS/xml/pl/encoding-guide.xml	Sat Jul 23 19:33:08 2011 +0000
@@ -4297,19 +4297,19 @@
 <tbody>
 <row>
   <entry>Very high quality</entry>
-  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>6fps</entry>
   <entry>0dB</entry>
 </row>
 <row>
   <entry>High quality</entry>
-  <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>13fps</entry>
   <entry>-0.89dB</entry>
 </row>
 <row>
   <entry>Fast</entry>
-  <entry><option>subq=4:bframes=2:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=4:bframes=2:b_pyramid=normal:weight_b</option></entry>
   <entry>17fps</entry>
   <entry>-1.48dB</entry>
 </row>
--- a/DOCS/xml/ru/encoding-guide.xml	Sat Jul 23 19:33:00 2011 +0000
+++ b/DOCS/xml/ru/encoding-guide.xml	Sat Jul 23 19:33:08 2011 +0000
@@ -4474,19 +4474,19 @@
 <tbody>
 <row>
   <entry>Очень высокое качество</entry>
-  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=6:partitions=all:8x8dct:me=umh:frameref=5:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>6fps</entry>
   <entry>0дБ</entry>
 </row>
 <row>
   <entry>Высокое качество</entry>
-  <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=5:8x8dct:frameref=2:bframes=3:b_pyramid=normal:weight_b</option></entry>
   <entry>13fps</entry>
   <entry>-0.89дБ</entry>
 </row>
 <row>
   <entry>Быстро</entry>
-  <entry><option>subq=4:bframes=2:b_pyramid:weight_b</option></entry>
+  <entry><option>subq=4:bframes=2:b_pyramid=normal:weight_b</option></entry>
   <entry>17fps</entry>
   <entry>-1.48дБ</entry>
 </row>