[MPlayer-dev-eng] [PATCH] synch to new x264 revision

[Nico Sabbi]

Jeff Clagg wrote:

>Adds support for a new subpel quality refinement option in x264. Also,
>fixes a wrongly documented option (qcompress==>qcomp) in the x264 section
>of the manpage.
>  
>
>------------------------------------------------------------------------
>
>Index: libmpcodecs/ve_x264.c
>===================================================================
>RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v
>retrieving revision 1.4
>diff -u -r1.4 ve_x264.c
>--- libmpcodecs/ve_x264.c	18 Sep 2004 10:10:58 -0000	1.4
>+++ libmpcodecs/ve_x264.c	22 Sep 2004 09:06:59 -0000
>@@ -82,6 +82,7 @@
> static float qcomp = 0.6;
> static float qblur = 0.5;
> static char *rc_eq = "(tex^qComp)*(avgTex^(1-qComp))";
>+static int subq = 1;
> static int psnr = 0;
> static int log_level = 2;
> 
>@@ -110,6 +111,7 @@
>     {"rc_eq", &rc_eq, CONF_TYPE_STRING, 0, 0, 0, NULL},
>     {"qcomp", &qcomp, CONF_TYPE_FLOAT, CONF_RANGE, 0, 1, NULL},
>     {"qblur", &qblur, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
>+    {"subq", &subq, CONF_TYPE_INT, CONF_RANGE, 0, 5, NULL},
>     {"psnr", &psnr, CONF_TYPE_FLAG, 0, 0, 1, NULL},
>     {"log", &log_level, CONF_TYPE_INT, CONF_RANGE, -1, 3, NULL},
>     {NULL, NULL, 0, 0, 0, 0, NULL}
>@@ -144,6 +146,7 @@
>     mod->param.rc.psz_rc_eq = rc_eq;
>     mod->param.rc.f_qcompress = qcomp;
>     mod->param.rc.f_qblur = qblur;
>+    mod->param.analyse.i_subpel_refine = subq;
>     mod->param.rc.psz_stat_out = passtmpfile;
>     mod->param.rc.psz_stat_in = passtmpfile;
>     if((pass & 2) && bitrate <= 0)
>Index: DOCS/man/en/mplayer.1
>===================================================================
>RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
>retrieving revision 1.732
>diff -u -r1.732 mplayer.1
>--- DOCS/man/en/mplayer.1	21 Sep 2004 19:50:54 -0000	1.732
>+++ DOCS/man/en/mplayer.1	22 Sep 2004 09:07:06 -0000
>@@ -6832,7 +6832,7 @@
> The first pass saves statistics.
> .
> .TP
>-.B qcompress=<0\-1>
>+.B qcomp=<0\-1>
> quantizer compression (default: 0.6).
> This affects the ratecontrol: a lower value makes the
> bitrate more constant, while a higher value makes the quantization parameter
>@@ -6868,6 +6868,25 @@
> .REss
> .
> .TP
>+.B subq=<0\-5>
>+Adjust subpel refinement quality.
>+This parameter controls quality versus speed tradeoffs involved in the motion
>+estimation decision process.
>+.RSs
>+0: halfpel only
>+.br
>+1: 1 iteration of qpel on the winning candidate (default)
>+.br
>+2: 2 iterations of qpel on the winning candidate
>+.br
>+3: halfpel on all MB types, qpel on the winner
>+.br
>+4: qpel on all
>+.br
>+5: more iterations of qpel
>+.REss
>+.
>+.TP
> .B psnr\ \ \ 
> Print signal-to-noise ratio statistics.
> .
>  
>
>------------------------------------------------------------------------
>
>  
>

can you write some docs about high quality settings, please?
I made some test using only the bitrate parameter but I wasn't very 
impressed,
except that I expected much lower speed  than the 12 fps I obtained.

Thanks,
       Nico