Skip to content

V
vlc-1.1
Commit cdc2a50d authored by Dennis van Amerongen's avatar Dennis van Amerongen
Browse files
Options

* modules/codec/x264.c: Add mvrange option.

parent 128490d9
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 5 deletions
modules/codec/x264.c
View file @ cdc2a50d
...@@ -218,6 +218,10 @@ static void Close( vlc_object_t * ); ...@@ -218,6 +218,10 @@ static void Close( vlc_object_t * );
"Default of 16 is good for most footage, high motion sequences may " \ "Default of 16 is good for most footage, high motion sequences may " \
"benefit from settings between 24 and 32. Range 0 to 64." ) "benefit from settings between 24 and 32. Range 0 to 64." )
#define MVRANGE_TEXT N_("Maximum motion vector length")
#define MVRANGE_LONGTEXT N_( "Maximum motion vector length in pixels. " \
"-1 is automatic, based on level." )
#define SUBME_TEXT N_("Subpixel motion estimation and partition decision " \ #define SUBME_TEXT N_("Subpixel motion estimation and partition decision " \
"quality") "quality")
#if X264_BUILD >= 46 /* r477 */ #if X264_BUILD >= 46 /* r477 */
...@@ -502,6 +506,9 @@ vlc_module_begin(); ...@@ -502,6 +506,9 @@ vlc_module_begin();
change_integer_range( 1, 64 ); change_integer_range( 1, 64 );
#endif #endif
add_integer( SOUT_CFG_PREFIX "mvrange", -1, NULL, MVRANGE_TEXT,
MVRANGE_LONGTEXT, VLC_FALSE );
add_integer( SOUT_CFG_PREFIX "subme", 5, NULL, SUBME_TEXT, add_integer( SOUT_CFG_PREFIX "subme", 5, NULL, SUBME_TEXT,
SUBME_LONGTEXT, VLC_FALSE ); SUBME_LONGTEXT, VLC_FALSE );
change_integer_range( 1, SUBME_MAX ); change_integer_range( 1, SUBME_MAX );
...@@ -609,11 +616,12 @@ static const char *ppsz_sout_options[] = { ...@@ -609,11 +616,12 @@ static const char *ppsz_sout_options[] = {
"cplxblur", "crf", "dct-decimate", "deadzone-inter", "deadzone-intra", "cplxblur", "crf", "dct-decimate", "deadzone-inter", "deadzone-intra",
"deblock", "direct", "direct-8x8", "filter", "fast-pskip", "frameref", "deblock", "direct", "direct-8x8", "filter", "fast-pskip", "frameref",
"interlaced", "ipratio", "keyint", "keyint-min", "level", "loopfilter", "interlaced", "ipratio", "keyint", "keyint-min", "level", "loopfilter",
"me", "merange", "min-keyint", "mixed-refs", "nf", "nr", "partitions", "me", "merange", "min-keyint", "mixed-refs", "mvrange", "nf", "nr",
"pass", "pbratio", "psnr", "qblur", "qp", "qcomp", "qpstep", "qpmax", "partitions", "pass", "pbratio", "psnr", "qblur", "qp", "qcomp",
"qpmin", "qp-max", "qp-min", "quiet", "ratetol", "ref", "scenecut", "qpstep", "qpmax", "qpmin", "qp-max", "qp-min", "quiet", "ratetol",
"sps-id", "ssim", "stats", "subme", "subpel", "tolerance", "trellis", "ref", "scenecut", "sps-id", "ssim", "stats", "subme", "subpel",
"verbose", "vbv-bufsize", "vbv-init", "vbv-maxrate", "weightb", NULL "tolerance", "trellis", "verbose", "vbv-bufsize", "vbv-init",
"vbv-maxrate", "weightb", NULL
}; };
static block_t *Encode( encoder_t *, picture_t * ); static block_t *Encode( encoder_t *, picture_t * );
...@@ -867,6 +875,9 @@ static int Open ( vlc_object_t *p_this ) ...@@ -867,6 +875,9 @@ static int Open ( vlc_object_t *p_this )
p_sys->param.analyse.i_me_range = val.i_int; p_sys->param.analyse.i_me_range = val.i_int;
#endif #endif
var_Get( p_enc, SOUT_CFG_PREFIX "mvrange", &val );
p_sys->param.analyse.i_mv_range = val.i_int;
var_Get( p_enc, SOUT_CFG_PREFIX "direct", &val ); var_Get( p_enc, SOUT_CFG_PREFIX "direct", &val );
if( !strcmp( val.psz_string, "none" ) ) if( !strcmp( val.psz_string, "none" ) )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment