X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_filter.h;h=cd7943ac5974407ef2a4c4476848e101f0998162;hb=179450e645f04755a2fae880811a52a1a8580f32;hp=1262126c6b31ccd1e8670221f856fde3741d684b;hpb=ab131d8bfb68e02a952567e93c5a891ce8d6322c;p=vlc diff --git a/include/vlc_filter.h b/include/vlc_filter.h index 1262126c6b..cd7943ac59 100644 --- a/include/vlc_filter.h +++ b/include/vlc_filter.h @@ -22,10 +22,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#ifndef _VLC_FILTER_H -#define _VLC_FILTER_H 1 +#ifndef VLC_FILTER_H +#define VLC_FILTER_H 1 #include +#include +#include +#include /** * \file @@ -35,7 +38,7 @@ typedef struct filter_owner_sys_t filter_owner_sys_t; /** Structure describing a filter - * @warning BIG FAT WARNING : the code relies in the first 4 members of + * @warning BIG FAT WARNING : the code relies on the first 4 members of * filter_t and decoder_t to be the same, so if you have anything to add, * do it at the end of the structure. */ @@ -59,8 +62,8 @@ struct filter_t 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 *, picture_t *, + void ( * pf_video_blend ) ( filter_t *, + picture_t *, const picture_t *, int, int, int ); subpicture_t * ( *pf_sub_filter ) ( filter_t *, mtime_t ); @@ -69,6 +72,18 @@ struct filter_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 */ @@ -95,6 +110,9 @@ struct filter_t * buffer. You have to release it using filter_DeletePicture or by returning * it to the caller as a pf_video_filter return value. * Provided for convenience. + * + * \param p_filter filter_t object + * \return new picture on success or NULL on failure */ static inline picture_t *filter_NewPicture( filter_t *p_filter ) { @@ -107,6 +125,9 @@ static inline picture_t *filter_NewPicture( filter_t *p_filter ) /** * This function will release a picture create by filter_NewPicture. * Provided for convenience. + * + * \param p_filter filter_t object + * \param p_picture picture to be deleted */ static inline void filter_DeletePicture( filter_t *p_filter, picture_t *p_picture ) { @@ -118,6 +139,9 @@ static inline void filter_DeletePicture( filter_t *p_filter, picture_t *p_pictur * buffer. You have to release it using filter_DeleteSubpicture or by returning * it to the caller as a pf_sub_filter return value. * Provided for convenience. + * + * \param p_filter filter_t object + * \return new subpicture */ static inline subpicture_t *filter_NewSubpicture( filter_t *p_filter ) { @@ -130,6 +154,9 @@ static inline subpicture_t *filter_NewSubpicture( filter_t *p_filter ) /** * This function will release a subpicture create by filter_NewSubicture. * Provided for convenience. + * + * \param p_filter filter_t object + * \param p_subpicture to be released */ static inline void filter_DeleteSubpicture( filter_t *p_filter, subpicture_t *p_subpicture ) { @@ -141,6 +168,10 @@ static inline void filter_DeleteSubpicture( filter_t *p_filter, subpicture_t *p_ * output buffer. You have to release it using block_Release or by returning * it to the caller as a pf_audio_filter return value. * Provided for convenience. + * + * \param p_filter filter_t object + * \param i_size size of audio buffer requested + * \return block to be used as audio output buffer */ static inline block_t *filter_NewAudioBuffer( filter_t *p_filter, int i_size ) { @@ -150,6 +181,31 @@ 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 @@ -162,44 +218,138 @@ static inline block_t *filter_NewAudioBuffer( filter_t *p_filter, int i_size ) picture_t *p_pic ) \ { \ picture_t *p_outpic = filter_NewPicture( p_filter ); \ - if( !p_outpic ) \ + if( p_outpic ) \ { \ - picture_Release( p_pic ); \ - return NULL; \ + name( p_filter, p_pic, p_outpic ); \ + picture_CopyProperties( p_outpic, p_pic ); \ } \ - \ - name( p_filter, p_pic, p_outpic ); \ - \ - picture_CopyProperties( p_outpic, p_pic ); \ picture_Release( p_pic ); \ - \ return p_outpic; \ } /** * Filter chain management API + * The filter chain management API is used to dynamically construct filters + * and add them in a chain. */ typedef struct filter_chain_t filter_chain_t; +/** + * Create new filter chain + * + * \param p_object pointer to a vlc object + * \param psz_capability vlc capability of filters in filter chain + * \param b_allow_format_fmt_change allow changing of fmt + * \param pf_buffer_allocation_init callback function to initialize buffer allocations + * \param pf_buffer_allocation_clear callback function to clear buffer allocation initialization + * \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 ) + +/** + * Delete filter chain will delete all filters in the chain and free all + * allocated data. The pointer to the filter chain is then no longer valid. + * + * \param p_chain pointer to filter chain + */ VLC_EXPORT( void, filter_chain_Delete, ( filter_chain_t * ) ); + +/** + * Reset filter chain will delete all filters in the chain and + * reset p_fmt_in and p_fmt_out to the new values. + * + * \param p_chain pointer to filter chain + * \param p_fmt_in new fmt_in params + * \param p_fmt_out new fmt_out params + */ VLC_EXPORT( void, filter_chain_Reset, ( filter_chain_t *, const es_format_t *, const es_format_t * ) ); +/** + * Append filter to the end of the chain. + * + * \param p_chain pointer to filter chain + * \param psz_name name of filter + * \param p_cfg + * \param p_fmt_in input es_format_t + * \param p_fmt_out output es_format_t + * \return pointer to filter chain + */ VLC_EXPORT( filter_t *, filter_chain_AppendFilter, ( filter_chain_t *, const char *, config_chain_t *, const es_format_t *, const es_format_t * ) ); + +/** + * Append new filter to filter chain from string. + * + * \param p_chain pointer to filter chain + * \param psz_string string of filters + * \return 0 for success + */ VLC_EXPORT( int, filter_chain_AppendFromString, ( filter_chain_t *, const char * ) ); + +/** + * Delete filter from filter chain. This function also releases the filter + * object and unloads the filter modules. The pointer to p_filter is no + * longer valid after this function successfully returns. + * + * \param p_chain pointer to filter chain + * \param p_filter pointer to filter object + * \return VLC_SUCCESS on succes, else VLC_EGENERIC + */ VLC_EXPORT( int, filter_chain_DeleteFilter, ( filter_chain_t *, filter_t * ) ); -VLC_EXPORT( filter_t *, filter_chain_GetFilter, ( filter_chain_t *, int, const char * ) ); +/** + * Get the number of filters in the filter chain. + * + * \param p_chain pointer to filter chain + * \return number of filters in this filter chain + */ VLC_EXPORT( int, filter_chain_GetLength, ( filter_chain_t * ) ); + +/** + * Get last p_fmt_out in the chain. + * + * \param p_chain pointer to filter chain + * \return last p_fmt (es_format_t) of this filter chain + */ VLC_EXPORT( const es_format_t *, filter_chain_GetFmtOut, ( filter_chain_t * ) ); /** - * Apply the filter chain + * Apply the filter chain to a video picture. + * + * \param p_chain pointer to filter chain + * \param p_picture picture to apply filters on + * \return modified picture after applying all video filters */ VLC_EXPORT( picture_t *, filter_chain_VideoFilter, ( filter_chain_t *, picture_t * ) ); + +/** + * Apply the filter chain to a audio block. + * + * \param p_chain pointer to filter chain + * \param p_block audio frame to apply filters on + * \return modified audio frame after applying all audio filters + */ VLC_EXPORT( block_t *, filter_chain_AudioFilter, ( filter_chain_t *, block_t * ) ); + +/** + * Apply filter chain to subpictures. + * + * \param p_chain pointer to filter chain + * \param display_date of subpictures + */ 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 * ) ); + #endif /* _VLC_FILTER_H */ +