X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_subpictures.c;h=45d05414e16870e470c86ec4be329e3b608b38d7;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=3381ddcac88e6bba22f047ae10a04a21f38ab61b;hpb=acbad93b8b447ac9f776a53bf3e8f74f15132fe4;p=vlc diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index 3381ddcac8..45d05414e1 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -30,26 +30,55 @@ # include "config.h" #endif +#include +#include + #include #include #include #include -#include +#include #include "../libvlc.h" - -#include -#include +#include "vout_internal.h" +#include +#include +#include +#include "../misc/subpicture.h" /***************************************************************************** * Local prototypes *****************************************************************************/ + +/* Number of simultaneous subpictures */ +#define VOUT_MAX_SUBPICTURES (__MAX(VOUT_MAX_PICTURES, SPU_MAX_PREPARE_TIME/5000)) + +/* */ +typedef struct +{ + subpicture_t *p_subpicture; + bool b_reject; +} spu_heap_entry_t; + +typedef struct +{ + spu_heap_entry_t p_entry[VOUT_MAX_SUBPICTURES]; + +} spu_heap_t; + +static void SpuHeapInit( spu_heap_t * ); +static int SpuHeapPush( spu_heap_t *, subpicture_t * ); +static void SpuHeapDeleteAt( spu_heap_t *, int i_index ); +static int SpuHeapDeleteSubpicture( spu_heap_t *, subpicture_t * ); +static void SpuHeapClean( spu_heap_t *p_heap ); + struct spu_private_t { - vlc_mutex_t subpicture_lock; /**< subpicture heap lock */ - subpicture_t p_subpicture[VOUT_MAX_SUBPICTURES]; /**< subpictures */ - int i_channel; /**< number of subpicture channels registered */ - int64_t i_subpicture_order; /**< number of created subpicture since spu creation */ + vlc_mutex_t lock; /* lock to protect all followings fields */ + vlc_object_t *p_input; + + spu_heap_t heap; + int i_channel; /**< number of subpicture channels registered */ filter_t *p_blend; /**< alpha blending module */ filter_t *p_text; /**< text renderer module */ filter_t *p_scale_yuvp; /**< scaling module for YUVP */ @@ -61,121 +90,130 @@ struct spu_private_t bool b_force_palette; /**< force palette of subpicture */ uint8_t palette[4][4]; /**< forced palette */ - /* Supciture filters */ + /* Subpiture filters */ + char *psz_chain_update; + vlc_mutex_t chain_lock; filter_chain_t *p_chain; -}; -static void UpdateSPU ( spu_t *, vlc_object_t * ); -static int CropCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); + /* */ + mtime_t i_last_sort_date; +}; -static int SpuControl( spu_t *, int, va_list ); +/* */ +typedef struct +{ + int w; + int h; +} spu_scale_t; +static spu_scale_t spu_scale_create( int w, int h ); +static spu_scale_t spu_scale_unit(void ); +static spu_scale_t spu_scale_createq( int wn, int wd, int hn, int hd ); +static int spu_scale_w( int v, const spu_scale_t s ); +static int spu_scale_h( int v, const spu_scale_t s ); +static int spu_invscale_w( int v, const spu_scale_t s ); +static int spu_invscale_h( int v, const spu_scale_t s ); -static subpicture_t *sub_new_buffer( filter_t * ); -static void sub_del_buffer( filter_t *, subpicture_t * ); -static subpicture_t *spu_new_buffer( filter_t * ); -static void spu_del_buffer( filter_t *, subpicture_t * ); -static picture_t *spu_new_video_buffer( filter_t * ); -static void spu_del_video_buffer( filter_t *, picture_t * ); +typedef struct +{ + int i_x; + int i_y; + int i_width; + int i_height; -static int spu_ParseChain( spu_t * ); -static int SubFilterCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); + spu_scale_t scale; +} spu_area_t; -static int SubFilterAllocationInit( filter_t *, void * ); -static void SubFilterAllocationClean( filter_t * ); -struct filter_owner_sys_t -{ - spu_t *p_spu; - int i_channel; -}; +static spu_area_t spu_area_create( int x, int y, int w, int h, spu_scale_t ); +static spu_area_t spu_area_scaled( spu_area_t ); +static spu_area_t spu_area_unscaled( spu_area_t, spu_scale_t ); +static bool spu_area_overlap( spu_area_t, spu_area_t ); -#define SCALE_UNIT (1000) -#define VLC_FOURCC_YUVP VLC_FOURCC('Y','U','V','P') -#define VLC_FOURCC_YUVA VLC_FOURCC('Y','U','V','A') -#define VLC_FOURCC_RGBA VLC_FOURCC('R','G','B','A') -#define VLC_FOURCC_TEXT VLC_FOURCC('T','E','X','T') +/* Subpicture rendered flag + * FIXME ? it could be moved to private ? */ +#define SUBPICTURE_RENDERED (0x1000) +#if SUBPICTURE_RENDERED < SUBPICTURE_ALIGN_MASK +# error SUBPICTURE_RENDERED too low +#endif -/* */ -struct subpicture_region_private_t -{ - video_format_t fmt; - picture_t *p_picture; -}; +#define SCALE_UNIT (1000) -static subpicture_region_private_t *SpuRegionPrivateCreate( video_format_t *p_fmt ) -{ - subpicture_region_private_t *p_private = malloc( sizeof(*p_private) ); +static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic ); +static int SubpictureCmp( const void *s0, const void *s1 ); - if( !p_private ) - return NULL; +static void SpuRenderRegion( spu_t *, + picture_t *p_pic_dst, spu_area_t *, + subpicture_t *, subpicture_region_t *, + const spu_scale_t scale_size, + const video_format_t *p_fmt, + const spu_area_t *p_subtitle_area, int i_subtitle_area, + mtime_t render_date ); - p_private->fmt = *p_fmt; - if( p_fmt->p_palette ) - { - p_private->fmt.p_palette = malloc( sizeof(*p_private->fmt.p_palette) ); - if( p_private->fmt.p_palette ) - *p_private->fmt.p_palette = *p_fmt->p_palette; - } - p_private->p_picture = NULL; +static void UpdateSPU ( spu_t *, vlc_object_t * ); +static int CropCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); - return p_private; -} -static void SpuRegionPrivateDestroy( subpicture_region_private_t *p_private ) +/* Buffer allocation for SPU filter (blend, scale, ...) */ +struct filter_owner_sys_t { - if( p_private->p_picture ) - picture_Release( p_private->p_picture ); - free( p_private->fmt.p_palette ); - free( p_private ); -} + spu_t *p_spu; + int i_channel; +}; +static int spu_get_attachments( filter_t *, + input_attachment_t ***, int * ); +static picture_t *spu_new_video_buffer( filter_t * ); +static void spu_del_video_buffer( filter_t *, picture_t * ); + +/* Buffer aloccation fir SUB filter */ +static int SubFilterAllocationInit( filter_t *, void * ); +static void SubFilterAllocationClean( filter_t * ); /* */ -static void SpuRenderCreateAndLoadText( spu_t *p_spu ); -static void SpuRenderCreateAndLoadScale( spu_t *p_spu ); +static void SpuRenderCreateAndLoadText( spu_t * ); +static void SpuRenderCreateAndLoadScale( spu_t * ); static void FilterRelease( filter_t *p_filter ); +/***************************************************************************** + * Public API + *****************************************************************************/ + +#undef spu_Create /** * Creates the subpicture unit * * \param p_this the parent object which creates the subpicture unit */ -spu_t *__spu_Create( vlc_object_t *p_this ) +spu_t *spu_Create( vlc_object_t *p_this ) { - int i_index; - spu_t *p_spu; spu_private_t *p_sys; - + p_spu = vlc_custom_create( p_this, sizeof(spu_t) + sizeof(spu_private_t), VLC_OBJECT_GENERIC, "subpicture" ); - if( !p_spu ) return NULL; + vlc_object_attach( p_spu, p_this ); /* Initialize spu fields */ - p_spu->pf_control = SpuControl; p_spu->p = p_sys = (spu_private_t*)&p_spu[1]; /* Initialize private fields */ - p_sys->i_subpicture_order = 1; - for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++) - { - p_sys->p_subpicture[i_index].i_status = FREE_SUBPICTURE; - } + vlc_mutex_init( &p_sys->lock ); + + SpuHeapInit( &p_sys->heap ); p_sys->p_blend = NULL; p_sys->p_text = NULL; p_sys->p_scale = NULL; p_sys->p_scale_yuvp = NULL; - /* Register the default subpicture channel */ - p_sys->i_channel = 2; - - vlc_mutex_init( &p_sys->subpicture_lock ); + p_sys->i_margin = var_InheritInteger( p_spu, "sub-margin" ); - vlc_object_attach( p_spu, p_this ); + /* Register the default subpicture channel */ + p_sys->i_channel = SPU_DEFAULT_CHANNEL + 1; + p_sys->psz_chain_update = NULL; + vlc_mutex_init( &p_sys->chain_lock ); p_sys->p_chain = filter_chain_New( p_spu, "sub filter", false, SubFilterAllocationInit, SubFilterAllocationClean, @@ -185,42 +223,10 @@ spu_t *__spu_Create( vlc_object_t *p_this ) SpuRenderCreateAndLoadText( p_spu ); SpuRenderCreateAndLoadScale( p_spu ); - return p_spu; -} - -/** - * Initialise the subpicture unit - * - * \param p_spu the subpicture unit object - */ -int spu_Init( spu_t *p_spu ) -{ - spu_private_t *p_sys = p_spu->p; - - /* If the user requested a sub margin, we force the position. */ - p_sys->i_margin = var_CreateGetInteger( p_spu, "sub-margin" ); - - var_Create( p_spu, "sub-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_AddCallback( p_spu, "sub-filter", SubFilterCallback, p_spu ); - - spu_ParseChain( p_spu ); - - return VLC_SUCCESS; -} - -int spu_ParseChain( spu_t *p_spu ) -{ - char *psz_parser = var_GetString( p_spu, "sub-filter" ); - int i_ret; - - if( !psz_parser ) - return VLC_EGENERIC; - - i_ret = filter_chain_AppendFromString( p_spu->p->p_chain, psz_parser ); - - free( psz_parser ); + /* */ + p_sys->i_last_sort_date = -1; - return i_ret; + return p_spu; } /** @@ -231,19 +237,9 @@ int spu_ParseChain( spu_t *p_spu ) void spu_Destroy( spu_t *p_spu ) { spu_private_t *p_sys = p_spu->p; - int i_index; - - /* Destroy all remaining subpictures */ - for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ ) - { - if( p_sys->p_subpicture[i_index].i_status != FREE_SUBPICTURE ) - { - spu_DestroySubpicture( p_spu, &p_sys->p_subpicture[i_index] ); - } - } if( p_sys->p_blend ) - FilterRelease( p_sys->p_blend ); + filter_DeleteBlend( p_sys->p_blend ); if( p_sys->p_text ) FilterRelease( p_sys->p_text ); @@ -255,8 +251,13 @@ void spu_Destroy( spu_t *p_spu ) FilterRelease( p_sys->p_scale ); filter_chain_Delete( p_sys->p_chain ); + vlc_mutex_destroy( &p_sys->chain_lock ); + free( p_sys->psz_chain_update ); - vlc_mutex_destroy( &p_sys->subpicture_lock ); + /* Destroy all remaining subpictures */ + SpuHeapClean( &p_sys->heap ); + + vlc_mutex_destroy( &p_sys->lock ); vlc_object_release( p_spu ); } @@ -267,95 +268,49 @@ void spu_Destroy( spu_t *p_spu ) * \param p_this the object in which to destroy the subpicture unit * \param b_attach to select attach or detach */ -void spu_Attach( spu_t *p_spu, vlc_object_t *p_this, bool b_attach ) +void spu_Attach( spu_t *p_spu, vlc_object_t *p_input, bool b_attach ) { - vlc_object_t *p_input; - - p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT ); - if( !p_input ) return; - if( b_attach ) { - UpdateSPU( p_spu, VLC_OBJECT(p_input) ); + UpdateSPU( p_spu, p_input ); + var_Create( p_input, "highlight", VLC_VAR_BOOL ); var_AddCallback( p_input, "highlight", CropCallback, p_spu ); - vlc_object_release( p_input ); - } - else - { - /* Delete callback */ - var_DelCallback( p_input, "highlight", CropCallback, p_spu ); - vlc_object_release( p_input ); - } -} -/* */ -subpicture_region_t *subpicture_region_New( const video_format_t *p_fmt ) -{ - subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) ); - if( !p_region ) - return NULL; + vlc_mutex_lock( &p_spu->p->lock ); + p_spu->p->p_input = p_input; - p_region->fmt = *p_fmt; - p_region->fmt.p_palette = NULL; - if( p_fmt->i_chroma == VLC_FOURCC_YUVP ) - { - p_region->fmt.p_palette = calloc( 1, sizeof(*p_region->fmt.p_palette) ); - if( p_fmt->p_palette ) - *p_region->fmt.p_palette = *p_fmt->p_palette; + FilterRelease( p_spu->p->p_text ); + p_spu->p->p_text = NULL; + SpuRenderCreateAndLoadText( p_spu ); + + vlc_mutex_unlock( &p_spu->p->lock ); } - p_region->i_alpha = 0xff; - p_region->p_next = NULL; - p_region->p_private = NULL; - p_region->psz_text = NULL; - p_region->p_style = NULL; - p_region->p_picture = NULL; - - if( p_fmt->i_chroma == VLC_FOURCC_TEXT ) - return p_region; - - p_region->p_picture = picture_New( p_fmt->i_chroma, p_fmt->i_width, p_fmt->i_height, - p_fmt->i_aspect ); - if( !p_region->p_picture ) + else { - free( p_fmt->p_palette ); - free( p_region ); - return NULL; - } - - return p_region; -} - -/* */ -void subpicture_region_Delete( subpicture_region_t *p_region ) -{ - if( !p_region ) - return; - - if( p_region->p_private ) - SpuRegionPrivateDestroy( p_region->p_private ); - - if( p_region->p_picture ) - picture_Release( p_region->p_picture ); - - free( p_region->fmt.p_palette ); + vlc_mutex_lock( &p_spu->p->lock ); + p_spu->p->p_input = NULL; + vlc_mutex_unlock( &p_spu->p->lock ); - free( p_region->psz_text ); - free( p_region->psz_html ); - //free( p_region->p_style ); FIXME --fenrir plugin does not allocate the memory for it. I think it might lead to segfault, video renderer can live longer than the decoder - free( p_region ); + /* Delete callbacks */ + var_DelCallback( p_input, "highlight", CropCallback, p_spu ); + var_Destroy( p_input, "highlight" ); + } } -/* */ -void subpicture_region_ChainDelete( subpicture_region_t *p_head ) +/** + * Inform the SPU filters of mouse event + */ +int spu_ProcessMouse( spu_t *p_spu, + const vlc_mouse_t *p_mouse, + const video_format_t *p_fmt ) { - while( p_head ) - { - subpicture_region_t *p_next = p_head->p_next; + spu_private_t *p_sys = p_spu->p; - subpicture_region_Delete( p_head ); + vlc_mutex_lock( &p_sys->chain_lock ); + filter_chain_MouseEvent( p_sys->p_chain, p_mouse, p_fmt ); + vlc_mutex_unlock( &p_sys->chain_lock ); - p_head = p_next; - } + return VLC_SUCCESS; } /** @@ -368,191 +323,524 @@ void subpicture_region_ChainDelete( subpicture_region_t *p_head ) */ void spu_DisplaySubpicture( spu_t *p_spu, subpicture_t *p_subpic ) { - /* Check if status is valid */ - if( p_subpic->i_status != RESERVED_SUBPICTURE ) - { - msg_Err( p_spu, "subpicture %p has invalid status #%d", - p_subpic, p_subpic->i_status ); - } + spu_private_t *p_sys = p_spu->p; - if( p_subpic->i_channel == DEFAULT_CHAN ) + /* SPU_DEFAULT_CHANNEL always reset itself */ + if( p_subpic->i_channel == SPU_DEFAULT_CHANNEL ) + spu_ClearChannel( p_spu, SPU_DEFAULT_CHANNEL ); + + /* p_private is for spu only and cannot be non NULL here */ + for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next ) + assert( r->p_private == NULL ); + + /* */ + vlc_mutex_lock( &p_sys->lock ); + if( SpuHeapPush( &p_sys->heap, p_subpic ) ) { - p_subpic->i_channel = 0xFFFF; - spu_Control( p_spu, SPU_CHANNEL_CLEAR, DEFAULT_CHAN ); - p_subpic->i_channel = DEFAULT_CHAN; + vlc_mutex_unlock( &p_sys->lock ); + msg_Err( p_spu, "subpicture heap full" ); + subpicture_Delete( p_subpic ); + return; } - - /* Remove reservation flag */ - p_subpic->i_status = READY_SUBPICTURE; + vlc_mutex_unlock( &p_sys->lock ); } /** - * Allocate a subpicture in the spu heap. - * - * This function create a reserved subpicture in the spu heap. - * A null pointer is returned if the function fails. This method provides an - * already allocated zone of memory in the spu data fields. It needs locking - * since several pictures can be created by several producers threads. - * \param p_spu the subpicture unit in which to create the subpicture - * \return NULL on error, a reserved subpicture otherwise + * This function renders all sub picture units in the list. */ -subpicture_t *spu_CreateSubpicture( spu_t *p_spu ) +void spu_RenderSubpictures( spu_t *p_spu, + picture_t *p_pic_dst, const video_format_t *p_fmt_dst, + subpicture_t *p_subpic_list, + const video_format_t *p_fmt_src, + mtime_t render_subtitle_date ) { spu_private_t *p_sys = p_spu->p; - int i_subpic; /* subpicture index */ - subpicture_t * p_subpic = NULL; /* first free subpicture */ - /* Get lock */ - vlc_mutex_lock( &p_sys->subpicture_lock ); + const mtime_t render_osd_date = mdate(); - /* - * Look for an empty place - */ - p_subpic = NULL; - for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ ) - { - if( p_sys->p_subpicture[i_subpic].i_status == FREE_SUBPICTURE ) - { - /* Subpicture is empty and ready for allocation */ - p_subpic = &p_sys->p_subpicture[i_subpic]; - p_sys->p_subpicture[i_subpic].i_status = RESERVED_SUBPICTURE; - break; - } - } + const int i_source_video_width = p_fmt_src->i_width; + const int i_source_video_height = p_fmt_src->i_height; - /* If no free subpicture could be found */ - if( p_subpic == NULL ) - { - msg_Err( p_spu, "subpicture heap is full" ); - vlc_mutex_unlock( &p_sys->subpicture_lock ); - return NULL; - } + unsigned int i_subpicture; + subpicture_t *pp_subpicture[VOUT_MAX_SUBPICTURES]; - /* Copy subpicture information, set some default values */ - memset( p_subpic, 0, sizeof(subpicture_t) ); - p_subpic->i_order = p_sys->i_subpicture_order++; - p_subpic->i_status = RESERVED_SUBPICTURE; - p_subpic->b_absolute = true; - p_subpic->b_fade = false; - p_subpic->b_subtitle = false; - p_subpic->i_alpha = 0xFF; - p_subpic->p_region = NULL; - p_subpic->pf_render = NULL; - p_subpic->pf_destroy = NULL; - p_subpic->p_sys = NULL; - vlc_mutex_unlock( &p_sys->subpicture_lock ); + unsigned int i_subtitle_region_count; + spu_area_t p_subtitle_area_buffer[VOUT_MAX_SUBPICTURES]; + spu_area_t *p_subtitle_area; + int i_subtitle_area; - return p_subpic; -} + vlc_mutex_lock( &p_sys->lock ); -/** - * Remove a subpicture from the heap - * - * This function frees a previously reserved subpicture. - * It is meant to be used when the construction of a picture aborted. - * This function does not need locking since reserved subpictures are ignored - * by the spu. - */ -void spu_DestroySubpicture( spu_t *p_spu, subpicture_t *p_subpic ) -{ - spu_private_t *p_sys = p_spu->p; + /* Preprocess subpictures */ + i_subpicture = 0; + i_subtitle_region_count = 0; + for( subpicture_t * p_subpic = p_subpic_list; + p_subpic != NULL; + p_subpic = p_subpic->p_next ) + { + subpicture_Update( p_subpic, + p_fmt_src, p_fmt_dst, + p_subpic->b_subtitle ? render_subtitle_date : render_osd_date ); - /* Get lock */ - vlc_mutex_lock( &p_sys->subpicture_lock ); + /* */ + if( p_subpic->b_subtitle ) + { + for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next ) + i_subtitle_region_count++; + } - /* There can be race conditions so we need to check the status */ - if( p_subpic->i_status == FREE_SUBPICTURE ) - { - vlc_mutex_unlock( &p_sys->subpicture_lock ); - return; + /* */ + pp_subpicture[i_subpicture++] = p_subpic; } - /* Check if status is valid */ - if( ( p_subpic->i_status != RESERVED_SUBPICTURE ) - && ( p_subpic->i_status != READY_SUBPICTURE ) ) + /* Be sure we have at least 1 picture to process */ + if( i_subpicture <= 0 ) { - msg_Err( p_spu, "subpicture %p has invalid status %d", - p_subpic, p_subpic->i_status ); + vlc_mutex_unlock( &p_sys->lock ); + return; } - subpicture_region_ChainDelete( p_subpic->p_region ); - p_subpic->p_region = NULL; + /* Now order subpicture array + * XXX The order is *really* important for overlap subtitles positionning */ + qsort( pp_subpicture, i_subpicture, sizeof(*pp_subpicture), SubpictureCmp ); - if( p_subpic->pf_destroy ) - { - p_subpic->pf_destroy( p_subpic ); - } + /* Allocate area array for subtitle overlap */ + i_subtitle_area = 0; + p_subtitle_area = p_subtitle_area_buffer; + if( i_subtitle_region_count > sizeof(p_subtitle_area_buffer)/sizeof(*p_subtitle_area_buffer) ) + p_subtitle_area = calloc( i_subtitle_region_count, sizeof(*p_subtitle_area) ); - p_subpic->i_status = FREE_SUBPICTURE; + /* Create the blending module */ + if( !p_sys->p_blend ) + p_spu->p->p_blend = filter_NewBlend( VLC_OBJECT(p_spu), p_fmt_dst ); - vlc_mutex_unlock( &p_sys->subpicture_lock ); -} + /* Process all subpictures and regions (in the right order) */ + for( unsigned int i_index = 0; i_index < i_subpicture; i_index++ ) + { + subpicture_t *p_subpic = pp_subpicture[i_index]; + subpicture_region_t *p_region; -static void FilterRelease( filter_t *p_filter ) -{ - if( p_filter->p_module ) - module_unneed( p_filter, p_filter->p_module ); + if( !p_subpic->p_region ) + continue; - vlc_object_detach( p_filter ); - vlc_object_release( p_filter ); -} + /* FIXME when possible use a better rendering size than source size + * (max of display size and source size for example) FIXME */ + int i_render_width = p_subpic->i_original_picture_width; + int i_render_height = p_subpic->i_original_picture_height; + if( !i_render_width || !i_render_height ) + { + if( i_render_width != 0 || i_render_height != 0 ) + msg_Err( p_spu, "unsupported original picture size %dx%d", + i_render_width, i_render_height ); -static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_aspect ) -{ - filter_t *p_blend; + p_subpic->i_original_picture_width = i_render_width = i_source_video_width; + p_subpic->i_original_picture_height = i_render_height = i_source_video_height; + } - assert( !p_spu->p->p_blend ); + if( p_sys->p_text ) + { + p_sys->p_text->fmt_out.video.i_width = + p_sys->p_text->fmt_out.video.i_visible_width = i_render_width; - p_spu->p->p_blend = - p_blend = vlc_custom_create( p_spu, sizeof(filter_t), - VLC_OBJECT_GENERIC, "blend" ); - if( !p_blend ) - return; + p_sys->p_text->fmt_out.video.i_height = + p_sys->p_text->fmt_out.video.i_visible_height = i_render_height; + } + + /* Compute scaling from picture to source size */ + spu_scale_t scale = spu_scale_createq( i_source_video_width, i_render_width, + i_source_video_height, i_render_height ); + + /* Update scaling from source size to display size(p_fmt_dst) */ + scale.w = scale.w * p_fmt_dst->i_width / i_source_video_width; + scale.h = scale.h * p_fmt_dst->i_height / i_source_video_height; + + /* Set default subpicture aspect ratio + * FIXME if we only handle 1 aspect ratio per picture, why is it set per + * region ? */ + p_region = p_subpic->p_region; + if( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den ) + { + p_region->fmt.i_sar_den = p_fmt_dst->i_sar_den; + p_region->fmt.i_sar_num = p_fmt_dst->i_sar_num; + } + + /* Take care of the aspect ratio */ + if( p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den != + p_region->fmt.i_sar_den * p_fmt_dst->i_sar_num ) + { + /* FIXME FIXME what about region->i_x/i_y ? */ + scale.w = scale.w * + (int64_t)p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den / + p_region->fmt.i_sar_den / p_fmt_dst->i_sar_num; + } + + /* Render all regions + * We always transform non absolute subtitle into absolute one on the + * first rendering to allow good subtitle overlap support. + */ + for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next ) + { + spu_area_t area; - es_format_Init( &p_blend->fmt_in, VIDEO_ES, 0 ); + /* Check scale validity */ + if( scale.w <= 0 || scale.h <= 0 ) + continue; - es_format_Init( &p_blend->fmt_out, VIDEO_ES, 0 ); - p_blend->fmt_out.video.i_x_offset = 0; - p_blend->fmt_out.video.i_y_offset = 0; - p_blend->fmt_out.video.i_chroma = i_chroma; - p_blend->fmt_out.video.i_aspect = i_aspect; + /* */ + SpuRenderRegion( p_spu, p_pic_dst, &area, + p_subpic, p_region, scale, p_fmt_dst, + p_subtitle_area, i_subtitle_area, + p_subpic->b_subtitle ? render_subtitle_date : render_osd_date ); - /* The blend module will be loaded when needed with the real - * input format */ - p_blend->p_module = NULL; + if( p_subpic->b_subtitle ) + { + area = spu_area_unscaled( area, scale ); + if( !p_subpic->b_absolute && area.i_width > 0 && area.i_height > 0 ) + { + p_region->i_x = area.i_x; + p_region->i_y = area.i_y; + } + if( p_subtitle_area ) + p_subtitle_area[i_subtitle_area++] = area; + } + } + if( p_subpic->b_subtitle ) + p_subpic->b_absolute = true; + } /* */ - vlc_object_attach( p_blend, p_spu ); + if( p_subtitle_area != p_subtitle_area_buffer ) + free( p_subtitle_area ); + + vlc_mutex_unlock( &p_sys->lock ); } -static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_height, - const video_format_t *p_in_fmt ) + +/***************************************************************************** + * spu_SortSubpictures: find the subpictures to display + ***************************************************************************** + * This function parses all subpictures and decides which ones need to be + * displayed. If no picture has been selected, display_date will depend on + * the subpicture. + * We also check for ephemer DVD subpictures (subpictures that have + * to be removed if a newer one is available), which makes it a lot + * more difficult to guess if a subpicture has to be rendered or not. + *****************************************************************************/ +subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t render_subtitle_date, + bool b_subtitle_only ) { - filter_t *p_blend = p_spu->p->p_blend; + spu_private_t *p_sys = p_spu->p; + subpicture_t *p_subpic = NULL; + const mtime_t render_osd_date = mdate(); - assert( p_blend ); + /* Update sub-filter chain */ + vlc_mutex_lock( &p_sys->lock ); + char *psz_chain_update = p_sys->psz_chain_update; + p_sys->psz_chain_update = NULL; + vlc_mutex_unlock( &p_sys->lock ); - /* */ - if( p_blend->p_module && p_blend->fmt_in.video.i_chroma != p_in_fmt->i_chroma ) + vlc_mutex_lock( &p_sys->chain_lock ); + if( psz_chain_update ) { - /* The chroma is not the same, we need to reload the blend module - * XXX to match the old behaviour just test !p_blend->fmt_in.video.i_chroma */ - module_unneed( p_blend, p_blend->p_module ); - p_blend->p_module = NULL; + filter_chain_Reset( p_sys->p_chain, NULL, NULL ); + + filter_chain_AppendFromString( p_spu->p->p_chain, psz_chain_update ); + + free( psz_chain_update ); } + /* Run subpicture filters */ + filter_chain_SubFilter( p_sys->p_chain, render_osd_date ); + vlc_mutex_unlock( &p_sys->chain_lock ); - /* */ - p_blend->fmt_in.video = *p_in_fmt; + vlc_mutex_lock( &p_sys->lock ); - /* */ - p_blend->fmt_out.video.i_width = - p_blend->fmt_out.video.i_visible_width = i_out_width; - p_blend->fmt_out.video.i_height = - p_blend->fmt_out.video.i_visible_height = i_out_height; + /* Create a list of channels */ + int pi_channel[VOUT_MAX_SUBPICTURES]; + int i_channel_count = 0; - /* */ - if( !p_blend->p_module ) - p_blend->p_module = module_need( p_blend, "video blending", 0, 0 ); + for( int i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ ) + { + spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_index]; + if( !p_entry->p_subpicture || p_entry->b_reject ) + continue; + const int i_channel = p_entry->p_subpicture->i_channel; + int i; + for( i = 0; i < i_channel_count; i++ ) + { + if( pi_channel[i] == i_channel ) + break; + } + if( i_channel_count <= i ) + pi_channel[i_channel_count++] = i_channel; + } + + /* We get an easily parsable chained list of subpictures which + * ends with NULL since p_subpic was initialized to NULL. */ + for( int i = 0; i < i_channel_count; i++ ) + { + const int i_channel = pi_channel[i]; + subpicture_t *p_available_subpic[VOUT_MAX_SUBPICTURES]; + bool pb_available_late[VOUT_MAX_SUBPICTURES]; + int i_available = 0; + + mtime_t start_date = render_subtitle_date; + mtime_t ephemer_subtitle_date = 0; + mtime_t ephemer_osd_date = 0; + int64_t i_ephemer_subtitle_order = INT64_MIN; + int64_t i_ephemer_system_order = INT64_MIN; + int i_index; + + /* Select available pictures */ + for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ ) + { + spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_index]; + subpicture_t *p_current = p_entry->p_subpicture; + bool b_stop_valid; + bool b_late; + + if( !p_current || p_entry->b_reject ) + { + if( p_entry->b_reject ) + SpuHeapDeleteAt( &p_sys->heap, i_index ); + continue; + } + + if( p_current->i_channel != i_channel || + ( b_subtitle_only && !p_current->b_subtitle ) ) + { + continue; + } + const mtime_t render_date = p_current->b_subtitle ? render_subtitle_date : render_osd_date; + if( render_date && + render_date < p_current->i_start ) + { + /* Too early, come back next monday */ + continue; + } + + mtime_t *pi_ephemer_date = p_current->b_subtitle ? &ephemer_subtitle_date : &ephemer_osd_date; + int64_t *pi_ephemer_order = p_current->b_subtitle ? &i_ephemer_subtitle_order : &i_ephemer_system_order; + if( p_current->i_start >= *pi_ephemer_date ) + { + *pi_ephemer_date = p_current->i_start; + if( p_current->i_order > *pi_ephemer_order ) + *pi_ephemer_order = p_current->i_order; + } + + b_stop_valid = !p_current->b_ephemer || p_current->i_stop > p_current->i_start; + + b_late = b_stop_valid && p_current->i_stop <= render_date; + + /* start_date will be used for correct automatic overlap support + * in case picture that should not be displayed anymore (display_time) + * overlap with a picture to be displayed (p_current->i_start) */ + if( p_current->b_subtitle && !b_late && !p_current->b_ephemer ) + start_date = p_current->i_start; + + /* */ + p_available_subpic[i_available] = p_current; + pb_available_late[i_available] = b_late; + i_available++; + } + + /* Only forced old picture display at the transition */ + if( start_date < p_sys->i_last_sort_date ) + start_date = p_sys->i_last_sort_date; + if( start_date <= 0 ) + start_date = INT64_MAX; + + /* Select pictures to be displayed */ + for( i_index = 0; i_index < i_available; i_index++ ) + { + subpicture_t *p_current = p_available_subpic[i_index]; + bool b_late = pb_available_late[i_index]; + + const mtime_t stop_date = p_current->b_subtitle ? __MAX( start_date, p_sys->i_last_sort_date ) : render_osd_date; + const mtime_t ephemer_date = p_current->b_subtitle ? ephemer_subtitle_date : ephemer_osd_date; + const int64_t i_ephemer_order = p_current->b_subtitle ? i_ephemer_subtitle_order : i_ephemer_system_order; + + /* Destroy late and obsolete ephemer subpictures */ + bool b_rejet = b_late && p_current->i_stop <= stop_date; + if( p_current->b_ephemer ) + { + if( p_current->i_start < ephemer_date ) + b_rejet = true; + else if( p_current->i_start == ephemer_date && + p_current->i_order < i_ephemer_order ) + b_rejet = true; + } + + if( b_rejet ) + SpuHeapDeleteSubpicture( &p_sys->heap, p_current ); + else + SubpictureChain( &p_subpic, p_current ); + } + } + + p_sys->i_last_sort_date = render_subtitle_date; + vlc_mutex_unlock( &p_sys->lock ); + + return p_subpic; +} + +void spu_OffsetSubtitleDate( spu_t *p_spu, mtime_t i_duration ) +{ + spu_private_t *p_sys = p_spu->p; + + vlc_mutex_lock( &p_sys->lock ); + for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) + { + spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i]; + subpicture_t *p_current = p_entry->p_subpicture; + + if( p_current && p_current->b_subtitle ) + { + if( p_current->i_start > 0 ) + p_current->i_start += i_duration; + if( p_current->i_stop > 0 ) + p_current->i_stop += i_duration; + } + } + vlc_mutex_unlock( &p_sys->lock ); +} + +int spu_RegisterChannel( spu_t *p_spu ) +{ + spu_private_t *p_sys = p_spu->p; + + vlc_mutex_lock( &p_sys->lock ); + int i_channel = p_sys->i_channel++; + vlc_mutex_unlock( &p_sys->lock ); + + return i_channel; +} + +void spu_ClearChannel( spu_t *p_spu, int i_channel ) +{ + spu_private_t *p_sys = p_spu->p; + + vlc_mutex_lock( &p_sys->lock ); + + for( int i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ ) + { + spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_subpic]; + subpicture_t *p_subpic = p_entry->p_subpicture; + + if( !p_subpic ) + continue; + if( p_subpic->i_channel != i_channel && ( i_channel != -1 || p_subpic->i_channel == SPU_DEFAULT_CHANNEL ) ) + continue; + + /* You cannot delete subpicture outside of spu_SortSubpictures */ + p_entry->b_reject = true; + } + + vlc_mutex_unlock( &p_sys->lock ); +} + +void spu_ChangeFilters( spu_t *p_spu, const char *psz_filters ) +{ + spu_private_t *p_sys = p_spu->p; + + vlc_mutex_lock( &p_sys->lock ); + + free( p_sys->psz_chain_update ); + p_sys->psz_chain_update = strdup( psz_filters ); + + vlc_mutex_unlock( &p_sys->lock ); +} + +void spu_ChangeMargin( spu_t *p_spu, int i_margin ) +{ + spu_private_t *p_sys = p_spu->p; + + vlc_mutex_lock( &p_sys->lock ); + p_sys->i_margin = i_margin; + vlc_mutex_unlock( &p_sys->lock ); +} + +/* */ +static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic ) +{ + p_subpic->p_next = *pp_head; + + *pp_head = p_subpic; +} + +/***************************************************************************** + * heap managment + *****************************************************************************/ +static void SpuHeapInit( spu_heap_t *p_heap ) +{ + for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) + { + spu_heap_entry_t *e = &p_heap->p_entry[i]; + + e->p_subpicture = NULL; + e->b_reject = false; + } +} + +static int SpuHeapPush( spu_heap_t *p_heap, subpicture_t *p_subpic ) +{ + for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) + { + spu_heap_entry_t *e = &p_heap->p_entry[i]; + + if( e->p_subpicture ) + continue; + + e->p_subpicture = p_subpic; + e->b_reject = false; + return VLC_SUCCESS; + } + return VLC_EGENERIC; +} + +static void SpuHeapDeleteAt( spu_heap_t *p_heap, int i_index ) +{ + spu_heap_entry_t *e = &p_heap->p_entry[i_index]; + + if( e->p_subpicture ) + subpicture_Delete( e->p_subpicture ); + + e->p_subpicture = NULL; +} + +static int SpuHeapDeleteSubpicture( spu_heap_t *p_heap, subpicture_t *p_subpic ) +{ + for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) + { + spu_heap_entry_t *e = &p_heap->p_entry[i]; + + if( e->p_subpicture != p_subpic ) + continue; + + SpuHeapDeleteAt( p_heap, i ); + return VLC_SUCCESS; + } + return VLC_EGENERIC; } + +static void SpuHeapClean( spu_heap_t *p_heap ) +{ + for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) + { + spu_heap_entry_t *e = &p_heap->p_entry[i]; + if( e->p_subpicture ) + subpicture_Delete( e->p_subpicture ); + } +} + +static void FilterRelease( filter_t *p_filter ) +{ + if( p_filter->p_module ) + module_unneed( p_filter, p_filter->p_module ); + if( p_filter->p_owner ) + free( p_filter->p_owner ); + + vlc_object_release( p_filter ); +} + static void SpuRenderCreateAndLoadText( spu_t *p_spu ) { filter_t *p_text; @@ -565,6 +853,9 @@ static void SpuRenderCreateAndLoadText( spu_t *p_spu ) if( !p_text ) return; + p_text->p_owner = xmalloc( sizeof(*p_text->p_owner) ); + p_text->p_owner->p_spu = p_spu; + es_format_Init( &p_text->fmt_in, VIDEO_ES, 0 ); es_format_Init( &p_text->fmt_out, VIDEO_ES, 0 ); @@ -573,8 +864,7 @@ static void SpuRenderCreateAndLoadText( spu_t *p_spu ) p_text->fmt_out.video.i_height = p_text->fmt_out.video.i_visible_height = 32; - p_text->pf_sub_buffer_new = spu_new_buffer; - p_text->pf_sub_buffer_del = spu_del_buffer; + p_text->pf_get_attachments = spu_get_attachments; vlc_object_attach( p_text, p_spu ); @@ -590,6 +880,12 @@ static void SpuRenderCreateAndLoadText( spu_t *p_spu ) if( !p_text->p_module ) p_text->p_module = module_need( p_text, "text renderer", NULL, false ); + + /* Create a few variables used for enhanced text rendering */ + var_Create( p_text, "spu-duration", VLC_VAR_TIME ); + var_Create( p_text, "spu-elapsed", VLC_VAR_TIME ); + var_Create( p_text, "text-rerender", VLC_VAR_BOOL ); + var_Create( p_text, "scale", VLC_VAR_INTEGER ); } static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, @@ -613,11 +909,11 @@ static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, p_scale->fmt_out.video.i_width = p_scale->fmt_out.video.i_height = b_resize ? 16 : 32; - p_scale->pf_vout_buffer_new = spu_new_video_buffer; - p_scale->pf_vout_buffer_del = spu_del_video_buffer; + p_scale->pf_video_buffer_new = spu_new_video_buffer; + p_scale->pf_video_buffer_del = spu_del_video_buffer; vlc_object_attach( p_scale, p_obj ); - p_scale->p_module = module_need( p_scale, "video filter2", 0, 0 ); + p_scale->p_module = module_need( p_scale, "video filter2", NULL, false ); return p_scale; } @@ -628,20 +924,20 @@ static void SpuRenderCreateAndLoadScale( spu_t *p_spu ) /* XXX p_spu->p_scale is used for all conversion/scaling except yuvp to * yuva/rgba */ p_spu->p->p_scale = CreateAndLoadScale( VLC_OBJECT(p_spu), - VLC_FOURCC_YUVA, VLC_FOURCC_YUVA, true ); + VLC_CODEC_YUVA, VLC_CODEC_YUVA, true ); /* This one is used for YUVP to YUVA/RGBA without scaling * FIXME rename it */ p_spu->p->p_scale_yuvp = CreateAndLoadScale( VLC_OBJECT(p_spu), - VLC_FOURCC_YUVP, VLC_FOURCC_YUVA, false ); + VLC_CODEC_YUVP, VLC_CODEC_YUVA, false ); } static void SpuRenderText( spu_t *p_spu, bool *pb_rerender_text, subpicture_t *p_subpic, subpicture_region_t *p_region, - int i_min_scale_ratio ) + int i_min_scale_ratio, mtime_t render_date ) { filter_t *p_text = p_spu->p->p_text; - assert( p_region->fmt.i_chroma == VLC_FOURCC_TEXT ); + assert( p_region->fmt.i_chroma == VLC_CODEC_TEXT ); if( !p_text || !p_text->p_module ) goto exit; @@ -665,16 +961,8 @@ static void SpuRenderText( spu_t *p_spu, bool *pb_rerender_text, * least show up on screen, but the effect won't change * the text over time. */ - - /* FIXME why these variables are recreated every time and not - * when text renderer module was created ? */ - var_Create( p_text, "spu-duration", VLC_VAR_TIME ); - var_Create( p_text, "spu-elapsed", VLC_VAR_TIME ); - var_Create( p_text, "text-rerender", VLC_VAR_BOOL ); - var_Create( p_text, "scale", VLC_VAR_INTEGER ); - var_SetTime( p_text, "spu-duration", p_subpic->i_stop - p_subpic->i_start ); - var_SetTime( p_text, "spu-elapsed", mdate() - p_subpic->i_start ); + var_SetTime( p_text, "spu-elapsed", render_date ); var_SetBool( p_text, "text-rerender", false ); var_SetInteger( p_text, "scale", i_min_scale_ratio ); @@ -688,11 +976,6 @@ static void SpuRenderText( spu_t *p_spu, bool *pb_rerender_text, } *pb_rerender_text = var_GetBool( p_text, "text-rerender" ); - var_Destroy( p_text, "spu-duration" ); - var_Destroy( p_text, "spu-elapsed" ); - var_Destroy( p_text, "text-rerender" ); - var_Destroy( p_text, "scale" ); - exit: p_region->i_align |= SUBPICTURE_RENDERED; } @@ -700,12 +983,6 @@ exit: /** * A few scale functions helpers. */ -typedef struct -{ - int w; - int h; -} spu_scale_t; - static spu_scale_t spu_scale_create( int w, int h ) { spu_scale_t s = { .w = w, .h = h }; @@ -715,7 +992,7 @@ static spu_scale_t spu_scale_create( int w, int h ) s.h = SCALE_UNIT; return s; } -static spu_scale_t spu_scale_unit(void ) +static spu_scale_t spu_scale_unit( void ) { return spu_scale_create( SCALE_UNIT, SCALE_UNIT ); } @@ -744,17 +1021,6 @@ static int spu_invscale_h( int v, const spu_scale_t s ) /** * A few area functions helpers */ - -typedef struct -{ - int i_x; - int i_y; - int i_width; - int i_height; - - spu_scale_t scale; -} spu_area_t; - static spu_area_t spu_area_create( int x, int y, int w, int h, spu_scale_t s ) { spu_area_t a = { .i_x = x, .i_y = y, .i_width = w, .i_height = h, .scale = s }; @@ -806,15 +1072,12 @@ static bool spu_area_overlap( spu_area_t a, spu_area_t b ) * Avoid area overlapping */ static void SpuAreaFixOverlap( spu_area_t *p_dst, - const spu_area_t *p_master, const spu_area_t *p_sub, int i_sub, int i_align ) { spu_area_t a = spu_area_scaled( *p_dst ); bool b_moved = false; bool b_ok; - assert( p_master->i_x == 0 && p_master->i_y == 0 ); - /* Check for overlap * XXX It is not fast O(n^2) but we should not have a lot of region */ do @@ -831,8 +1094,6 @@ static void SpuAreaFixOverlap( spu_area_t *p_dst, { /* We go down */ int i_y = sub.i_y + sub.i_height; - if( i_y + a.i_height > p_master->i_height ) - break; a.i_y = i_y; b_moved = true; } @@ -840,8 +1101,6 @@ static void SpuAreaFixOverlap( spu_area_t *p_dst, { /* We go up */ int i_y = sub.i_y - a.i_height; - if( i_y < 0 ) - break; a.i_y = i_y; b_moved = true; } @@ -862,13 +1121,31 @@ static void SpuAreaFixOverlap( spu_area_t *p_dst, } -/** - * Place a region - */ +static void SpuAreaFitInside( spu_area_t *p_area, const spu_area_t *p_boundary ) +{ + spu_area_t a = spu_area_scaled( *p_area ); + + const int i_error_x = (a.i_x + a.i_width) - p_boundary->i_width; + if( i_error_x > 0 ) + a.i_x -= i_error_x; + if( a.i_x < 0 ) + a.i_x = 0; + + const int i_error_y = (a.i_y + a.i_height) - p_boundary->i_height; + if( i_error_y > 0 ) + a.i_y -= i_error_y; + if( a.i_y < 0 ) + a.i_y = 0; + + *p_area = spu_area_unscaled( a, p_area->scale ); +} + +/** + * Place a region + */ static void SpuRegionPlace( int *pi_x, int *pi_y, const subpicture_t *p_subpic, - const subpicture_region_t *p_region, - int i_margin_y ) + const subpicture_region_t *p_region ) { const int i_delta_x = p_region->i_x; const int i_delta_y = p_region->i_y; @@ -907,23 +1184,6 @@ static void SpuRegionPlace( int *pi_x, int *pi_y, i_y = i_delta_y; } - /* Margin shifts all subpictures */ - if( i_margin_y != 0 ) - i_y -= i_margin_y; - - /* Clamp offset to not go out of the screen (when possible) */ - const int i_error_x = (i_x + p_region->fmt.i_width) - p_subpic->i_original_picture_width; - if( i_error_x > 0 ) - i_x -= i_error_x; - if( i_x < 0 ) - i_x = 0; - - const int i_error_y = (i_y + p_region->fmt.i_height) - p_subpic->i_original_picture_height; - if( i_error_y > 0 ) - i_y -= i_error_y; - if( i_y < 0 ) - i_y = 0; - *pi_x = i_x; *pi_y = i_y; } @@ -959,7 +1219,8 @@ static void SpuRenderRegion( spu_t *p_spu, subpicture_t *p_subpic, subpicture_region_t *p_region, const spu_scale_t scale_size, const video_format_t *p_fmt, - const spu_area_t *p_subtitle_area, int i_subtitle_area ) + const spu_area_t *p_subtitle_area, int i_subtitle_area, + mtime_t render_date ) { spu_private_t *p_sys = p_spu->p; @@ -972,20 +1233,19 @@ static void SpuRenderRegion( spu_t *p_spu, video_format_t region_fmt; picture_t *p_region_picture; - vlc_assert_locked( &p_sys->subpicture_lock ); - /* Invalidate area by default */ *p_area = spu_area_create( 0,0, 0,0, scale_size ); /* Render text region */ - if( p_region->fmt.i_chroma == VLC_FOURCC_TEXT ) + if( p_region->fmt.i_chroma == VLC_CODEC_TEXT ) { const int i_min_scale_ratio = SCALE_UNIT; /* FIXME what is the right value? (scale_size is not) */ - SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, i_min_scale_ratio ); + SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, + i_min_scale_ratio, render_date ); b_restore_format = b_rerender_text; /* Check if the rendering has failed ... */ - if( p_region->fmt.i_chroma == VLC_FOURCC_TEXT ) + if( p_region->fmt.i_chroma == VLC_CODEC_TEXT ) goto exit; } @@ -993,7 +1253,7 @@ static void SpuRenderRegion( spu_t *p_spu, * FIXME b_force_palette and b_force_crop are applied to all subpictures using palette * instead of only the right one (being the dvd spu). */ - const bool b_using_palette = p_region->fmt.i_chroma == VLC_FOURCC_YUVP; + const bool b_using_palette = p_region->fmt.i_chroma == VLC_CODEC_YUVP; const bool b_force_palette = b_using_palette && p_sys->b_force_palette; const bool b_force_crop = b_force_palette && p_sys->b_force_crop; bool b_changed_palette = false; @@ -1009,7 +1269,7 @@ static void SpuRenderRegion( spu_t *p_spu, /* Place the picture * We compute the position in the rendered size */ SpuRegionPlace( &i_x_offset, &i_y_offset, - p_subpic, p_region, i_margin_y ); + p_subpic, p_region ); /* Save this position for subtitle overlap support * it is really important that there are given without scale_size applied */ @@ -1020,16 +1280,25 @@ static void SpuRenderRegion( spu_t *p_spu, /* Handle overlapping subtitles when possible */ if( p_subpic->b_subtitle && !p_subpic->b_absolute ) { - spu_area_t display = spu_area_create( 0, 0, p_fmt->i_width, p_fmt->i_height, - spu_scale_unit() ); - - SpuAreaFixOverlap( p_area, &display, p_subtitle_area, i_subtitle_area, + SpuAreaFixOverlap( p_area, p_subtitle_area, i_subtitle_area, p_region->i_align ); } + /* we copy the area: for the subtitle overlap support we want + * to only save the area without margin applied */ + spu_area_t restrained = *p_area; + + /* apply margin to subtitles and correct if they go over the picture edge */ + if( p_subpic->b_subtitle ) + restrained.i_y -= i_margin_y; + + spu_area_t display = spu_area_create( 0, 0, p_fmt->i_width, p_fmt->i_height, + spu_scale_unit() ); + SpuAreaFitInside( &restrained, &display ); + /* Fix the position for the current scale_size */ - i_x_offset = spu_scale_w( p_area->i_x, p_area->scale ); - i_y_offset = spu_scale_h( p_area->i_y, p_area->scale ); + i_x_offset = spu_scale_w( restrained.i_x, restrained.scale ); + i_y_offset = spu_scale_h( restrained.i_y, restrained.scale ); /* */ if( b_force_palette ) @@ -1086,13 +1355,13 @@ static void SpuRenderRegion( spu_t *p_spu, if( b_changed ) { - SpuRegionPrivateDestroy( p_private ); + subpicture_region_private_Delete( p_private ); p_region->p_private = NULL; } } /* Scale if needed into cache */ - if( !p_region->p_private ) + if( !p_region->p_private && i_dst_width > 0 && i_dst_height > 0 ) { filter_t *p_scale = p_sys->p_scale; @@ -1108,7 +1377,7 @@ static void SpuRenderRegion( spu_t *p_spu, /* TODO converting to RGBA for RGB video output is better */ p_scale_yuvp->fmt_out.video = p_region->fmt; - p_scale_yuvp->fmt_out.video.i_chroma = VLC_FOURCC_YUVA; + p_scale_yuvp->fmt_out.video.i_chroma = VLC_CODEC_YUVA; p_picture = p_scale_yuvp->pf_video_filter( p_scale_yuvp, p_picture ); if( !p_picture ) @@ -1142,19 +1411,22 @@ static void SpuRenderRegion( spu_t *p_spu, } /* */ - p_region->p_private = SpuRegionPrivateCreate( &p_picture->format ); - if( p_region->p_private ) + if( p_picture ) { - p_region->p_private->p_picture = p_picture; - if( !p_region->p_private->p_picture ) + p_region->p_private = subpicture_region_private_New( &p_picture->format ); + if( p_region->p_private ) { - SpuRegionPrivateDestroy( p_region->p_private ); - p_region->p_private = NULL; + p_region->p_private->p_picture = p_picture; + if( !p_region->p_private->p_picture ) + { + subpicture_region_private_Delete( p_region->p_private ); + p_region->p_private = NULL; + } + } + else + { + picture_Release( p_picture ); } - } - else - { - picture_Release( p_picture ); } } @@ -1205,19 +1477,15 @@ static void SpuRenderRegion( spu_t *p_spu, } /* Update the blender */ - SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, ®ion_fmt ); - - if( p_sys->p_blend->p_module ) - { - const int i_alpha = SpuRegionAlpha( p_subpic, p_region ); - - p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_pic_dst, - p_region_picture, i_x_offset, i_y_offset, i_alpha ); - } - else + if( filter_ConfigureBlend( p_spu->p->p_blend, + p_fmt->i_width, p_fmt->i_height, + ®ion_fmt ) || + filter_Blend( p_spu->p->p_blend, + p_pic_dst, i_x_offset, i_y_offset, + p_region_picture, SpuRegionAlpha( p_subpic, p_region ) ) ) { msg_Err( p_spu, "blending %4.4s to %4.4s failed", - (char *)&p_sys->p_blend->fmt_out.video.i_chroma, + (char *)&p_sys->p_blend->fmt_in.video.i_chroma, (char *)&p_sys->p_blend->fmt_out.video.i_chroma ); } @@ -1229,11 +1497,14 @@ exit: * pre-rendered state, so the next time through everything is * calculated again. */ - picture_Release( p_region->p_picture ); - p_region->p_picture = NULL; + if( p_region->p_picture ) + { + picture_Release( p_region->p_picture ); + p_region->p_picture = NULL; + } if( p_region->p_private ) { - SpuRegionPrivateDestroy( p_region->p_private ); + subpicture_region_private_Delete( p_region->p_private ); p_region->p_private = NULL; } p_region->i_align &= ~SUBPICTURE_RENDERED; @@ -1251,11 +1522,11 @@ static int IntegerCmp( int64_t i0, int64_t i1 ) return i0 < i1 ? -1 : i0 > i1 ? 1 : 0; } /** - * This function compares 2 subpictures using the following properties + * This function compares 2 subpictures using the following properties * (ordered by priority) * 1. absolute positionning * 2. start time - * 3. creation order + * 3. creation order (per channel) * * It can be used by qsort. * @@ -1270,361 +1541,12 @@ static int SubpictureCmp( const void *s0, const void *s1 ) r = IntegerCmp( !p_subpic0->b_absolute, !p_subpic1->b_absolute ); if( !r ) r = IntegerCmp( p_subpic0->i_start, p_subpic1->i_start ); + if( !r ) + r = IntegerCmp( p_subpic0->i_channel, p_subpic1->i_channel ); if( !r ) r = IntegerCmp( p_subpic0->i_order, p_subpic1->i_order ); return r; } -/** - * This function renders all sub picture units in the list. - */ -void spu_RenderSubpictures( spu_t *p_spu, - picture_t *p_pic_dst, const video_format_t *p_fmt_dst, - subpicture_t *p_subpic_list, - const video_format_t *p_fmt_src ) -{ - spu_private_t *p_sys = p_spu->p; - - const int i_source_video_width = p_fmt_src->i_width; - const int i_source_video_height = p_fmt_src->i_height; - const mtime_t i_current_date = mdate(); - - unsigned int i_subpicture; - subpicture_t *pp_subpicture[VOUT_MAX_SUBPICTURES]; - - unsigned int i_subtitle_region_count; - spu_area_t p_subtitle_area_buffer[VOUT_MAX_SUBPICTURES]; - spu_area_t *p_subtitle_area; - int i_subtitle_area; - - /* Get lock */ - vlc_mutex_lock( &p_sys->subpicture_lock ); - - /* Preprocess subpictures */ - i_subpicture = 0; - i_subtitle_region_count = 0; - for( subpicture_t * p_subpic = p_subpic_list; - p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE; /* Check again status (as we where unlocked) */ - p_subpic = p_subpic->p_next ) - { - /* */ - if( p_subpic->pf_pre_render ) - p_subpic->pf_pre_render( p_spu, p_subpic, p_fmt_dst ); - - if( p_subpic->pf_update_regions ) - { - video_format_t fmt_org = *p_fmt_dst; - fmt_org.i_width = - fmt_org.i_visible_width = i_source_video_width; - fmt_org.i_height = - fmt_org.i_visible_height = i_source_video_height; - - p_subpic->pf_update_regions( p_spu, p_subpic, &fmt_org, i_current_date ); - } - - /* */ - if( p_subpic->b_subtitle ) - { - for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next ) - i_subtitle_region_count++; - } - - /* */ - pp_subpicture[i_subpicture++] = p_subpic; - } - - /* Be sure we have at least 1 picture to process */ - if( i_subpicture <= 0 ) - { - vlc_mutex_unlock( &p_sys->subpicture_lock ); - return; - } - - /* Now order subpicture array - * XXX The order is *really* important for overlap subtitles positionning */ - qsort( pp_subpicture, i_subpicture, sizeof(*pp_subpicture), SubpictureCmp ); - - /* Allocate area array for subtitle overlap */ - i_subtitle_area = 0; - p_subtitle_area = p_subtitle_area_buffer; - if( i_subtitle_region_count > sizeof(p_subtitle_area_buffer)/sizeof(*p_subtitle_area_buffer) ) - p_subtitle_area = calloc( i_subtitle_region_count, sizeof(*p_subtitle_area) ); - - /* Create the blending module */ - if( !p_sys->p_blend ) - SpuRenderCreateBlend( p_spu, p_fmt_dst->i_chroma, p_fmt_dst->i_aspect ); - - /* Process all subpictures and regions (in the right order) */ - for( unsigned int i_index = 0; i_index < i_subpicture; i_index++ ) - { - subpicture_t *p_subpic = pp_subpicture[i_index]; - subpicture_region_t *p_region; - - if( !p_subpic->p_region ) - continue; - - /* FIXME when possible use a better rendering size than source size - * (max of display size and source size for example) FIXME */ - int i_render_width = p_subpic->i_original_picture_width; - int i_render_height = p_subpic->i_original_picture_height; - if( !i_render_width || !i_render_height ) - { - if( i_render_width != 0 || i_render_height != 0 ) - msg_Err( p_spu, "unsupported original picture size %dx%d", - i_render_width, i_render_height ); - - p_subpic->i_original_picture_width = i_render_width = i_source_video_width; - p_subpic->i_original_picture_height = i_render_height = i_source_video_height; - } - - if( p_sys->p_text ) - { - p_sys->p_text->fmt_out.video.i_width = - p_sys->p_text->fmt_out.video.i_visible_width = i_render_width; - - p_sys->p_text->fmt_out.video.i_height = - p_sys->p_text->fmt_out.video.i_visible_height = i_render_height; - } - - /* Compute scaling from picture to source size */ - spu_scale_t scale = spu_scale_createq( i_source_video_width, i_render_width, - i_source_video_height, i_render_height ); - - /* Update scaling from source size to display size(p_fmt_dst) */ - scale.w = scale.w * p_fmt_dst->i_width / i_source_video_width; - scale.h = scale.h * p_fmt_dst->i_height / i_source_video_height; - - /* Set default subpicture aspect ratio - * FIXME if we only handle 1 aspect ratio per picture, why is it set per - * region ? */ - p_region = p_subpic->p_region; - if( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den ) - { - if( p_region->fmt.i_aspect != 0 ) - { - p_region->fmt.i_sar_den = p_region->fmt.i_aspect; - p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR; - } - else - { - p_region->fmt.i_sar_den = p_fmt_dst->i_sar_den; - p_region->fmt.i_sar_num = p_fmt_dst->i_sar_num; - } - } - - /* Take care of the aspect ratio */ - if( p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den != - p_region->fmt.i_sar_den * p_fmt_dst->i_sar_num ) - { - /* FIXME FIXME what about region->i_x/i_y ? */ - scale.w = scale.w * - (int64_t)p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den / - p_region->fmt.i_sar_den / p_fmt_dst->i_sar_num; - } - - /* Render all regions - * We always transform non absolute subtitle into absolute one on the - * first rendering to allow good subtitle overlap support. - */ - for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next ) - { - spu_area_t area; - - /* Check scale validity */ - if( scale.w <= 0 || scale.h <= 0 ) - continue; - - /* */ - SpuRenderRegion( p_spu, p_pic_dst, &area, - p_subpic, p_region, scale, p_fmt_dst, - p_subtitle_area, i_subtitle_area ); - - if( p_subpic->b_subtitle ) - { - area = spu_area_unscaled( area, scale ); - if( !p_subpic->b_absolute && area.i_width > 0 && area.i_height > 0 ) - { - p_region->i_x = area.i_x; - p_region->i_y = area.i_y; - } - if( p_subtitle_area ) - p_subtitle_area[i_subtitle_area++] = area; - } - } - if( p_subpic->b_subtitle ) - p_subpic->b_absolute = true; - } - - /* */ - if( p_subtitle_area != p_subtitle_area_buffer ) - free( p_subtitle_area ); - - vlc_mutex_unlock( &p_sys->subpicture_lock ); -} - -/***************************************************************************** - * spu_SortSubpictures: find the subpictures to display - ***************************************************************************** - * This function parses all subpictures and decides which ones need to be - * displayed. This operation does not need lock, since only READY_SUBPICTURE - * are handled. If no picture has been selected, display_date will depend on - * the subpicture. - * We also check for ephemer DVD subpictures (subpictures that have - * to be removed if a newer one is available), which makes it a lot - * more difficult to guess if a subpicture has to be rendered or not. - *****************************************************************************/ -subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, - bool b_paused, bool b_subtitle_only ) -{ - spu_private_t *p_sys = p_spu->p; - int i_channel; - subpicture_t *p_subpic = NULL; - - /* Run subpicture filters */ - filter_chain_SubFilter( p_sys->p_chain, display_date ); - - /* We get an easily parsable chained list of subpictures which - * ends with NULL since p_subpic was initialized to NULL. */ - for( i_channel = 0; i_channel < p_sys->i_channel; i_channel++ ) - { - subpicture_t *p_ephemer = NULL; - mtime_t ephemer_date = 0; - int i_index; - - for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ ) - { - subpicture_t *p_current = &p_sys->p_subpicture[i_index]; - - if( p_current->i_channel != i_channel || - p_current->i_status != READY_SUBPICTURE || - ( b_subtitle_only && !p_current->b_subtitle ) ) - { - continue; - } - if( display_date && - display_date < p_current->i_start ) - { - /* Too early, come back next monday */ - continue; - } - - if( p_current->i_start > ephemer_date ) - ephemer_date = p_current->i_start; - - if( display_date > p_current->i_stop && - ( !p_current->b_ephemer || p_current->i_stop > p_current->i_start ) && - !( p_current->b_subtitle && b_paused ) ) /* XXX Assume that subtitle are pausable */ - { - /* Too late, destroy the subpic */ - spu_DestroySubpicture( p_spu, &p_sys->p_subpicture[i_index] ); - continue; - } - - /* If this is an ephemer subpic, add it to our list */ - if( p_current->b_ephemer ) - { - p_current->p_next = p_ephemer; - p_ephemer = p_current; - - continue; - } - - p_current->p_next = p_subpic; - p_subpic = p_current; - } - - /* If we found ephemer subpictures, check if they have to be - * displayed or destroyed */ - while( p_ephemer != NULL ) - { - subpicture_t *p_tmp = p_ephemer; - p_ephemer = p_ephemer->p_next; - - if( p_tmp->i_start < ephemer_date ) - { - /* Ephemer subpicture has lived too long */ - spu_DestroySubpicture( p_spu, p_tmp ); - } - else - { - /* Ephemer subpicture can still live a bit */ - p_tmp->p_next = p_subpic; - p_subpic = p_tmp; - } - } - } - - return p_subpic; -} - -/***************************************************************************** - * SpuClearChannel: clear an spu channel - ***************************************************************************** - * This function destroys the subpictures which belong to the spu channel - * corresponding to i_channel_id. - *****************************************************************************/ -static void SpuClearChannel( spu_t *p_spu, int i_channel, bool b_locked ) -{ - spu_private_t *p_sys = p_spu->p; - int i_subpic; /* subpicture index */ - subpicture_t *p_subpic = NULL; /* first free subpicture */ - - if( !b_locked ) - vlc_mutex_lock( &p_sys->subpicture_lock ); - - for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ ) - { - p_subpic = &p_sys->p_subpicture[i_subpic]; - if( p_subpic->i_status == FREE_SUBPICTURE - || ( p_subpic->i_status != RESERVED_SUBPICTURE - && p_subpic->i_status != READY_SUBPICTURE ) ) - { - continue; - } - - if( p_subpic->i_channel == i_channel ) - { - subpicture_region_ChainDelete( p_subpic->p_region ); - p_subpic->p_region = NULL; - - if( p_subpic->pf_destroy ) p_subpic->pf_destroy( p_subpic ); - p_subpic->i_status = FREE_SUBPICTURE; - } - } - - if( !b_locked ) - vlc_mutex_unlock( &p_sys->subpicture_lock ); -} - -/***************************************************************************** - * spu_ControlDefault: default methods for the subpicture unit control. - *****************************************************************************/ -static int SpuControl( spu_t *p_spu, int i_query, va_list args ) -{ - spu_private_t *p_sys = p_spu->p; - int *pi, i; - - switch( i_query ) - { - case SPU_CHANNEL_REGISTER: - pi = (int *)va_arg( args, int * ); - vlc_mutex_lock( &p_sys->subpicture_lock ); - if( pi ) - *pi = p_sys->i_channel++; - vlc_mutex_unlock( &p_sys->subpicture_lock ); - break; - - case SPU_CHANNEL_CLEAR: - i = (int)va_arg( args, int ); - SpuClearChannel( p_spu, i, false ); - break; - - default: - msg_Dbg( p_spu, "control query not supported" ); - return VLC_EGENERIC; - } - - return VLC_SUCCESS; -} /***************************************************************************** * Object variables callbacks @@ -1641,14 +1563,14 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) spu_private_t *p_sys = p_spu->p; vlc_value_t val; - vlc_mutex_lock( &p_sys->subpicture_lock ); + vlc_mutex_lock( &p_sys->lock ); p_sys->b_force_palette = false; p_sys->b_force_crop = false; if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) { - vlc_mutex_unlock( &p_sys->subpicture_lock ); + vlc_mutex_unlock( &p_sys->lock ); return; } @@ -1663,7 +1585,7 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) memcpy( p_sys->palette, val.p_address, 16 ); p_sys->b_force_palette = true; } - vlc_mutex_unlock( &p_sys->subpicture_lock ); + vlc_mutex_unlock( &p_sys->lock ); msg_Dbg( p_object, "crop: %i,%i,%i,%i, palette forced: %i", p_sys->i_crop_x, p_sys->i_crop_y, @@ -1679,7 +1601,8 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) static int CropCallback( vlc_object_t *p_object, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - (void)psz_var; (void)oldval; (void)newval; + VLC_UNUSED(oldval); VLC_UNUSED(newval); VLC_UNUSED(psz_var); + UpdateSPU( (spu_t *)p_data, p_object ); return VLC_SUCCESS; } @@ -1687,72 +1610,47 @@ static int CropCallback( vlc_object_t *p_object, char const *psz_var, /***************************************************************************** * Buffers allocation callbacks for the filters *****************************************************************************/ -static subpicture_t *sub_new_buffer( filter_t *p_filter ) +static int spu_get_attachments( filter_t *p_filter, + input_attachment_t ***ppp_attachment, + int *pi_attachment ) { - filter_owner_sys_t *p_sys = p_filter->p_owner; - subpicture_t *p_subpicture = spu_CreateSubpicture( p_sys->p_spu ); - if( p_subpicture ) p_subpicture->i_channel = p_sys->i_channel; - return p_subpicture; -} + spu_t *p_spu = p_filter->p_owner->p_spu; -static void sub_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) -{ - filter_owner_sys_t *p_sys = p_filter->p_owner; - spu_DestroySubpicture( p_sys->p_spu, p_subpic ); + int i_ret = VLC_EGENERIC; + if( p_spu->p->p_input ) + i_ret = input_Control( (input_thread_t*)p_spu->p->p_input, + INPUT_GET_ATTACHMENTS, + ppp_attachment, pi_attachment ); + return i_ret; } -static subpicture_t *spu_new_buffer( filter_t *p_filter ) +static subpicture_t *sub_new_buffer( filter_t *p_filter ) { - subpicture_t *p_subpic = calloc( 1, sizeof(subpicture_t) ); - if( !p_subpic ) - return NULL; - - p_subpic->b_absolute = true; - p_subpic->i_alpha = 0xFF; + filter_owner_sys_t *p_sys = p_filter->p_owner; - VLC_UNUSED(p_filter); - return p_subpic; + subpicture_t *p_subpicture = subpicture_New( NULL ); + if( p_subpicture ) + p_subpicture->i_channel = p_sys->i_channel; + return p_subpicture; } - -static void spu_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) +static void sub_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) { - subpicture_region_ChainDelete( p_subpic->p_region ); - - VLC_UNUSED(p_filter); - free( p_subpic ); + VLC_UNUSED( p_filter ); + subpicture_Delete( p_subpic ); } - static picture_t *spu_new_video_buffer( filter_t *p_filter ) { const video_format_t *p_fmt = &p_filter->fmt_out.video; VLC_UNUSED(p_filter); - return picture_New( p_fmt->i_chroma, - p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect ); + return picture_NewFromFormat( p_fmt ); } - static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_picture ) { VLC_UNUSED(p_filter); picture_Release( p_picture ); } -static int SubFilterCallback( vlc_object_t *p_object, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - spu_t *p_spu = p_data; - spu_private_t *p_sys = p_spu->p; - - VLC_UNUSED(p_object); VLC_UNUSED(oldval); - VLC_UNUSED(newval); VLC_UNUSED(psz_var); - - vlc_mutex_lock( &p_sys->subpicture_lock ); - filter_chain_Reset( p_sys->p_chain, NULL, NULL ); - spu_ParseChain( p_spu ); - vlc_mutex_unlock( &p_sys->subpicture_lock ); - return VLC_SUCCESS; -} - static int SubFilterAllocationInit( filter_t *p_filter, void *p_data ) { spu_t *p_spu = p_data; @@ -1765,7 +1663,7 @@ static int SubFilterAllocationInit( filter_t *p_filter, void *p_data ) p_filter->pf_sub_buffer_del = sub_del_buffer; p_filter->p_owner = p_sys; - spu_Control( p_spu, SPU_CHANNEL_REGISTER, &p_sys->i_channel ); + p_sys->i_channel = spu_RegisterChannel( p_spu ); p_sys->p_spu = p_spu; return VLC_SUCCESS; @@ -1775,7 +1673,7 @@ static void SubFilterAllocationClean( filter_t *p_filter ) { filter_owner_sys_t *p_sys = p_filter->p_owner; - SpuClearChannel( p_sys->p_spu, p_sys->i_channel, true ); + spu_ClearChannel( p_sys->p_spu, p_sys->i_channel ); free( p_filter->p_owner ); }