[vlc-devel] [PATCH] decoder: separate vout initialization from buffer allocation
Thomas Guillem
thomas at gllm.fr
Thu Oct 30 09:38:20 CET 2014
I'm not sure if the changes in transcode/video.c,
stream_out/mosaic_bridge.c, and src/misc/image.c are really necessary.
It can work without it, but it's less consistent.
On Thu, Oct 30, 2014, at 09:35, Thomas Guillem wrote:
> ---
> include/vlc_codec.h | 14 ++++++++++++++
> modules/stream_out/mosaic_bridge.c | 33
> +++++++++++++++++++++++----------
> modules/stream_out/transcode/video.c | 12 +++++++++++-
> src/input/decoder.c | 19 ++++++++++++++++---
> src/misc/image.c | 11 ++++++++++-
> 5 files changed, 74 insertions(+), 15 deletions(-)
>
> diff --git a/include/vlc_codec.h b/include/vlc_codec.h
> index 1e7c8a6..429cfa5 100644
> --- a/include/vlc_codec.h
> +++ b/include/vlc_codec.h
> @@ -97,6 +97,7 @@ struct decoder_t
> /* Video output callbacks
> * XXX use decoder_NewPicture/decoder_DeletePicture
> * and decoder_LinkPicture/decoder_UnlinkPicture */
> + int (*pf_vout_format_update)( decoder_t * );
> picture_t *(*pf_vout_buffer_new)( decoder_t * );
> void (*pf_vout_buffer_del)( decoder_t *, picture_t * );
> void (*pf_picture_link) ( decoder_t *, picture_t * );
> @@ -180,6 +181,19 @@ struct encoder_t
>
>
> /**
> + * This function notifies the video output pipeline of a new video
> output
> + * format (fmt_out.video). If there is currently no video output or if
> the
> + * video output format has changed, a new audio video will be set up.
> + * @return 0 if the video output is working, -1 if not. */
> +static inline int decoder_UpdateVideoFormat( decoder_t *dec )
> +{
> + if( dec->pf_vout_format_update != NULL )
> + return dec->pf_vout_format_update( dec );
> + else
> + return -1;
> +}
> +
> +/**
> * This function will return a new picture usable by a decoder as an
> output
> * buffer. You have to release it using decoder_DeletePicture or by
> returning
> * it to the caller as a pf_decode_video return value.
> diff --git a/modules/stream_out/mosaic_bridge.c
> b/modules/stream_out/mosaic_bridge.c
> index ae20ef4..3930536 100644
> --- a/modules/stream_out/mosaic_bridge.c
> +++ b/modules/stream_out/mosaic_bridge.c
> @@ -82,8 +82,8 @@ inline static void video_del_buffer_filter( filter_t *,
> 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 * );
> +static int video_update_format( vlc_object_t *, decoder_owner_sys_t *,
> + es_format_t * );
>
> static void video_link_picture_decoder( decoder_t *, picture_t * );
> static void video_unlink_picture_decoder( decoder_t *, picture_t * );
> @@ -296,6 +296,7 @@ static sout_stream_id_sys_t * Add( sout_stream_t
> *p_stream, es_format_t *p_fmt )
> p_sys->p_decoder->fmt_out.i_extra = 0;
> p_sys->p_decoder->fmt_out.p_extra = 0;
> p_sys->p_decoder->pf_decode_video = 0;
> + p_sys->p_decoder->pf_vout_format_update =
> video_update_format_decoder;
> p_sys->p_decoder->pf_vout_buffer_new = video_new_buffer_decoder;
> p_sys->p_decoder->pf_vout_buffer_del = video_del_buffer_decoder;
> p_sys->p_decoder->pf_picture_link = video_link_picture_decoder;
> @@ -602,21 +603,34 @@ static int Send( sout_stream_t *p_stream,
> sout_stream_id_sys_t *id,
> return VLC_SUCCESS;
> }
>
> +inline static int video_update_format_decoder( decoder_t *p_dec )
> +{
> + return video_update_format( VLC_OBJECT( p_dec ),
> + (decoder_owner_sys_t *)p_dec->p_owner,
> + &p_dec->fmt_out );
> +}
> +
> 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 );
> + if( decoder_UpdateVideoFormat( p_dec ) ) {
> + msg_Warn( p_dec, "can't get output picture" );
> + return NULL;
> + }
> + return picture_NewFromFormat( &fmt_out->video );
> }
>
> inline static picture_t *video_new_buffer_filter( filter_t *p_filter )
> {
> - return video_new_buffer( VLC_OBJECT( p_filter ),
> + if( video_update_format( VLC_OBJECT( p_filter ),
> (decoder_owner_sys_t *)p_filter->owner.sys,
> - &p_filter->fmt_out );
> + &p_filter->fmt_out ) ) {
> + msg_Warn( p_filter, "can't get output picture" );
> + return NULL;
> + }
> + return picture_NewFromFormat( &p_filter->fmt_out.video );
> }
>
> -static picture_t *video_new_buffer( vlc_object_t *p_this,
> +static int video_update_format( vlc_object_t *p_this,
> decoder_owner_sys_t *p_sys,
> es_format_t *fmt_out )
> {
> @@ -645,8 +659,7 @@ static picture_t *video_new_buffer( vlc_object_t
> *p_this,
>
> /* */
> fmt_out->video.i_chroma = fmt_out->i_codec;
> -
> - return picture_NewFromFormat( &fmt_out->video );
> + return 0;
> }
>
> inline static void video_del_buffer_decoder( decoder_t *p_this,
> diff --git a/modules/stream_out/transcode/video.c
> b/modules/stream_out/transcode/video.c
> index baad2b6..f223987 100644
> --- a/modules/stream_out/transcode/video.c
> +++ b/modules/stream_out/transcode/video.c
> @@ -61,9 +61,18 @@ static void video_unlink_picture_decoder( decoder_t
> *p_dec, picture_t *p_pic )
> picture_Release( p_pic );
> }
>
> -static picture_t *video_new_buffer_decoder( decoder_t *p_dec )
> +static int video_update_format_decoder( decoder_t *p_dec )
> {
> p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
> + return 0;
> +}
> +
> +static picture_t *video_new_buffer_decoder( decoder_t *p_dec )
> +{
> + if( decoder_UpdateVideoFormat( p_dec ) ) {
> + msg_Warn( p_dec, "can't get output picture" );
> + return NULL;
> + }
> return picture_NewFromFormat( &p_dec->fmt_out.video );
> }
>
> @@ -165,6 +174,7 @@ int transcode_video_new( sout_stream_t *p_stream,
> sout_stream_id_sys_t *id )
> id->p_decoder->pf_decode_video = NULL;
> id->p_decoder->pf_get_cc = NULL;
> id->p_decoder->pf_get_cc = 0;
> + id->p_decoder->pf_vout_format_update = video_update_format_decoder;
> id->p_decoder->pf_vout_buffer_new = video_new_buffer_decoder;
> id->p_decoder->pf_vout_buffer_del = video_del_buffer_decoder;
> id->p_decoder->pf_picture_link = video_link_picture_decoder;
> diff --git a/src/input/decoder.c b/src/input/decoder.c
> index 972522a..70b929f 100644
> --- a/src/input/decoder.c
> +++ b/src/input/decoder.c
> @@ -66,6 +66,7 @@ static void DecoderSignalWait( decoder_t *, bool
> );
> static void DecoderUnsupportedCodec( decoder_t *, vlc_fourcc_t );
>
> /* Buffers allocation callbacks for the decoders */
> +static int vout_update_format( decoder_t * );
> static picture_t *vout_new_buffer( decoder_t * );
> static void vout_del_buffer( decoder_t *, picture_t * );
> static void vout_link_picture( decoder_t *, picture_t * );
> @@ -778,6 +779,7 @@ static decoder_t * CreateDecoder( vlc_object_t
> *p_parent,
>
> /* Set buffers allocation callbacks for the decoders */
> p_dec->pf_aout_format_update = aout_update_format;
> + p_dec->pf_vout_format_update = vout_update_format;
> p_dec->pf_vout_buffer_new = vout_new_buffer;
> p_dec->pf_vout_buffer_del = vout_del_buffer;
> p_dec->pf_picture_link = vout_link_picture;
> @@ -2027,7 +2029,7 @@ static int aout_update_format( decoder_t *p_dec )
> return 0;
> }
>
> -static picture_t *vout_new_buffer( decoder_t *p_dec )
> +static int vout_update_format( decoder_t *p_dec )
> {
> decoder_owner_sys_t *p_owner = p_dec->p_owner;
>
> @@ -2049,7 +2051,7 @@ static picture_t *vout_new_buffer( decoder_t *p_dec
> )
> !p_dec->fmt_out.video.i_height )
> {
> /* Can't create a new vout without display size */
> - return NULL;
> + return -1;
> }
>
> video_format_t fmt = p_dec->fmt_out.video;
> @@ -2153,14 +2155,25 @@ static picture_t *vout_new_buffer( decoder_t
> *p_dec )
> {
> msg_Err( p_dec, "failed to create video output" );
> p_dec->b_error = true;
> - return NULL;
> + return -1;
> }
> }
> + return 0;
> +}
> +
> +static picture_t *vout_new_buffer( decoder_t *p_dec )
> +{
> + if( decoder_UpdateVideoFormat( p_dec ) ) {
> + msg_Warn( p_dec, "can't get output picture" );
> + return NULL;
> + }
>
> /* Get a new picture
> */
> for( ;; )
> {
> + decoder_owner_sys_t *p_owner = p_dec->p_owner;
> +
> if( DecoderIsExitRequested( p_dec ) || p_dec->b_error )
> return NULL;
>
> diff --git a/src/misc/image.c b/src/misc/image.c
> index 69dc625..95cc024 100644
> --- a/src/misc/image.c
> +++ b/src/misc/image.c
> @@ -585,10 +585,18 @@ vlc_fourcc_t image_Mime2Fourcc( const char
> *psz_mime )
> return 0;
> }
>
> +static int video_update_format( decoder_t *p_dec )
> +{
> + p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
> + return 0;
> +}
>
> static picture_t *video_new_buffer( decoder_t *p_dec )
> {
> - p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
> + if( decoder_UpdateVideoFormat( p_dec ) ) {
> + msg_Warn( p_dec, "can't get output picture" );
> + return NULL;
> + }
> return picture_NewFromFormat( &p_dec->fmt_out.video );
> }
>
> @@ -624,6 +632,7 @@ static decoder_t *CreateDecoder( vlc_object_t
> *p_this, video_format_t *fmt )
> p_dec->fmt_in.video = *fmt;
> p_dec->b_pace_control = true;
>
> + p_dec->pf_vout_format_update = video_update_format;
> p_dec->pf_vout_buffer_new = video_new_buffer;
> p_dec->pf_vout_buffer_del = video_del_buffer;
> p_dec->pf_picture_link = video_link_picture;
> --
> 2.1.0
>
More information about the vlc-devel
mailing list