Commit e48eb142 authored by Ilkka Ollakka's avatar Ilkka Ollakka

x264: remove upper limit for subme-value

subme-value doesn't have any upper-limit in x264.h and libx264 seems to
handle that it doesn't go too high.
parent 37a1d2df
...@@ -289,8 +289,6 @@ static void Close( vlc_object_t * ); ...@@ -289,8 +289,6 @@ static void Close( vlc_object_t * );
#define SUBME_TEXT N_("Subpixel motion estimation and partition decision " \ #define SUBME_TEXT N_("Subpixel motion estimation and partition decision " \
"quality") "quality")
#define SUBME_MAX 9
#define SUBME_LONGTEXT N_( "This parameter controls quality versus speed " \ #define SUBME_LONGTEXT N_( "This parameter controls quality versus speed " \
"tradeoffs involved in the motion estimation decision process " \ "tradeoffs involved in the motion estimation decision process " \
"(lower = quicker and higher = better quality). Range 1 to 9." ) "(lower = quicker and higher = better quality). Range 1 to 9." )
...@@ -584,9 +582,8 @@ vlc_module_begin () ...@@ -584,9 +582,8 @@ vlc_module_begin ()
add_integer( SOUT_CFG_PREFIX "mvrange-thread", -1, NULL, MVRANGE_THREAD_TEXT, add_integer( SOUT_CFG_PREFIX "mvrange-thread", -1, NULL, MVRANGE_THREAD_TEXT,
MVRANGE_THREAD_LONGTEXT, false ) MVRANGE_THREAD_LONGTEXT, false )
add_integer( SOUT_CFG_PREFIX "subme", 5, NULL, SUBME_TEXT, add_integer( SOUT_CFG_PREFIX "subme", 7, NULL, SUBME_TEXT,
SUBME_LONGTEXT, false ) SUBME_LONGTEXT, false )
change_integer_range( 1, SUBME_MAX )
add_obsolete_bool( SOUT_CFG_PREFIX "b-rdo" ) add_obsolete_bool( SOUT_CFG_PREFIX "b-rdo" )
...@@ -913,7 +910,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -913,7 +910,7 @@ static int Open ( vlc_object_t *p_this )
SOUT_CFG_PREFIX "non-deterministic" ); SOUT_CFG_PREFIX "non-deterministic" );
i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "subme" ); i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "subme" );
if( i_val >= 1 && i_val <= SUBME_MAX ) if( i_val >= 1 )
p_sys->param.analyse.i_subpel_refine = i_val; p_sys->param.analyse.i_subpel_refine = i_val;
//TODO: psz_val == NULL ? //TODO: psz_val == NULL ?
......
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