changeset 17402:5a5a351734f2

sync to x264 r398. patch by Guillaume Poirier.

--- a/DOCS/man/en/mplayer.1	Sun Jan 15 22:00:53 2006 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Jan 16 01:37:32 2006 +0000
@@ -8916,6 +8916,20 @@
 .PD 1
 .
 .TP
+.B (no)fast_pskip
+Performs early skip detection in P-frames (default: enabled).
+This usually improves speed at no cost, but it can sometimes produce
+artifacts in areas with no details, like sky.
+.
+.TP
+.B nr=<0\-100000>
+Noise reduction, 0 means disabled.
+100\-1000 is a useful range for typical content, but you may want to turn it
+up a bit more for very noisy content (default: 0).
+Given its small impact on speed, you might want to prefer to use this over
+filtering noise away with video filters like denoise3d or hqdn3d.
+.
+.TP
 .B chroma_qp_offset=<-12\-12>
 Use a different quantizer for chroma as compared to luma.
 Useful values are in the range <-2\-2> (default: 0).

--- a/libmpcodecs/ve_x264.c	Sun Jan 15 22:00:53 2006 +0000
+++ b/libmpcodecs/ve_x264.c	Mon Jan 16 01:37:32 2006 +0000
@@ -105,6 +105,8 @@
 static int me_method = 2;
 static int me_range = 16;
 static int trellis = 1;
+static int fast_pskip = 1;
+static int noise_reduction = 0;
 static int threads = 1;
 static int level_idc = 51;
 static int psnr = 0;
@@ -190,6 +192,9 @@
     {"me", &me_method, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
     {"me_range", &me_range, CONF_TYPE_INT, CONF_RANGE, 4, 64, NULL},
     {"trellis", &trellis, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
+    {"fast_pskip", &fast_pskip, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+    {"nofast_pskip", &fast_pskip, CONF_TYPE_FLAG, 0, 0, 0, NULL},
+    {"nr", &noise_reduction, CONF_TYPE_INT, CONF_RANGE, 0, 100000, NULL},
     {"level_idc", &level_idc, CONF_TYPE_INT, CONF_RANGE, 10, 51, NULL},
     {"threads", &threads, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
     {"psnr", &psnr, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@@ -299,6 +304,8 @@
     mod->param.analyse.b_chroma_me = chroma_me;
     mod->param.analyse.b_mixed_references = mixed_references;
     mod->param.analyse.i_trellis = trellis;
+    mod->param.analyse.b_fast_pskip = fast_pskip;
+    mod->param.analyse.i_noise_reduction = noise_reduction;
     mod->param.analyse.b_bframe_rdo = bframe_rdo;
 
     mod->param.i_width = width;