Mercurial > mplayer.hg
changeset 17902:578074a74d4e
sync to x264 r476 (subq=7)
| author | lorenm |
|---|---|
| date | Mon, 20 Mar 2006 23:13:37 +0000 |
| parents | 51571591d56f |
| children | b4f7c30423f5 |
| files | DOCS/man/en/mplayer.1 libmpcodecs/ve_x264.c |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Mon Mar 20 22:24:14 2006 +0000 +++ b/DOCS/man/en/mplayer.1 Mon Mar 20 23:13:37 2006 +0000 @@ -8951,7 +8951,7 @@ radius of exhaustive or multi-hexagon motion search (default: 16) . .TP -.B subq=<1\-6> +.B subq=<1\-7> Adjust subpel refinement quality. This parameter controls quality versus speed tradeoffs involved in the motion estimation decision process. @@ -8979,7 +8979,9 @@ candidate macroblock types, before selecting the best type (default). .IPs 6 Enables rate-distortion optimization of macroblock types in -I- and P-frames. (best) +I- and P-frames. +.IPs 6 +Enables rate-distortion optimization of motion vectors and intra modes. (best) .RE .PD 1 .RS @@ -9003,7 +9005,7 @@ .TP .B (no)brdo Enables rate-distortion optimization of macroblock types in B-frames. -Requires subq=6. +Requires subq>=6. . .TP .B (no)bime @@ -9021,7 +9023,7 @@ .IPs 1 enabled only for the final encode (default) .IPs 2 -enabled during all mode decisions (slow, requires subq=6) +enabled during all mode decisions (slow, requires subq>=6) .RE .PD 1 .
--- a/libmpcodecs/ve_x264.c Mon Mar 20 22:24:14 2006 +0000 +++ b/libmpcodecs/ve_x264.c Mon Mar 20 23:13:37 2006 +0000 @@ -184,7 +184,7 @@ {"qblur", &qblur, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL}, {"cplx_blur", &complexity_blur, CONF_TYPE_FLOAT, CONF_RANGE, 0, 999, NULL}, {"zones", &zones, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"subq", &subq, CONF_TYPE_INT, CONF_RANGE, 1, 6, NULL}, + {"subq", &subq, CONF_TYPE_INT, CONF_RANGE, 1, 7, NULL}, {"brdo", &bframe_rdo, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nobrdo", &bframe_rdo, CONF_TYPE_FLAG, 0, 0, 0, NULL}, {"me", &me_method, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},