X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ffake.c;h=282f3ffdf7f6ee73d66dd7e31e9e0272bc879c47;hb=b5c81d3d419e117085c569cbb22e3376f7118134;hp=0a8a21727ed1525df32705c9e8a8dd7bc707ff10;hpb=4f028428053d0342c55deb6ba8b8da114c6a0caa;p=vlc diff --git a/modules/codec/fake.c b/modules/codec/fake.c index 0a8a21727e..282f3ffdf7 100644 --- a/modules/codec/fake.c +++ b/modules/codec/fake.c @@ -25,7 +25,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include @@ -73,48 +78,48 @@ static int FakeCallback( vlc_object_t *, char const *, #define CHROMA_LONGTEXT N_( \ "Force use of a specific chroma for output. Default is I420." ) -static const char *ppsz_deinterlace_type[] = +static const char *const ppsz_deinterlace_type[] = { "deinterlace", "ffmpeg-deinterlace" }; -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_shortname( _("Fake") ); - set_description( _("Fake video decoder") ); - set_capability( "decoder", 1000 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "fake" ); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_shortname( N_("Fake") ) + set_description( N_("Fake video decoder") ) + set_capability( "decoder", 1000 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "fake" ) add_file( "fake-file", "", NULL, FILE_TEXT, - FILE_LONGTEXT, VLC_FALSE ); + FILE_LONGTEXT, false ); add_integer( "fake-file-reload", 0, NULL, RELOAD_TEXT, - RELOAD_LONGTEXT, VLC_FALSE ); + RELOAD_LONGTEXT, false ); add_integer( "fake-width", 0, NULL, WIDTH_TEXT, - WIDTH_LONGTEXT, VLC_TRUE ); + WIDTH_LONGTEXT, true ); add_integer( "fake-height", 0, NULL, HEIGHT_TEXT, - HEIGHT_LONGTEXT, VLC_TRUE ); + HEIGHT_LONGTEXT, true ); add_bool( "fake-keep-ar", 0, NULL, KEEP_AR_TEXT, KEEP_AR_LONGTEXT, - VLC_TRUE ); + true ); add_string( "fake-aspect-ratio", "", NULL, - ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE ); + ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true ); add_bool( "fake-deinterlace", 0, NULL, DEINTERLACE_TEXT, - DEINTERLACE_LONGTEXT, VLC_FALSE ); + DEINTERLACE_LONGTEXT, false ); add_string( "fake-deinterlace-module", "deinterlace", NULL, DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT, - VLC_FALSE ); + false ); change_string_list( ppsz_deinterlace_type, 0, 0 ); add_string( "fake-chroma", "I420", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - VLC_TRUE ); -vlc_module_end(); + true ); +vlc_module_end () struct decoder_sys_t { picture_t *p_image; vlc_mutex_t lock; - vlc_bool_t b_reload; + bool b_reload; mtime_t i_reload; mtime_t i_next; }; @@ -130,7 +135,7 @@ static int OpenDecoder( vlc_object_t *p_this ) video_format_t fmt_in, fmt_out; picture_t *p_image; char *psz_file, *psz_chroma; - vlc_bool_t b_keep_ar; + bool b_keep_ar; int i_aspect = 0; if( p_dec->fmt_in.i_codec != VLC_FOURCC('f','a','k','e') ) @@ -149,6 +154,7 @@ static int OpenDecoder( vlc_object_t *p_this ) if( !psz_file ) { msg_Err( p_dec, "specify a file with --fake-file=..." ); + free( p_dec->p_sys ); return VLC_EGENERIC; } var_AddCallback( p_dec, "fake-file", FakeCallback, p_dec ); @@ -159,10 +165,11 @@ static int OpenDecoder( vlc_object_t *p_this ) val.i_int = var_CreateGetIntegerCommand( p_dec, "fake-file-reload" ); if( val.i_int > 0) { - p_dec->p_sys->b_reload = VLC_TRUE; + p_dec->p_sys->b_reload = true; p_dec->p_sys->i_reload = (mtime_t)(val.i_int * 1000000); p_dec->p_sys->i_next = (mtime_t)(p_dec->p_sys->i_reload + mdate()); } + var_AddCallback( p_dec, "fake-file-reload", FakeCallback , p_dec ); psz_chroma = var_CreateGetString( p_dec, "fake-chroma" ); if( strlen( psz_chroma ) != 4 ) @@ -217,11 +224,13 @@ static int OpenDecoder( vlc_object_t *p_this ) if ( p_image == NULL ) { msg_Err( p_dec, "unable to read image file %s", psz_file ); + free( psz_file ); + free( p_dec->p_sys ); return VLC_EGENERIC; } msg_Dbg( p_dec, "file %s loaded successfully", psz_file ); - if ( psz_file ) free( psz_file ); + free( psz_file ); if ( b_keep_ar ) { @@ -272,7 +281,7 @@ static int OpenDecoder( vlc_object_t *p_this ) } else { - p_old->pf_release( p_old ); + picture_Release( p_old ); } } } @@ -300,7 +309,7 @@ static int OpenDecoder( vlc_object_t *p_this ) p_handler = image_HandlerCreate( p_dec ); p_image = image_Filter( p_handler, p_old, &fmt_out, val.psz_string ); image_HandlerDelete( p_handler ); - if ( val.psz_string != NULL ) free( val.psz_string ); + free( val.psz_string ); if ( p_image == NULL ) { @@ -309,7 +318,7 @@ static int OpenDecoder( vlc_object_t *p_this ) } else { - p_old->pf_release( p_old ); + picture_Release( p_old ); } } @@ -322,7 +331,7 @@ static int OpenDecoder( vlc_object_t *p_this ) p_dec->pf_decode_video = DecodeBlock; p_dec->p_sys->p_image = p_image; - vlc_mutex_init( p_dec, &p_dec->p_sys->lock ); + vlc_mutex_init( &p_dec->p_sys->lock ); return VLC_SUCCESS; } @@ -336,7 +345,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) picture_t *p_pic; if( pp_block == NULL || !*pp_block ) return NULL; - p_pic = p_dec->pf_vout_buffer_new( p_dec ); + p_pic = decoder_NewPicture( p_dec ); if( p_pic == NULL ) { msg_Err( p_dec, "cannot get picture" ); @@ -350,7 +359,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_sys->i_next = (mtime_t)(p_sys->i_reload + mdate()); } vlc_mutex_lock( &p_dec->p_sys->lock ); - vout_CopyPicture( p_dec, p_pic, p_dec->p_sys->p_image ); + picture_Copy( p_pic, p_dec->p_sys->p_image ); vlc_mutex_unlock( &p_dec->p_sys->lock ); p_pic->date = (*pp_block)->i_pts; @@ -371,7 +380,7 @@ static void CloseDecoder( vlc_object_t *p_this ) picture_t *p_image = p_dec->p_sys->p_image; if( p_image != NULL ) - p_image->pf_release( p_image ); + picture_Release( p_image ); vlc_mutex_destroy( &p_dec->p_sys->lock ); free( p_dec->p_sys ); @@ -384,6 +393,7 @@ static int FakeCallback( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(p_this); VLC_UNUSED(oldval); decoder_t *p_dec = (decoder_t *)p_data; if( !strcmp( psz_var, "fake-file" ) ) @@ -419,20 +429,20 @@ static int FakeCallback( vlc_object_t *p_this, char const *psz_var, } p_dec->p_sys->p_image = p_new_image; - p_image->pf_release( p_image ); + picture_Release( p_image ); vlc_mutex_unlock( &p_dec->p_sys->lock ); } else if( !strcmp( psz_var, "fake-file-reload" ) ) { if( newval.i_int > 0) { - p_dec->p_sys->b_reload = VLC_TRUE; + p_dec->p_sys->b_reload = true; p_dec->p_sys->i_reload = (mtime_t)(newval.i_int * 1000000); p_dec->p_sys->i_next = (mtime_t)(p_dec->p_sys->i_reload + mdate()); } else { - p_dec->p_sys->b_reload = VLC_FALSE; + p_dec->p_sys->b_reload = false; } }