diff options
author | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-16 01:37:32 +0000 |
---|---|---|
committer | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-16 01:37:32 +0000 |
commit | 7bf35998983ffccceefb7747098e20e10191aebb (patch) | |
tree | 55f9aefe1f25466c014b8d80c21ea6893204e265 | |
parent | b7ee4aff724de5fe10115897a584c33f37959e9b (diff) | |
download | mpv-7bf35998983ffccceefb7747098e20e10191aebb.tar.bz2 mpv-7bf35998983ffccceefb7747098e20e10191aebb.tar.xz |
sync to x264 r398.
patch by Guillaume Poirier.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17403 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | DOCS/man/en/mplayer.1 | 14 | ||||
-rw-r--r-- | libmpcodecs/ve_x264.c | 7 |
2 files changed, 21 insertions, 0 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index d14a2c0345..30d210cb38 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -8916,6 +8916,20 @@ enabled during all mode decisions (slow, requires subq=6) .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). diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index e2c68d9282..08b236740a 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -105,6 +105,8 @@ static int bidir_me = 0; 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 @@ m_option_t x264encopts_conf[] = { {"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 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width, 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; |