X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_filter.h;h=dd5cc299cbf2e5d4f54097cb9672bbf572447fe5;hb=37a27cc6447a51b5780adf0917ab7b22a4456a5b;hp=6dbb2f117ca115564918b3e12b8c530aa7516617;hpb=78d87996ccb92d1dc91c9987685f976ed3be08a6;p=vlc diff --git a/include/vlc_filter.h b/include/vlc_filter.h index 6dbb2f117c..dd5cc299cb 100644 --- a/include/vlc_filter.h +++ b/include/vlc_filter.h @@ -28,6 +28,7 @@ #include #include #include +#include /** * \file @@ -59,35 +60,71 @@ 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 *, 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 * ); - - /* - * 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 * ); + 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_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; /* Private structure for the owner of the decoder */ filter_owner_sys_t *p_owner; }; @@ -103,7 +140,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; @@ -118,7 +155,7 @@ 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 ); } /** @@ -168,6 +205,32 @@ static inline block_t *filter_NewAudioBuffer( filter_t *p_filter, int i_size ) return p_block; } +/** + * 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 ) ); + +/** + * It configures blend filter parameters that are allowed to changed + * after the creation. + */ +VLC_EXPORT( int, filter_ConfigureBlend, ( filter_t *, int i_dst_width, int i_dst_height, const video_format_t *p_src ) ); + +/** + * It blends a picture into another one. + * + * The input picture is not modified and not released. + */ +VLC_EXPORT( int, filter_Blend, ( filter_t *, picture_t *p_dst, int i_dst_x, int i_dst_y, const picture_t *p_src, int i_alpha ) ); + +/** + * It destroys a blend filter created by filter_NewBlend. + */ +VLC_EXPORT( void, filter_DeleteBlend, ( filter_t * ) ); + /** * Create a picture_t *(*)( filter_t *, picture_t * ) compatible wrapper * using a void (*)( filter_t *, picture_t *, picture_t * ) function @@ -207,8 +270,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 * ) ); +#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 @@ -260,16 +323,6 @@ VLC_EXPORT( int, filter_chain_AppendFromString, ( filter_chain_t *, const char * */ VLC_EXPORT( int, filter_chain_DeleteFilter, ( filter_chain_t *, filter_t * ) ); -/** - * Get filter by name of position in the filter chain. - * - * \param p_chain pointer to filter chain - * \param i_position position of filter in filter chain - * \param psz_name name of filter to get - * \return filter object based on position or name provided - */ -VLC_EXPORT( filter_t *, filter_chain_GetFilter, ( filter_chain_t *, int, const char * ) ); - /** * Get the number of filters in the filter chain. * @@ -312,5 +365,22 @@ VLC_EXPORT( block_t *, filter_chain_AudioFilter, ( filter_chain_t *, block_t * ) */ VLC_EXPORT( void, filter_chain_SubFilter, ( filter_chain_t *, mtime_t ) ); +/** + * Apply the filter chain to a mouse state. + * + * It will be applied from the output to the input. It makes sense only + * for a video filter chain. + * + * The vlc_mouse_t* pointers may be the same. + */ +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 */