sync to x264 r93:

Change the mechanics of option "keyint": Now controls the GOP size directly and allows variable numbers of non-IDR I-frames within a GOP.
Remove option "idrint" and replace it with "keyint_min".
Add option "8x8mv" for the sake of completeness.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14469 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 19 insertions, 6 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 7eeb6b656a..7336162d19 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -7062,11 +7062,11 @@ This selects the quantizer to use for P-frames.
 I- and B-frames are offset from this value by ip_factor and pb_factor, respectively.
 20\-40 is a useful range (default: 26).
 Lower values result in better fidelity, but higher bitrates.
-Note that quantization in H.264 works differently from MPEG-[124].
+Note that quantization in H.264 works differently from MPEG-1/2/4.
 H.264's quantization parameter (QP) is on a logarithmic scale.
 As an example, the bitrate difference between QP=20 and QP=40
 is about a factor of 10.
-Useful quantizers in H.264 tend to be very large compared to MPEG-[124].
+Useful quantizers in H.264 tend to be very large compared to MPEG-1/2/4.
 .
 .TP
 .B pass=<1\-3>
@@ -7118,13 +7118,17 @@ both fast and provide good quality.
 .
 .TP
 .B keyint=<value>
-Sets maximum interval between I-frames.
+Sets maximum interval between IDR-frames (default: 250).
 Larger values save bits, thus improve quality, at the cost of seeking
-precision (default: 250).
+precision.
+Unlike MPEG-1/2/4, H.264 does not suffer from DCT drift with large
+values of keyint.
 .
 .TP
-.B idrint=<value>
-Make each <value> I-frame an IDR-frame (default: 2).
+.B keyint_min=<1\-keyint/2>
+Sets minimum interval between IDR-frames (default: keyint * 0.4).
+If scenecuts appear within this interval, they are still encoded as
+I-frames, but do not start a new GOP.
 In H.264, I-frames do not necessarily bound a closed GOP because it is
 allowable for a P-frame to be predicted from more frames than just the one
 frame before it (also see frameref).
@@ -7290,10 +7294,19 @@ i16x16, i4x4, b16x16, skip, direct.
 See 4x4mv for details.
 .
 .TP
+.B (no)8x8mv
+Use additional macroblock types p16x8, p8x16, p8x8 (default: enabled).
+Without this option, P-frames will use only types
+i16x16, i4x4, p16x16, skip.
+This option is provided for experimentation only.
+It is not recommended to disable 8x8mv in a real encode.
+.
+.TP
 .B (no)4x4mv
 Use additional macroblock types p8x4, p4x8, p4x4 (default: disabled).
 Without this option, P-frames will use only types
 i16x16, i4x4, p16x16, p16x8, p8x16, p8x8, skip.
+Requires 8x8mv.
 .br
 The idea is to find the type and size that best describe a certain area
 of the picture.