Commit 0f752ff4 authored by Ilkka Ollakka's avatar Ilkka Ollakka Committed by Jean-Baptiste Kempf

x264: default b-pyramid to "normal" from X264_BUILD >= 87

libx264 changed default to normal in that build too, also change logic
littebit so b-pyramid selection works better.
parent e941a5df
...@@ -445,7 +445,11 @@ vlc_module_begin () ...@@ -445,7 +445,11 @@ vlc_module_begin ()
B_BIAS_LONGTEXT, false ) B_BIAS_LONGTEXT, false )
change_integer_range( -100, 100 ) change_integer_range( -100, 100 )
#if X264_BUILD >= 78 #if X264_BUILD >= 87
add_string( SOUT_CFG_PREFIX "bpyramid", "normal", NULL, BPYRAMID_TEXT,
BPYRAMID_LONGTEXT, false )
change_string_list( bpyramid_list, bpyramid_list, 0 );
#elif X264_BUILD >= 78
add_string( SOUT_CFG_PREFIX "bpyramid", "none", NULL, BPYRAMID_TEXT, add_string( SOUT_CFG_PREFIX "bpyramid", "none", NULL, BPYRAMID_TEXT,
BPYRAMID_LONGTEXT, false ) BPYRAMID_LONGTEXT, false )
change_string_list( bpyramid_list, bpyramid_list, 0 ); change_string_list( bpyramid_list, bpyramid_list, 0 );
...@@ -930,16 +934,19 @@ static int Open ( vlc_object_t *p_this ) ...@@ -930,16 +934,19 @@ static int Open ( vlc_object_t *p_this )
#if X264_BUILD >= 78 #if X264_BUILD >= 78
psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "bpyramid" ); psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "bpyramid" );
if( strcmp( psz_val, "none" ) ) if( !strcmp( psz_val, "normal" ) )
{ {
if ( !strcmp( psz_val, "strict" ) ) p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NORMAL;
}
else if ( !strcmp( psz_val, "strict" ) )
{ {
p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_STRICT; p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_STRICT;
} else if ( !strcmp( psz_val, "normal" ) )
{
p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NORMAL;
} }
else if ( !strcmp( psz_val, "none" ) )
{
p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
} }
free( psz_val ); free( psz_val );
#else #else
p_sys->param.b_bframe_pyramid = var_GetBool( p_enc, SOUT_CFG_PREFIX "bpyramid" ); p_sys->param.b_bframe_pyramid = var_GetBool( p_enc, SOUT_CFG_PREFIX "bpyramid" );
......
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