X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fmosaic_bridge.c;h=076b501374aee601c28e98b27fe194893c2a39c3;hb=6feec1a07bf66869c14ad27d86d73ae36ea8a2d7;hp=c619b7fd1615ae43695a5a3cf9de01c17cffd9ff;hpb=1273e688ac65d244afc540ba0bcf1b1edf06797b;p=vlc diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c index c619b7fd16..076b501374 100644 --- a/modules/stream_out/mosaic_bridge.c +++ b/modules/stream_out/mosaic_bridge.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -65,37 +66,12 @@ struct sout_stream_sys_t 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 ) -{ - assert( p_pic ); - - if( --p_pic->i_refcount > 0 ) - return; - - if( p_pic->p_sys ) - { - pf_release_t pf_release = (pf_release_t)p_pic->p_sys; - p_pic->p_sys = NULL; - pf_release( p_pic ); - } - else - { - free( p_pic->p_q ); - free( p_pic->p_data_orig ); - free( p_pic ); - } -} - /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -107,12 +83,11 @@ 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 * ); @@ -168,33 +143,33 @@ static int yCallback( vlc_object_t *, char const *, #define CFG_PREFIX "sout-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" ); +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 ); + 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 *const ppsz_sout_options[] = { "id", "width", "height", "sar", "vfilter", "chroma", "alpha", "x", "y", NULL @@ -347,20 +322,18 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) return NULL; } - for( i = 0; i < PICTURE_RING_SIZE; i++ ) - p_sys->p_decoder->p_owner->pp_pics[i] = 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 || !p_sys->p_decoder->pf_decode_video ) { 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 ); + module_unneed( p_sys->p_decoder, p_sys->p_decoder->p_module ); } else { @@ -433,7 +406,7 @@ 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 ); + msg_Dbg( p_stream, "psz_chain: %s", psz_chain ); if( psz_chain ) { p_sys->p_vf2 = filter_chain_New( p_stream, "video filter2", false, @@ -472,20 +445,13 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) 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 ); + 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_detach( p_sys->p_decoder ); vlc_object_release( p_sys->p_decoder ); - picture_t **pp_ring = p_owner->pp_pics; - 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 ); } @@ -502,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; } @@ -583,7 +549,7 @@ 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; if ( !p_sys->i_height ) { @@ -609,7 +575,7 @@ 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 ); @@ -620,34 +586,18 @@ 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_aspect ); + if( !p_new_pic ) { picture_Release( p_pic ); - free( p_new_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 ); } - - 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; picture_Release( p_pic ); if( p_sys->p_vf2 ) @@ -659,59 +609,25 @@ 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 ) -{ - assert( p_pic && p_pic->p_sys ); - - if( --p_pic->i_refcount > 0 ) - return; - - video_del_buffer_decoder( (decoder_t *)p_pic->p_sys->p_owner, p_pic ); -} - -static void video_release_buffer_filter( picture_t *p_pic ) -{ - assert( p_pic ); - - if( --p_pic->i_refcount > 0 ) - return; - - assert( p_pic->p_sys ); - - video_del_buffer_filter( (filter_t *)p_pic->p_sys->p_owner, p_pic ); -} - 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 || @@ -741,123 +657,41 @@ 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; - pp_ring[i]->i_refcount = 1; - 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]->p_sys->b_dead = true; - pp_ring[i]->pf_release( pp_ring[i] ); - pp_ring[i] = NULL; - } - - i = 0; - } - - p_pic = malloc( sizeof(picture_t) ); - if( !p_pic ) return NULL; + /* */ fmt_out->video.i_chroma = fmt_out->i_codec; - if( 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 ) != VLC_SUCCESS ) - { - free( p_pic ); - return NULL; - } - - if( !p_pic->i_planes ) - { - free( p_pic ); - return NULL; - } - - p_pic->pf_release = pf_release; - p_pic->i_refcount = 1; - 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_New( fmt_out->video.i_chroma, + fmt_out->video.i_width, + fmt_out->video.i_height, + fmt_out->video.i_aspect ); } 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 ); }