X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_codec.h;h=3322ebe2e37d558d2ebd642e08c704c72f5af11a;hb=26807b49dfcb2ca35bbb81c228b7ec9dc672a687;hp=41cf66bdb42a6845a2d9fc8936025a537c827cc5;hpb=0357e2cf82ad87897a43ea3b5a2540aacff504a7;p=vlc diff --git a/include/vlc_codec.h b/include/vlc_codec.h index 41cf66bdb4..3322ebe2e3 100644 --- a/include/vlc_codec.h +++ b/include/vlc_codec.h @@ -26,6 +26,8 @@ #include #include +#include +#include /** * \file @@ -62,10 +64,10 @@ struct decoder_t es_format_t fmt_out; /* Some decoders only accept packetized data (ie. not truncated) */ - bool b_need_packetized; + bool b_need_packetized; /* Tell the decoder if it is allowed to drop frames */ - bool b_pace_control; + bool b_pace_control; /* */ picture_t * ( * pf_decode_video )( decoder_t *, block_t ** ); @@ -81,28 +83,33 @@ struct decoder_t * globaly, not necessary for the current packet */ block_t * ( * pf_get_cc ) ( decoder_t *, bool pb_present[4] ); - /* - * Buffers allocation + /* Meta data at codec level + * The decoder owner set it back to NULL once it has retreived what it needs. + * The decoder owner is responsible of its release except when you overwrite it. */ - - /* Audio output callbacks */ - aout_buffer_t * ( * pf_aout_buffer_new) ( decoder_t *, int ); - void ( * pf_aout_buffer_del) ( decoder_t *, aout_buffer_t * ); - - /* Video output callbacks */ - 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 * ); - void ( * pf_picture_unlink) ( decoder_t *, picture_t * ); + vlc_meta_t *p_description; /* * Owner fields + * XXX You MUST not use them directly. */ + /* Video output callbacks + * XXX use decoder_NewPicture/decoder_DeletePicture + * and decoder_LinkPicture/decoder_UnlinkPicture */ + 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 * ); + void (*pf_picture_unlink) ( decoder_t *, picture_t * ); + + /* Audio output callbacks + * XXX use decoder_NewAudioBuffer/decoder_DeleteAudioBuffer */ + aout_buffer_t *(*pf_aout_buffer_new)( decoder_t *, int ); + /* SPU output callbacks * XXX use decoder_NewSubpicture and decoder_DeleteSubpicture */ - subpicture_t *(*pf_spu_buffer_new) ( decoder_t * ); - void (*pf_spu_buffer_del) ( decoder_t *, subpicture_t * ); + subpicture_t *(*pf_spu_buffer_new)( decoder_t *, const subpicture_updater_t * ); + void (*pf_spu_buffer_del)( decoder_t *, subpicture_t * ); /* Input attachments * XXX use decoder_GetInputAttachments */ @@ -118,6 +125,8 @@ struct decoder_t /* Private structure for the owner of the decoder */ decoder_owner_sys_t *p_owner; + + bool b_error; }; /** @@ -125,7 +134,7 @@ struct decoder_t */ /** - * \defgroup decoder Encoder + * \defgroup encoder Encoder * * The structure describing a Encoder * @@ -164,36 +173,68 @@ struct encoder_t * @} */ + +/** + * 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. + */ +VLC_API picture_t * decoder_NewPicture( decoder_t * ) VLC_USED; + +/** + * This function will release a picture create by decoder_NewPicture. + */ +VLC_API void decoder_DeletePicture( decoder_t *, picture_t *p_picture ); + +/** + * This function will increase the picture reference count. + * (picture_Hold is not usable.) + */ +VLC_API void decoder_LinkPicture( decoder_t *, picture_t * ); + +/** + * This function will decrease the picture reference count. + * (picture_Release is not usable.) + */ +VLC_API void decoder_UnlinkPicture( decoder_t *, picture_t * ); + +/** + * This function will return a new audio buffer usable by a decoder as an + * output buffer. You have to release it using decoder_DeleteAudioBuffer + * or by returning it to the caller as a pf_decode_audio return value. + */ +VLC_API aout_buffer_t * decoder_NewAudioBuffer( decoder_t *, int i_size ) VLC_USED; + /** * This function will return a new subpicture usable by a decoder as an output * buffer. You have to release it using decoder_DeleteSubpicture or by returning * it to the caller as a pf_decode_sub return value. */ -VLC_EXPORT( subpicture_t *, decoder_NewSubpicture, ( decoder_t * ) ); +VLC_API subpicture_t * decoder_NewSubpicture( decoder_t *, const subpicture_updater_t * ) VLC_USED; /** - * This function will release a subpicture create by decoder_NewSubicture. + * This function will release a subpicture created by decoder_NewSubicture. */ -VLC_EXPORT( void, decoder_DeleteSubpicture, ( decoder_t *, subpicture_t *p_subpicture ) ); +VLC_API void decoder_DeleteSubpicture( decoder_t *, subpicture_t *p_subpicture ); /** * This function gives all input attachments at once. * * You MUST release the returned values */ -VLC_EXPORT( int, decoder_GetInputAttachments, ( decoder_t *, input_attachment_t ***ppp_attachment, int *pi_attachment ) ); +VLC_API int decoder_GetInputAttachments( decoder_t *, input_attachment_t ***ppp_attachment, int *pi_attachment ); /** * This function converts a decoder timestamp into a display date comparable * to mdate(). * You MUST use it *only* for gathering statistics about speed. */ -VLC_EXPORT( mtime_t, decoder_GetDisplayDate, ( decoder_t *, mtime_t ) LIBVLC_USED ); +VLC_API mtime_t decoder_GetDisplayDate( decoder_t *, mtime_t ) VLC_USED; /** * This function returns the current input rate. * You MUST use it *only* for gathering statistics about speed. */ -VLC_EXPORT( int, decoder_GetDisplayRate, ( decoder_t * ) ); +VLC_API int decoder_GetDisplayRate( decoder_t * ) VLC_USED; #endif /* _VLC_CODEC_H */