X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_filter.h;h=ea24344e707c5bfa8827d317294056ecd6d52eee;hb=HEAD;hp=cd7943ac5974407ef2a4c4476848e101f0998162;hpb=0b5502c3d8bf855bc8ea4352d079a6cfe5844b59;p=vlc diff --git a/include/vlc_filter.h b/include/vlc_filter.h index cd7943ac59..ea24344e70 100644 --- a/include/vlc_filter.h +++ b/include/vlc_filter.h @@ -60,46 +60,77 @@ struct filter_t /* Filter configuration */ config_chain_t * p_cfg; - picture_t * ( * pf_video_filter ) ( filter_t *, picture_t * ); - block_t * ( * pf_audio_filter ) ( filter_t *, block_t * ); - void ( * pf_video_blend ) ( filter_t *, - picture_t *, const picture_t *, - int, int, int ); - - subpicture_t * ( *pf_sub_filter ) ( filter_t *, mtime_t ); - int ( *pf_render_text ) ( filter_t *, subpicture_region_t *, - subpicture_region_t * ); - int ( *pf_render_html ) ( filter_t *, subpicture_region_t *, - subpicture_region_t * ); - - /* Filter mouse state. - * - * If non NULL, you must convert from output format to input format, - * if VLC_SUCCESS is returned, the mouse state is then propagated. - * If NULL, the mouse state is considered unchanged and will be - * propagated. - * - * If VLC_SUCCESS is not returned, the mouse changes are not propagated. - */ - int ( *pf_mouse )( filter_t *, vlc_mouse_t *, - const vlc_mouse_t *p_old, - const vlc_mouse_t *p_new ); - /* - * Buffers allocation - */ - - /* Audio output callbacks */ - block_t * ( * pf_audio_buffer_new) ( filter_t *, int ); - - /* Video output callbacks */ - picture_t * ( * pf_vout_buffer_new) ( filter_t * ); - void ( * pf_vout_buffer_del) ( filter_t *, picture_t * ); - /* void ( * pf_picture_link) ( picture_t * ); - void ( * pf_picture_unlink) ( picture_t * ); */ - - /* SPU output callbacks */ - subpicture_t * ( * pf_sub_buffer_new) ( filter_t * ); - void ( * pf_sub_buffer_del) ( filter_t *, subpicture_t * ); + union + { + struct + { + picture_t * (*pf_filter) ( filter_t *, picture_t * ); + void (*pf_flush)( filter_t * ); + picture_t * (*pf_buffer_new) ( filter_t * ); + void (*pf_buffer_del) ( filter_t *, picture_t * ); + /* Filter mouse state. + * + * If non-NULL, you must convert from output to input formats: + * - If VLC_SUCCESS is returned, the mouse state is propagated. + * - Otherwise, the mouse change is not propagated. + * If NULL, the mouse state is considered unchanged and will be + * propagated. + */ + int (*pf_mouse)( filter_t *, vlc_mouse_t *, + const vlc_mouse_t *p_old, + const vlc_mouse_t *p_new ); + } video; +#define pf_video_filter u.video.pf_filter +#define pf_video_flush u.video.pf_flush +#define pf_video_mouse u.video.pf_mouse +#define pf_video_buffer_new u.video.pf_buffer_new +#define pf_video_buffer_del u.video.pf_buffer_del + + struct + { + block_t * (*pf_filter) ( filter_t *, block_t * ); + block_t * (*pf_buffer_new) ( filter_t *, int ); + } audio; +#define pf_audio_filter u.audio.pf_filter +#define pf_audio_buffer_new u.audio.pf_buffer_new + + struct + { + void (*pf_blend) ( filter_t *, picture_t *, + const picture_t *, int, int, int ); + } blend; +#define pf_video_blend u.blend.pf_blend + + struct + { + subpicture_t * (*pf_filter) ( filter_t *, mtime_t ); + subpicture_t * (*pf_buffer_new)( filter_t * ); + void (*pf_buffer_del)( filter_t *, subpicture_t * ); + int (*pf_mouse) ( filter_t *, + const vlc_mouse_t *p_old, + const vlc_mouse_t *p_new, + const video_format_t * ); + } sub; +#define pf_sub_filter u.sub.pf_filter +#define pf_sub_buffer_new u.sub.pf_buffer_new +#define pf_sub_buffer_del u.sub.pf_buffer_del +#define pf_sub_mouse u.sub.pf_mouse + + struct + { + int (*pf_text) ( filter_t *, subpicture_region_t *, + subpicture_region_t * ); + int (*pf_html) ( filter_t *, subpicture_region_t *, + subpicture_region_t * ); + } render; +#define pf_render_text u.render.pf_text +#define pf_render_html u.render.pf_html + + } u; + + /* Input attachments + * XXX use filter_GetInputAttachments */ + int (*pf_get_attachments)( filter_t *, input_attachment_t ***, int * ); /* Private structure for the owner of the decoder */ filter_owner_sys_t *p_owner; @@ -116,7 +147,7 @@ struct filter_t */ static inline picture_t *filter_NewPicture( filter_t *p_filter ) { - picture_t *p_picture = p_filter->pf_vout_buffer_new( p_filter ); + picture_t *p_picture = p_filter->pf_video_buffer_new( p_filter ); if( !p_picture ) msg_Warn( p_filter, "can't get output picture" ); return p_picture; @@ -131,7 +162,16 @@ static inline picture_t *filter_NewPicture( filter_t *p_filter ) */ static inline void filter_DeletePicture( filter_t *p_filter, picture_t *p_picture ) { - p_filter->pf_vout_buffer_del( p_filter, p_picture ); + p_filter->pf_video_buffer_del( p_filter, p_picture ); +} + +/** + * This function will flush the state of a video filter. + */ +static inline void filter_FlushPictures( filter_t *p_filter ) +{ + if( p_filter->pf_video_flush ) + p_filter->pf_video_flush( p_filter ); } /** @@ -181,13 +221,28 @@ static inline block_t *filter_NewAudioBuffer( filter_t *p_filter, int i_size ) return p_block; } +/** + * This function gives all input attachments at once. + * + * You MUST release the returned values + */ +static inline int filter_GetInputAttachments( filter_t *p_filter, + input_attachment_t ***ppp_attachment, + int *pi_attachment ) +{ + if( !p_filter->pf_get_attachments ) + return VLC_EGENERIC; + return p_filter->pf_get_attachments( p_filter, + ppp_attachment, pi_attachment ); +} + /** * It creates a blend filter. * * Only the chroma properties of the dest format is used (chroma * type, rgb masks and shifts) */ -VLC_EXPORT( filter_t *, filter_NewBlend, ( vlc_object_t *, const video_format_t *p_dst_chroma ) ); +VLC_EXPORT( filter_t *, filter_NewBlend, ( vlc_object_t *, const video_format_t *p_dst_chroma ) LIBVLC_USED ); /** * It configures blend filter parameters that are allowed to changed @@ -246,8 +301,8 @@ typedef struct filter_chain_t filter_chain_t; * \param p_buffer_allocation_data pointer to private allocation data * \return pointer to a filter chain */ -VLC_EXPORT( filter_chain_t *, __filter_chain_New, ( vlc_object_t *, const char *, bool, int (*)( filter_t *, void * ), void (*)( filter_t * ), void * ) ); -#define filter_chain_New( a, b, c, d, e, f ) __filter_chain_New( VLC_OBJECT( a ), b, c, d, e, f ) +VLC_EXPORT( filter_chain_t *, filter_chain_New, ( vlc_object_t *, const char *, bool, int (*)( filter_t *, void * ), void (*)( filter_t * ), void * ) LIBVLC_USED ); +#define filter_chain_New( a, b, c, d, e, f ) filter_chain_New( VLC_OBJECT( a ), b, c, d, e, f ) /** * Delete filter chain will delete all filters in the chain and free all @@ -324,6 +379,11 @@ VLC_EXPORT( const es_format_t *, filter_chain_GetFmtOut, ( filter_chain_t * ) ); */ VLC_EXPORT( picture_t *, filter_chain_VideoFilter, ( filter_chain_t *, picture_t * ) ); +/** + * Flush a video filter chain. + */ +VLC_EXPORT( void, filter_chain_VideoFlush, ( filter_chain_t * ) ); + /** * Apply the filter chain to a audio block. * @@ -351,5 +411,12 @@ VLC_EXPORT( void, filter_chain_SubFilter, ( filter_chain_t *, mtime_t ) ); */ VLC_EXPORT( int, filter_chain_MouseFilter, ( filter_chain_t *, vlc_mouse_t *, const vlc_mouse_t * ) ); +/** + * Inform the filter chain of mouse state. + * + * It makes sense only for a sub filter chain. + */ +VLC_EXPORT( int, filter_chain_MouseEvent, ( filter_chain_t *, const vlc_mouse_t *, const video_format_t * ) ); + #endif /* _VLC_FILTER_H */