Author: diego Date: Sat Jul 23 21:33:08 2011 New Revision: 33893 Log: 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. Modified: trunk/DOCS/man/en/mplayer.1 trunk/DOCS/xml/en/encoding-guide.xml Changes in other areas also in this revision: Modified: trunk/DOCS/xml/cs/encoding-guide.xml trunk/DOCS/xml/de/encoding-guide.xml trunk/DOCS/xml/fr/encoding-guide.xml trunk/DOCS/xml/hu/encoding-guide.xml trunk/DOCS/xml/it/encoding-guide.xml trunk/DOCS/xml/pl/encoding-guide.xml trunk/DOCS/xml/ru/encoding-guide.xml Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Sat Jul 23 21:33:00 2011 (r33892) +++ trunk/DOCS/man/en/mplayer.1 Sat Jul 23 21:33:08 2011 (r33893) @@ -10769,7 +10769,7 @@ Controls the decision performed by b_ada 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 @@ However, this is an experimental option: 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 Modified: trunk/DOCS/xml/en/encoding-guide.xml ============================================================================== --- trunk/DOCS/xml/en/encoding-guide.xml Sat Jul 23 21:33:00 2011 (r33892) +++ trunk/DOCS/xml/en/encoding-guide.xml Sat Jul 23 21:33:08 2011 (r33893) @@ -4332,19 +4332,19 @@ and development advancements, you may ge <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>