X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fmosaic_bridge.c;h=d071189f502ece60dd5568aaadbc31fbfd3fe3af;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=e1fe2942c0ae004750d6706dcca8fb6a5bddf638;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c index e1fe2942c0..d071189f50 100644 --- a/modules/stream_out/mosaic_bridge.c +++ b/modules/stream_out/mosaic_bridge.c @@ -25,19 +25,21 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include +#include +#include #include #include #include +#include #include #include +#include #include "../video_filter/mosaic.h" @@ -58,43 +60,15 @@ struct sout_stream_sys_t int i_chroma; /* force image format chroma */ - filter_t **pp_vfilters; - int i_vfilters; + filter_chain_t *p_vf2; }; -#define PICTURE_RING_SIZE 4 struct decoder_owner_sys_t { - picture_t *pp_pics[PICTURE_RING_SIZE]; - /* Current format in use by the output */ video_format_t video; }; -typedef void (* pf_release_t)( picture_t * ); -static void ReleasePicture( picture_t *p_pic ) -{ - p_pic->i_refcount--; - - if ( p_pic->i_refcount <= 0 ) - { - if ( p_pic->p_sys != NULL ) - { - pf_release_t pf_release = (pf_release_t)p_pic->p_sys; - p_pic->p_sys = NULL; - pf_release( p_pic ); - } - else - { - if( p_pic ) - { - free( p_pic->p_data_orig ); - free( p_pic ); - } - } - } -} - /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -106,17 +80,25 @@ static int Send( sout_stream_t *, sout_stream_id_t *, block_t * ); inline static void video_del_buffer_decoder( decoder_t *, picture_t * ); inline static void video_del_buffer_filter( filter_t *, picture_t * ); -static void video_del_buffer( picture_t * ); inline static picture_t *video_new_buffer_decoder( decoder_t * ); inline static picture_t *video_new_buffer_filter( filter_t * ); static picture_t *video_new_buffer( vlc_object_t *, decoder_owner_sys_t *, - es_format_t *, void (*)( picture_t * ) ); + es_format_t * ); static void video_link_picture_decoder( decoder_t *, picture_t * ); static void video_unlink_picture_decoder( decoder_t *, picture_t * ); -static int MosaicBridgeCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); + +static int HeightCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int WidthCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int alphaCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int xCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int yCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); /***************************************************************************** * Module descriptor @@ -144,33 +126,50 @@ static int MosaicBridgeCallback( vlc_object_t *, char const *, "Force the use of a specific chroma. Use YUVA if you're planning " \ "to use the Alphamask or Bluescreen video filter." ) +#define ALPHA_TEXT N_("Transparency") +#define ALPHA_LONGTEXT N_( \ + "Transparency of the mosaic picture." ) + +#define X_TEXT N_("X offset") +#define X_LONGTEXT N_( \ + "X coordinate of the upper left corner in the mosaic if non negative." ) + +#define Y_TEXT N_("Y offset") +#define Y_LONGTEXT N_( \ + "Y coordinate of the upper left corner in the mosaic if non negative." ) + #define CFG_PREFIX "sout-mosaic-bridge-" -vlc_module_begin(); - set_shortname( _( "Mosaic bridge" ) ); - set_description(_("Mosaic bridge stream output") ); - set_capability( "sout stream", 0 ); - add_shortcut( "mosaic-bridge" ); +vlc_module_begin () + set_shortname( N_( "Mosaic bridge" ) ) + set_description(N_("Mosaic bridge stream output") ) + set_capability( "sout stream", 0 ) + add_shortcut( "mosaic-bridge" ) add_string( CFG_PREFIX "id", "Id", NULL, ID_TEXT, ID_LONGTEXT, - false ); + false ) add_integer( CFG_PREFIX "width", 0, NULL, WIDTH_TEXT, - WIDTH_LONGTEXT, true ); + WIDTH_LONGTEXT, true ) add_integer( CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT, - HEIGHT_LONGTEXT, true ); + HEIGHT_LONGTEXT, true ) add_string( CFG_PREFIX "sar", "1:1", NULL, RATIO_TEXT, - RATIO_LONGTEXT, false ); - add_string( CFG_PREFIX "chroma", 0, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - false ); + RATIO_LONGTEXT, false ) + add_string( CFG_PREFIX "chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, + false ) add_module_list( CFG_PREFIX "vfilter", "video filter2", - NULL, NULL, VFILTER_TEXT, VFILTER_LONGTEXT, false ); + NULL, NULL, VFILTER_TEXT, VFILTER_LONGTEXT, false ) + + add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL, + ALPHA_TEXT, ALPHA_LONGTEXT, false ) + add_integer( CFG_PREFIX "x", -1, NULL, X_TEXT, X_LONGTEXT, false ) + add_integer( CFG_PREFIX "y", -1, NULL, Y_TEXT, Y_LONGTEXT, false ) - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () -static const char *ppsz_sout_options[] = { - "id", "width", "height", "sar", "vfilter", "chroma", NULL +static const char *const ppsz_sout_options[] = { + "id", "width", "height", "sar", "vfilter", "chroma", "alpha", "x", "y", NULL }; /***************************************************************************** @@ -188,9 +187,7 @@ static int Open( vlc_object_t *p_this ) p_sys = malloc( sizeof( sout_stream_sys_t ) ); if( !p_sys ) - { return VLC_ENOMEM; - } p_stream->p_sys = p_sys; p_sys->b_inited = false; @@ -199,21 +196,18 @@ static int Open( vlc_object_t *p_this ) var_Get( p_libvlc, "mosaic-lock", &val ); p_sys->p_lock = val.p_address; - var_Get( p_stream, CFG_PREFIX "id", &val ); - p_sys->psz_id = val.psz_string; + p_sys->psz_id = var_CreateGetString( p_stream, CFG_PREFIX "id" ); p_sys->i_height = var_CreateGetIntegerCommand( p_stream, CFG_PREFIX "height" ); - var_AddCallback( p_stream, CFG_PREFIX "height", MosaicBridgeCallback, - p_stream ); + var_AddCallback( p_stream, CFG_PREFIX "height", HeightCallback, p_stream ); p_sys->i_width = var_CreateGetIntegerCommand( p_stream, CFG_PREFIX "width" ); - var_AddCallback( p_stream, CFG_PREFIX "width", MosaicBridgeCallback, - p_stream ); + var_AddCallback( p_stream, CFG_PREFIX "width", WidthCallback, p_stream ); var_Get( p_stream, CFG_PREFIX "sar", &val ); - if ( val.psz_string ) + if( val.psz_string ) { char *psz_parser = strchr( val.psz_string, ':' ); @@ -245,6 +239,18 @@ static int Open( vlc_object_t *p_this ) memcpy( &p_sys->i_chroma, val.psz_string, 4 ); msg_Dbg( p_stream, "Forcing image chroma to 0x%.8x (%4.4s)", p_sys->i_chroma, (char*)&p_sys->i_chroma ); } + free( val.psz_string ); + +#define INT_COMMAND( a ) do { \ + var_Create( p_stream, CFG_PREFIX #a, \ + VLC_VAR_INTEGER | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND ); \ + var_AddCallback( p_stream, CFG_PREFIX #a, a ## Callback, \ + p_stream ); } while(0) + INT_COMMAND( alpha ); + INT_COMMAND( x ); + INT_COMMAND( y ); + +#undef INT_COMMAND p_stream->pf_add = Add; p_stream->pf_del = Del; @@ -263,6 +269,13 @@ static void Close( vlc_object_t * p_this ) sout_stream_t *p_stream = (sout_stream_t*)p_this; sout_stream_sys_t *p_sys = p_stream->p_sys; + /* Delete the callbacks */ + var_DelCallback( p_stream, CFG_PREFIX "height", HeightCallback, p_stream ); + var_DelCallback( p_stream, CFG_PREFIX "width", WidthCallback, p_stream ); + var_DelCallback( p_stream, CFG_PREFIX "alpha", alphaCallback, p_stream ); + var_DelCallback( p_stream, CFG_PREFIX "x", xCallback, p_stream ); + var_DelCallback( p_stream, CFG_PREFIX "y", yCallback, p_stream ); + p_stream->p_sout->i_out_pace_nocontrol--; free( p_sys->psz_id ); @@ -270,21 +283,29 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } +static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data ) +{ + p_filter->pf_video_buffer_new = video_new_buffer_filter; + p_filter->pf_video_buffer_del = video_del_buffer_filter; + p_filter->p_owner = p_data; + return VLC_SUCCESS; +} + static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = p_stream->p_sys; bridge_t *p_bridge; bridged_es_t *p_es; - char *psz_chain, *psz_parser; + char *psz_chain; int i; - if ( p_sys->b_inited ) - { + if( p_sys->b_inited || p_fmt->i_cat != VIDEO_ES ) return NULL; - } /* Create decoder object */ - p_sys->p_decoder = vlc_object_create( p_stream, VLC_OBJECT_DECODER ); + p_sys->p_decoder = vlc_object_create( p_stream, sizeof( decoder_t ) ); + if( !p_sys->p_decoder ) + return NULL; vlc_object_attach( p_sys->p_decoder, p_stream ); p_sys->p_decoder->p_module = NULL; p_sys->p_decoder->fmt_in = *p_fmt; @@ -298,18 +319,30 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) p_sys->p_decoder->pf_picture_link = video_link_picture_decoder; p_sys->p_decoder->pf_picture_unlink = video_unlink_picture_decoder; p_sys->p_decoder->p_owner = malloc( sizeof(decoder_owner_sys_t) ); - for( i = 0; i < PICTURE_RING_SIZE; i++ ) - p_sys->p_decoder->p_owner->pp_pics[i] = 0; + if( !p_sys->p_decoder->p_owner ) + { + vlc_object_release( p_sys->p_decoder ); + return NULL; + } + p_sys->p_decoder->p_owner->video = p_fmt->video; //p_sys->p_decoder->p_cfg = p_sys->p_video_cfg; p_sys->p_decoder->p_module = - module_Need( p_sys->p_decoder, "decoder", "$codec", 0 ); + module_need( p_sys->p_decoder, "decoder", "$codec", false ); - if( !p_sys->p_decoder->p_module ) + if( !p_sys->p_decoder->p_module || !p_sys->p_decoder->pf_decode_video ) { - msg_Err( p_stream, "cannot find decoder" ); - vlc_object_detach( p_sys->p_decoder ); + if( p_sys->p_decoder->p_module ) + { + msg_Err( p_stream, "instanciated a non video decoder" ); + module_unneed( p_sys->p_decoder, p_sys->p_decoder->p_module ); + } + else + { + msg_Err( p_stream, "cannot find decoder" ); + } + free( p_sys->p_decoder->p_owner ); vlc_object_release( p_sys->p_decoder ); return NULL; } @@ -323,7 +356,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc ); vlc_value_t val; - p_bridge = malloc( sizeof( bridge_t ) ); + p_bridge = xmalloc( sizeof( bridge_t ) ); var_Create( p_libvlc, "mosaic-struct", VLC_VAR_ADDRESS ); val.p_address = p_bridge; @@ -341,15 +374,18 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) if ( i == p_bridge->i_es_num ) { - p_bridge->pp_es = realloc( p_bridge->pp_es, - (p_bridge->i_es_num + 1) - * sizeof(bridged_es_t *) ); + p_bridge->pp_es = xrealloc( p_bridge->pp_es, + (p_bridge->i_es_num + 1) * sizeof(bridged_es_t *) ); p_bridge->i_es_num++; - p_bridge->pp_es[i] = malloc( sizeof(bridged_es_t) ); + p_bridge->pp_es[i] = xmalloc( sizeof(bridged_es_t) ); } p_sys->p_es = p_es = p_bridge->pp_es[i]; + p_es->i_alpha = var_GetInteger( p_stream, CFG_PREFIX "alpha" ); + p_es->i_x = var_GetInteger( p_stream, CFG_PREFIX "x" ); + p_es->i_y = var_GetInteger( p_stream, CFG_PREFIX "y" ); + //p_es->fmt = *p_fmt; p_es->psz_id = p_sys->psz_id; p_es->p_picture = NULL; @@ -371,59 +407,24 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) /* Create user specified video filters */ psz_chain = var_GetNonEmptyString( p_stream, CFG_PREFIX "vfilter" ); - msg_Dbg( p_stream, "psz_chain: %s\n", psz_chain ); - { - config_chain_t *p_cfg; - for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next ) - { - msg_Dbg( p_stream, " - %s\n", p_cfg->psz_value ); - } + msg_Dbg( p_stream, "psz_chain: %s", psz_chain ); + if( psz_chain ) + { + p_sys->p_vf2 = filter_chain_New( p_stream, "video filter2", false, + video_filter_buffer_allocation_init, + NULL, p_sys->p_decoder->p_owner ); + es_format_t fmt; + es_format_Copy( &fmt, &p_sys->p_decoder->fmt_out ); + if( p_sys->i_chroma ) + fmt.video.i_chroma = p_sys->i_chroma; + filter_chain_Reset( p_sys->p_vf2, &fmt, &fmt ); + filter_chain_AppendFromString( p_sys->p_vf2, psz_chain ); + free( psz_chain ); } - p_sys->i_vfilters = 0; - p_sys->pp_vfilters = NULL; - psz_parser = psz_chain; - while( psz_parser && *psz_parser ) + else { - config_chain_t *p_cfg; - char *psz_name; - filter_t **pp_vfilter; - psz_parser = config_ChainCreate( &psz_name, &p_cfg, psz_parser ); - p_sys->i_vfilters++; - p_sys->pp_vfilters = - (filter_t **)realloc( p_sys->pp_vfilters, - p_sys->i_vfilters * sizeof(filter_t *) ); - pp_vfilter = p_sys->pp_vfilters+(p_sys->i_vfilters - 1); - *pp_vfilter = vlc_object_create( p_stream, VLC_OBJECT_FILTER ); - vlc_object_attach( *pp_vfilter, p_stream ); - (*pp_vfilter)->pf_vout_buffer_new = video_new_buffer_filter; - (*pp_vfilter)->pf_vout_buffer_del = video_del_buffer_filter; - (*pp_vfilter)->fmt_in = p_sys->p_decoder->fmt_out; - if( p_sys->i_chroma ) - (*pp_vfilter)->fmt_in.video.i_chroma = p_sys->i_chroma; - (*pp_vfilter)->fmt_out = (*pp_vfilter)->fmt_in; - (*pp_vfilter)->p_cfg = p_cfg; - (*pp_vfilter)->p_module = - module_Need( *pp_vfilter, "video filter2", psz_name, true ); - if( (*pp_vfilter)->p_module ) - { - /* It worked! */ - (*pp_vfilter)->p_owner = (filter_owner_sys_t *) - p_sys->p_decoder->p_owner; - msg_Err( p_stream, "Added video filter %s to the chain", - psz_name ); - } - else - { - /* Crap ... we didn't find a filter */ - msg_Warn( p_stream, - "no video filter matching name \"%s\" found", - psz_name ); - vlc_object_detach( *pp_vfilter ); - vlc_object_release( *pp_vfilter ); - p_sys->i_vfilters--; - } + p_sys->p_vf2 = NULL; } - free( psz_chain ); return (sout_stream_id_t *)p_sys; } @@ -435,45 +436,28 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) bridge_t *p_bridge; bridged_es_t *p_es; bool b_last_es = true; - filter_t **pp_vfilter, **pp_end; int i; - if ( !p_sys->b_inited ) - { + if( !p_sys->b_inited ) return VLC_SUCCESS; - } - if ( p_sys->p_decoder != NULL ) + if( p_sys->p_decoder != NULL ) { - picture_t **pp_ring = p_sys->p_decoder->p_owner->pp_pics; + decoder_owner_sys_t *p_owner = p_sys->p_decoder->p_owner; if( p_sys->p_decoder->p_module ) - module_Unneed( p_sys->p_decoder, p_sys->p_decoder->p_module ); - vlc_object_detach( p_sys->p_decoder ); + module_unneed( p_sys->p_decoder, p_sys->p_decoder->p_module ); + if( p_sys->p_decoder->p_description ) + vlc_meta_Delete( p_sys->p_decoder->p_description ); + vlc_object_release( p_sys->p_decoder ); - for( i = 0; i < PICTURE_RING_SIZE; i++ ) - { - if ( pp_ring[i] != NULL ) - { - free( pp_ring[i]->p_data_orig ); - free( pp_ring[i]->p_sys ); - free( pp_ring[i] ); - } - } + free( p_owner ); } /* Destroy user specified video filters */ - pp_vfilter = p_sys->pp_vfilters; - pp_end = pp_vfilter + p_sys->i_vfilters; - for( ; pp_vfilter < pp_end; pp_vfilter++ ) - { - vlc_object_detach( *pp_vfilter ); - if( (*pp_vfilter)->p_module ) - module_Unneed( *pp_vfilter, (*pp_vfilter)->p_module ); - vlc_object_release( *pp_vfilter ); - } - free( p_sys->pp_vfilters ); + if( p_sys->p_vf2 ) + filter_chain_Delete( p_sys->p_vf2 ); vlc_mutex_lock( p_sys->p_lock ); @@ -484,7 +468,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) while ( p_es->p_picture ) { picture_t *p_next = p_es->p_picture->p_next; - p_es->p_picture->pf_release( p_es->p_picture ); + picture_Release( p_es->p_picture ); p_es->p_picture = p_next; } @@ -565,19 +549,23 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, if( p_sys->i_chroma ) fmt_out.i_chroma = p_sys->i_chroma; else - fmt_out.i_chroma = VLC_FOURCC('I','4','2','0'); + fmt_out.i_chroma = VLC_CODEC_I420; + const unsigned i_fmt_in_aspect = + (int64_t)VOUT_ASPECT_FACTOR * + fmt_in.i_sar_num * fmt_in.i_width / + (fmt_in.i_sar_den * fmt_in.i_height); if ( !p_sys->i_height ) { fmt_out.i_width = p_sys->i_width; fmt_out.i_height = (p_sys->i_width * VOUT_ASPECT_FACTOR - * p_sys->i_sar_num / p_sys->i_sar_den / fmt_in.i_aspect) + * p_sys->i_sar_num / p_sys->i_sar_den / i_fmt_in_aspect) & ~0x1; } else if ( !p_sys->i_width ) { fmt_out.i_height = p_sys->i_height; - fmt_out.i_width = (p_sys->i_height * fmt_in.i_aspect + fmt_out.i_width = (p_sys->i_height * i_fmt_in_aspect * p_sys->i_sar_den / p_sys->i_sar_num / VOUT_ASPECT_FACTOR) & ~0x1; } @@ -591,9 +579,10 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, p_new_pic = image_Convert( p_sys->p_image, p_pic, &fmt_in, &fmt_out ); - if ( p_new_pic == NULL ) + if( p_new_pic == NULL ) { msg_Err( p_stream, "image conversion failed" ); + picture_Release( p_pic ); continue; } } @@ -601,56 +590,23 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, { /* TODO: chroma conversion if needed */ - p_new_pic = (picture_t*)malloc( sizeof(picture_t) ); - if( p_new_pic == NULL ) - { - msg_Err( p_stream, "image conversion failed" ); - continue; - } - - if( vout_AllocatePicture( - p_stream, p_new_pic, p_pic->format.i_chroma, - p_pic->format.i_width, p_pic->format.i_height, - p_sys->p_decoder->fmt_out.video.i_aspect ) - != VLC_SUCCESS ) + p_new_pic = picture_New( p_pic->format.i_chroma, + p_pic->format.i_width, p_pic->format.i_height, + p_sys->p_decoder->fmt_out.video.i_sar_num, + p_sys->p_decoder->fmt_out.video.i_sar_den ); + if( !p_new_pic ) { - free( p_new_pic ); + picture_Release( p_pic ); msg_Err( p_stream, "image allocation failed" ); continue; } - vout_CopyPicture( p_stream, p_new_pic, p_pic ); + picture_Copy( p_new_pic, p_pic ); } + picture_Release( p_pic ); - p_new_pic->i_refcount = 1; - p_new_pic->i_status = DESTROYED_PICTURE; - p_new_pic->i_type = DIRECT_PICTURE; - p_new_pic->p_sys = (picture_sys_t *)p_new_pic->pf_release; - p_new_pic->pf_release = ReleasePicture; - p_new_pic->date = p_pic->date; - p_pic->pf_release( p_pic ); - - if( p_sys->pp_vfilters ) - { - /* Apply user specified video filters */ - filter_t **pp_vfilter = p_sys->pp_vfilters; - filter_t **pp_end = pp_vfilter + p_sys->i_vfilters; - for( ; pp_vfilter < pp_end; pp_vfilter++ ) - { - (*pp_vfilter)->fmt_in.i_codec = p_new_pic->format.i_chroma; - (*pp_vfilter)->fmt_out.i_codec = p_new_pic->format.i_chroma; - (*pp_vfilter)->fmt_in.video = p_new_pic->format; - (*pp_vfilter)->fmt_out.video = p_new_pic->format; - p_new_pic = (*pp_vfilter)->pf_video_filter( *pp_vfilter, - p_new_pic ); - if( !p_new_pic ) - { - msg_Err( p_stream, "video filter failed" ); - break; - } - } - if( !p_new_pic ) continue; - } + if( p_sys->p_vf2 ) + p_new_pic = filter_chain_VideoFilter( p_sys->p_vf2, p_new_pic ); PushPicture( p_stream, p_new_pic ); } @@ -658,70 +614,31 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, return VLC_SUCCESS; } -struct picture_sys_t -{ - vlc_object_t *p_owner; - bool b_dead; -}; - -static void video_release_buffer_decoder( picture_t *p_pic ) -{ - if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys ) - { - video_del_buffer_decoder( (decoder_t *)p_pic->p_sys->p_owner, p_pic ); - } - else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--; -} - -static void video_release_buffer_filter( picture_t *p_pic ) -{ - if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys ) - { - video_del_buffer_filter( (filter_t *)p_pic->p_sys->p_owner, p_pic ); - } - else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--; -} - inline static picture_t *video_new_buffer_decoder( decoder_t *p_dec ) { return video_new_buffer( VLC_OBJECT( p_dec ), (decoder_owner_sys_t *)p_dec->p_owner, - &p_dec->fmt_out, - video_release_buffer_decoder ); + &p_dec->fmt_out ); } inline static picture_t *video_new_buffer_filter( filter_t *p_filter ) { return video_new_buffer( VLC_OBJECT( p_filter ), (decoder_owner_sys_t *)p_filter->p_owner, - &p_filter->fmt_out, - video_release_buffer_filter ); + &p_filter->fmt_out ); } static picture_t *video_new_buffer( vlc_object_t *p_this, decoder_owner_sys_t *p_sys, - es_format_t *fmt_out, - void ( *pf_release )( picture_t * ) ) + es_format_t *fmt_out ) { - picture_t **pp_ring = p_sys->pp_pics; - picture_t *p_pic; - int i; - + VLC_UNUSED(p_this); if( fmt_out->video.i_width != p_sys->video.i_width || fmt_out->video.i_height != p_sys->video.i_height || fmt_out->video.i_chroma != p_sys->video.i_chroma || - fmt_out->video.i_aspect != p_sys->video.i_aspect ) + (int64_t)fmt_out->video.i_sar_num * p_sys->video.i_sar_den != + (int64_t)fmt_out->video.i_sar_den * p_sys->video.i_sar_num ) { - if( !fmt_out->video.i_sar_num || - !fmt_out->video.i_sar_den ) - { - fmt_out->video.i_sar_num = - fmt_out->video.i_aspect * fmt_out->video.i_height; - - fmt_out->video.i_sar_den = - VOUT_ASPECT_FACTOR * fmt_out->video.i_width; - } - vlc_ureduce( &fmt_out->video.i_sar_num, &fmt_out->video.i_sar_den, fmt_out->video.i_sar_num, @@ -736,148 +653,116 @@ static picture_t *video_new_buffer( vlc_object_t *p_this, fmt_out->video.i_chroma = fmt_out->i_codec; p_sys->video = fmt_out->video; - - for( i = 0; i < PICTURE_RING_SIZE; i++ ) - { - if ( pp_ring[i] != NULL ) - { - if ( pp_ring[i]->i_status == DESTROYED_PICTURE ) - { - free( pp_ring[i]->p_data_orig ); - free( pp_ring[i]->p_sys ); - free( pp_ring[i] ); - } - else - { - pp_ring[i]->p_sys->b_dead = true; - } - pp_ring[i] = NULL; - } - } } - /* Find an empty space in the picture ring buffer */ - for( i = 0; i < PICTURE_RING_SIZE; i++ ) - { - if( pp_ring[i] != NULL && pp_ring[i]->i_status == DESTROYED_PICTURE ) - { - pp_ring[i]->i_status = RESERVED_PICTURE; - return pp_ring[i]; - } - } - for( i = 0; i < PICTURE_RING_SIZE; i++ ) - { - if( pp_ring[i] == NULL ) break; - } - - if( i == PICTURE_RING_SIZE ) - { - msg_Err( p_this, "decoder/filter is leaking pictures, " - "resetting its ring buffer" ); - - for( i = 0; i < PICTURE_RING_SIZE; i++ ) - { - pp_ring[i]->pf_release( pp_ring[i] ); - } - - i = 0; - } - - p_pic = malloc( sizeof(picture_t) ); - if( !p_pic ) return NULL; + /* */ fmt_out->video.i_chroma = fmt_out->i_codec; - vout_AllocatePicture( p_this, p_pic, - fmt_out->video.i_chroma, - fmt_out->video.i_width, - fmt_out->video.i_height, - fmt_out->video.i_aspect ); - - if( !p_pic->i_planes ) - { - free( p_pic ); - return NULL; - } - p_pic->pf_release = pf_release; - p_pic->p_sys = malloc( sizeof(picture_sys_t) ); - p_pic->p_sys->p_owner = p_this; - p_pic->p_sys->b_dead = false; - p_pic->i_status = RESERVED_PICTURE; - - pp_ring[i] = p_pic; - - return p_pic; + return picture_NewFromFormat( &fmt_out->video ); } inline static void video_del_buffer_decoder( decoder_t *p_this, picture_t *p_pic ) { VLC_UNUSED(p_this); - video_del_buffer( p_pic ); + picture_Release( p_pic ); } inline static void video_del_buffer_filter( filter_t *p_this, picture_t *p_pic ) { VLC_UNUSED(p_this); - video_del_buffer( p_pic ); -} - -static void video_del_buffer( picture_t *p_pic ) -{ - p_pic->i_refcount = 0; - p_pic->i_status = DESTROYED_PICTURE; - if ( p_pic->p_sys->b_dead ) - { - free( p_pic->p_data_orig ); - free( p_pic->p_sys ); - free( p_pic ); - } + picture_Release( p_pic ); } static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic ) { VLC_UNUSED(p_dec); - p_pic->i_refcount++; + picture_Hold( p_pic ); } static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic ) { VLC_UNUSED(p_dec); - video_release_buffer_decoder( p_pic ); + picture_Release( p_pic ); } /********************************************************************** * Callback to update (some) params on the fly **********************************************************************/ -static int MosaicBridgeCallback( vlc_object_t *p_this, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, - void *p_data ) +static int HeightCallback( 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); + VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var); sout_stream_t *p_stream = (sout_stream_t *)p_data; sout_stream_sys_t *p_sys = p_stream->p_sys; - int i_ret = VLC_SUCCESS; -#define VAR_IS( a ) !strcmp( psz_var, CFG_PREFIX a ) - if( VAR_IS( "height" ) ) - { - /* We create the handler before updating the value in p_sys - * so we don't have to worry about locking */ - if( !p_sys->p_image && newval.i_int ) - p_sys->p_image = image_HandlerCreate( p_stream ); - p_sys->i_height = newval.i_int; - } - else if( VAR_IS( "width" ) ) - { - /* We create the handler before updating the value in p_sys - * so we don't have to worry about locking */ - if( !p_sys->p_image && newval.i_int ) - p_sys->p_image = image_HandlerCreate( p_stream ); - p_sys->i_width = newval.i_int; - } -#undef VAR_IS + /* We create the handler before updating the value in p_sys + * so we don't have to worry about locking */ + if( !p_sys->p_image && newval.i_int ) + p_sys->p_image = image_HandlerCreate( p_stream ); + p_sys->i_height = newval.i_int; - return i_ret; + return VLC_SUCCESS; +} + +static int WidthCallback( 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); VLC_UNUSED(psz_var); + sout_stream_t *p_stream = (sout_stream_t *)p_data; + sout_stream_sys_t *p_sys = p_stream->p_sys; + + /* We create the handler before updating the value in p_sys + * so we don't have to worry about locking */ + if( !p_sys->p_image && newval.i_int ) + p_sys->p_image = image_HandlerCreate( p_stream ); + p_sys->i_width = newval.i_int; + + return VLC_SUCCESS; +} + +static int alphaCallback( 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); VLC_UNUSED(psz_var); + sout_stream_t *p_stream = (sout_stream_t *)p_data; + sout_stream_sys_t *p_sys = p_stream->p_sys; + + if( p_sys->p_es ) + p_sys->p_es->i_alpha = newval.i_int; + + return VLC_SUCCESS; +} + +static int xCallback( 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); VLC_UNUSED(psz_var); + sout_stream_t *p_stream = (sout_stream_t *)p_data; + sout_stream_sys_t *p_sys = p_stream->p_sys; + + if( p_sys->p_es ) + p_sys->p_es->i_x = newval.i_int; + + return VLC_SUCCESS; +} + +static int yCallback( 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); VLC_UNUSED(psz_var); + sout_stream_t *p_stream = (sout_stream_t *)p_data; + sout_stream_sys_t *p_sys = p_stream->p_sys; + + if( p_sys->p_es ) + p_sys->p_es->i_y = newval.i_int; + + return VLC_SUCCESS; }