RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity

sync to x264 r476 (subq=7)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17903 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
lorenm 2006-03-20 23:13:37 +00:00
parent 2857c2e4d4
commit 5283b5beef
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DOCS/man/en/mplayer.1
View File

@ -8951,7 +8951,7 @@ exhaustive search (very slow, and no better than 3)
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 @@ Runs best quality quarterpixel precision motion estimation on all
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 @@ Requires frameref>1.
.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 @@ disabled
.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
.

2
libmpcodecs/ve_x264.c
View File

@ -184,7 +184,7 @@ m_option_t x264encopts_conf[] = {
{"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},