X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_subpictures.c;h=ee608b907e6ca3da2505340ade3a54cfe4ca0659;hb=5a6ee7961b6485a3b6b7d4713ab4e050f572d0be;hp=fa7fdd71748fe5cf4371d7e1ddb7fda7e77d27a0;hpb=9c5ebdcdce400c4a2a93a1b9ac8845e882949003;p=vlc diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index fa7fdd7174..ee608b907e 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -30,24 +30,26 @@ # include "config.h" #endif +#include +#include + #include #include #include #include -#include +#include #include "../libvlc.h" - -#include -#include +#include "vout_internal.h" +#include /***************************************************************************** * Local prototypes *****************************************************************************/ -#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') +/* Number of simultaneous subpictures */ +#define VOUT_MAX_SUBPICTURES (__MAX(VOUT_MAX_PICTURES, SPU_MAX_PREPARE_TIME/5000)) + +/* */ typedef struct { subpicture_t *p_subpicture; @@ -60,6 +62,12 @@ typedef struct } 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 lock; /* lock to protect all followings fields */ @@ -67,8 +75,6 @@ struct spu_private_t spu_heap_t heap; int i_channel; /**< number of subpicture channels registered */ - int64_t i_subpicture_order; /**< number of created subpicture since spu creation */ - filter_t *p_blend; /**< alpha blending module */ filter_t *p_text; /**< text renderer module */ filter_t *p_scale_yuvp; /**< scaling module for YUVP */ @@ -80,8 +86,13 @@ 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; + + /* */ + mtime_t i_last_sort_date; }; /* */ @@ -90,23 +101,68 @@ struct subpicture_region_private_t video_format_t fmt; picture_t *p_picture; }; +static subpicture_region_private_t *SpuRegionPrivateNew( video_format_t * ); +static void SpuRegionPrivateDelete( subpicture_region_private_t * ); + +/* */ +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 ); + +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 ); +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 ); + /* Subpicture rendered flag * FIXME ? it could be moved to private ? */ #define SUBPICTURE_RENDERED (0x1000) -#ifdef SUBPICTURE_RENDERED < SUBPICTURE_ALIGN_MASK +#if SUBPICTURE_RENDERED < SUBPICTURE_ALIGN_MASK # error SUBPICTURE_RENDERED too low #endif -static void SpuRegionPrivateDestroy( subpicture_region_private_t *p_private ); +#define SCALE_UNIT (1000) + +static void SubpictureUpdate( subpicture_t *, + const video_format_t *p_fmt_src, + const video_format_t *p_fmt_dst, + mtime_t i_ts ); +static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic ); +static int SubpictureCmp( const void *s0, const void *s1 ); + +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 ); static void UpdateSPU ( spu_t *, vlc_object_t * ); static int CropCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); - -static int SpuControl( spu_t *, int, va_list ); - -static void SpuClearChannel( spu_t *p_spu, int i_channel, bool b_locked ); +static int MarginCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); /* Buffer allocation for SPU filter (blend, scale, ...) */ static subpicture_t *spu_new_buffer( filter_t * ); @@ -114,232 +170,37 @@ 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 * ); -static int spu_ParseChain( spu_t * ); - /* Buffer aloccation fir SUB filter */ -static int SubFilterCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); - static int SubFilterAllocationInit( filter_t *, void * ); static void SubFilterAllocationClean( filter_t * ); -#define SCALE_UNIT (1000) - -/* */ -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; - - 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; - } - 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 ) - { - 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 ); - - 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 ); -} - -/* */ -void subpicture_region_ChainDelete( subpicture_region_t *p_head ) -{ - while( p_head ) - { - subpicture_region_t *p_next = p_head->p_next; - - subpicture_region_Delete( p_head ); - - p_head = p_next; - } -} - -/** - * This function create a new empty subpicture. - */ -static subpicture_t *subpicture_New( void ) -{ - subpicture_t *p_subpic = calloc( 1, sizeof(*p_subpic) ); - if( !p_subpic ) - return NULL; - - p_subpic->i_order = 0; - 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; - - return p_subpic; -} - -static void subpicture_Delete( subpicture_t *p_subpic ) -{ - subpicture_region_ChainDelete( p_subpic->p_region ); - p_subpic->p_region = NULL; - - if( p_subpic->pf_destroy ) - { - p_subpic->pf_destroy( p_subpic ); - } - free( p_subpic ); -} - - -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 subpicture_region_private_t *SpuRegionPrivateCreate( video_format_t *p_fmt ) -{ - subpicture_region_private_t *p_private = malloc( sizeof(*p_private) ); - - if( !p_private ) - return NULL; - - 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; - - return p_private; -} -static void SpuRegionPrivateDestroy( subpicture_region_private_t *p_private ) -{ - if( p_private->p_picture ) - picture_Release( p_private->p_picture ); - free( p_private->fmt.p_palette ); - free( p_private ); -} - /* */ -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 ) { 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 */ @@ -347,18 +208,18 @@ spu_t *__spu_Create( vlc_object_t *p_this ) SpuHeapInit( &p_sys->heap ); - p_sys->i_subpicture_order = 1; - p_sys->p_blend = NULL; p_sys->p_text = NULL; p_sys->p_scale = NULL; p_sys->p_scale_yuvp = NULL; + p_sys->i_margin = var_InheritInteger( p_spu, "sub-margin" ); + /* Register the default subpicture channel */ p_sys->i_channel = 2; - vlc_object_attach( p_spu, p_this ); - + 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, @@ -368,42 +229,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; } /** @@ -416,7 +245,7 @@ void spu_Destroy( spu_t *p_spu ) spu_private_t *p_sys = p_spu->p; 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 ); @@ -428,6 +257,8 @@ 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 ); /* Destroy all remaining subpictures */ SpuHeapClean( &p_sys->heap ); @@ -448,26 +279,52 @@ void spu_Attach( spu_t *p_spu, vlc_object_t *p_this, 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( !p_input ) + return; if( b_attach ) { UpdateSPU( p_spu, VLC_OBJECT(p_input) ); + var_Create( p_input, "highlight", VLC_VAR_BOOL ); var_AddCallback( p_input, "highlight", CropCallback, p_spu ); + var_AddCallback( p_input, "sub-margin", MarginCallback, p_spu->p ); + + vlc_mutex_lock( &p_spu->p->lock ); + p_spu->p->i_margin = var_GetInteger( p_input, "sub-margin" ); + vlc_mutex_unlock( &p_spu->p->lock ); + vlc_object_release( p_input ); } else { - /* Delete callback */ + /* Delete callbacks */ + var_DelCallback( p_input, "sub-margin", MarginCallback, p_spu->p ); var_DelCallback( p_input, "highlight", CropCallback, p_spu ); + var_Destroy( p_input, "highlight" ); vlc_object_release( p_input ); } } /** - * Display a subpicture - * - * Remove the reservation flag of a subpicture, which will cause it to be + * 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 ) +{ + spu_private_t *p_sys = p_spu->p; + + 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 ); + + return VLC_SUCCESS; +} + +/** + * Display a subpicture + * + * Remove the reservation flag of a subpicture, which will cause it to be * ready for display. * \param p_spu the subpicture unit object * \param p_subpic the subpicture to display @@ -476,9 +333,9 @@ void spu_DisplaySubpicture( spu_t *p_spu, subpicture_t *p_subpic ) { spu_private_t *p_sys = p_spu->p; - /* DEFAULT_CHAN always reset itself */ - if( p_subpic->i_channel == DEFAULT_CHAN ) - SpuClearChannel( p_spu, DEFAULT_CHAN, false ); + /* 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 ) @@ -497,1166 +354,1411 @@ void spu_DisplaySubpicture( spu_t *p_spu, subpicture_t *p_subpic ) } /** - * 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 ) { - VLC_UNUSED(p_spu); + spu_private_t *p_sys = p_spu->p; - return subpicture_New(); -} + const mtime_t render_osd_date = mdate(); -/** - * 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 ) -{ - VLC_UNUSED(p_spu); + const int i_source_video_width = p_fmt_src->i_width; + const int i_source_video_height = p_fmt_src->i_height; - subpicture_Delete( p_subpic ); -} + unsigned int i_subpicture; + subpicture_t *pp_subpicture[VOUT_MAX_SUBPICTURES]; -static void FilterRelease( filter_t *p_filter ) -{ - if( p_filter->p_module ) - module_unneed( p_filter, p_filter->p_module ); + 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; - vlc_object_detach( p_filter ); - vlc_object_release( p_filter ); -} + vlc_mutex_lock( &p_sys->lock ); -static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_aspect ) -{ - filter_t *p_blend; + /* 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 ) + { + SubpictureUpdate( p_subpic, + p_fmt_src, p_fmt_dst, + p_subpic->b_subtitle ? render_subtitle_date : render_osd_date ); - assert( !p_spu->p->p_blend ); + /* */ + 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; + } - p_spu->p->p_blend = - p_blend = vlc_custom_create( p_spu, sizeof(filter_t), - VLC_OBJECT_GENERIC, "blend" ); - if( !p_blend ) + /* Be sure we have at least 1 picture to process */ + if( i_subpicture <= 0 ) + { + vlc_mutex_unlock( &p_sys->lock ); return; + } - es_format_Init( &p_blend->fmt_in, VIDEO_ES, 0 ); + /* Now order subpicture array + * XXX The order is *really* important for overlap subtitles positionning */ + qsort( pp_subpicture, i_subpicture, sizeof(*pp_subpicture), SubpictureCmp ); - 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; + /* 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) ); - /* The blend module will be loaded when needed with the real - * input format */ - p_blend->p_module = NULL; + /* Create the blending module */ + if( !p_sys->p_blend ) + p_spu->p->p_blend = filter_NewBlend( VLC_OBJECT(p_spu), p_fmt_dst ); - /* */ - vlc_object_attach( p_blend, p_spu ); -} -static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_height, - const video_format_t *p_in_fmt ) -{ - filter_t *p_blend = p_spu->p->p_blend; + /* 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; - assert( p_blend ); + if( !p_subpic->p_region ) + continue; - /* */ - if( p_blend->p_module && p_blend->fmt_in.video.i_chroma != p_in_fmt->i_chroma ) - { - /* 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; - } + /* 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_blend->fmt_in.video = *p_in_fmt; + 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; + } - /* */ - 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; + 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; - /* */ - if( !p_blend->p_module ) - p_blend->p_module = module_need( p_blend, "video blending", 0, 0 ); -} -static void SpuRenderCreateAndLoadText( spu_t *p_spu ) -{ - filter_t *p_text; + p_sys->p_text->fmt_out.video.i_height = + p_sys->p_text->fmt_out.video.i_visible_height = i_render_height; + } - assert( !p_spu->p->p_text ); + /* 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 ); - p_spu->p->p_text = - p_text = vlc_custom_create( p_spu, sizeof(filter_t), - VLC_OBJECT_GENERIC, "spu text" ); - if( !p_text ) - return; + /* 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; - es_format_Init( &p_text->fmt_in, VIDEO_ES, 0 ); + /* 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; + } - es_format_Init( &p_text->fmt_out, VIDEO_ES, 0 ); - p_text->fmt_out.video.i_width = - p_text->fmt_out.video.i_visible_width = 32; - p_text->fmt_out.video.i_height = - p_text->fmt_out.video.i_visible_height = 32; + /* 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; + } - p_text->pf_sub_buffer_new = spu_new_buffer; - p_text->pf_sub_buffer_del = spu_del_buffer; + /* 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; - vlc_object_attach( p_text, p_spu ); + /* Check scale validity */ + if( scale.w <= 0 || scale.h <= 0 ) + continue; - /* FIXME TOCHECK shouldn't module_need( , , psz_modulename, false ) do the - * same than these 2 calls ? */ - char *psz_modulename = var_CreateGetString( p_spu, "text-renderer" ); - if( psz_modulename && *psz_modulename ) - { - p_text->p_module = module_need( p_text, "text renderer", - psz_modulename, true ); + /* */ + 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 ); + + 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; } - free( psz_modulename ); - if( !p_text->p_module ) - p_text->p_module = module_need( p_text, "text renderer", NULL, false ); + /* */ + if( p_subtitle_area != p_subtitle_area_buffer ) + free( p_subtitle_area ); - /* 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 ); + vlc_mutex_unlock( &p_sys->lock ); } -static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, - vlc_fourcc_t i_src_chroma, vlc_fourcc_t i_dst_chroma, - bool b_resize ) +/***************************************************************************** + * 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_scale; - - p_scale = vlc_custom_create( p_obj, sizeof(filter_t), - VLC_OBJECT_GENERIC, "scale" ); - if( !p_scale ) - return NULL; - - es_format_Init( &p_scale->fmt_in, VIDEO_ES, 0 ); - p_scale->fmt_in.video.i_chroma = i_src_chroma; - p_scale->fmt_in.video.i_width = - p_scale->fmt_in.video.i_height = 32; + spu_private_t *p_sys = p_spu->p; + int i_channel; + subpicture_t *p_subpic = NULL; + const mtime_t render_osd_date = mdate(); - es_format_Init( &p_scale->fmt_out, VIDEO_ES, 0 ); - p_scale->fmt_out.video.i_chroma = i_dst_chroma; - p_scale->fmt_out.video.i_width = - p_scale->fmt_out.video.i_height = b_resize ? 16 : 32; + /* 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 ); - p_scale->pf_vout_buffer_new = spu_new_video_buffer; - p_scale->pf_vout_buffer_del = spu_del_video_buffer; + vlc_mutex_lock( &p_sys->chain_lock ); + if( psz_chain_update ) + { + filter_chain_Reset( p_sys->p_chain, NULL, NULL ); - vlc_object_attach( p_scale, p_obj ); - p_scale->p_module = module_need( p_scale, "video filter2", 0, 0 ); + filter_chain_AppendFromString( p_spu->p->p_chain, psz_chain_update ); - return p_scale; -} -static void SpuRenderCreateAndLoadScale( spu_t *p_spu ) -{ - assert( !p_spu->p->p_scale ); - assert( !p_spu->p->p_scale_yuvp ); - /* 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 ); - /* 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 ); -} + free( psz_chain_update ); + } + /* Run subpicture filters */ + filter_chain_SubFilter( p_sys->p_chain, render_osd_date ); + vlc_mutex_unlock( &p_sys->chain_lock ); -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 ) -{ - filter_t *p_text = p_spu->p->p_text; + vlc_mutex_lock( &p_sys->lock ); - assert( p_region->fmt.i_chroma == VLC_FOURCC_TEXT ); + /* 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_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; - if( !p_text || !p_text->p_module ) - goto exit; + /* 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; - /* Setup 3 variables which can be used to render - * time-dependent text (and effects). The first indicates - * the total amount of time the text will be on screen, - * the second the amount of time it has already been on - * screen (can be a negative value as text is layed out - * before it is rendered) and the third is a feedback - * variable from the renderer - if the renderer sets it - * then this particular text is time-dependent, eg. the - * visual progress bar inside the text in karaoke and the - * text needs to be rendered multiple times in order for - * the effect to work - we therefore need to return the - * region to its original state at the end of the loop, - * instead of leaving it in YUVA or YUVP. - * Any renderer which is unaware of how to render - * time-dependent text can happily ignore the variables - * and render the text the same as usual - it should at - * least show up on screen, but the effect won't change - * the text over time. - */ - 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_SetBool( p_text, "text-rerender", false ); - var_SetInteger( p_text, "scale", i_min_scale_ratio ); + if( !p_current || p_entry->b_reject ) + { + if( p_entry->b_reject ) + SpuHeapDeleteAt( &p_sys->heap, i_index ); + continue; + } - if( p_text->pf_render_html && p_region->psz_html ) - { - p_text->pf_render_html( p_text, p_region, p_region ); - } - else if( p_text->pf_render_text ) - { - p_text->pf_render_text( p_text, p_region, p_region ); + 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 ); + } } - *pb_rerender_text = var_GetBool( p_text, "text-rerender" ); -exit: - p_region->i_align |= SUBPICTURE_RENDERED; + p_sys->i_last_sort_date = render_subtitle_date; + vlc_mutex_unlock( &p_sys->lock ); + + return p_subpic; } -/** - * A few scale functions helpers. - */ -typedef struct +void spu_OffsetSubtitleDate( spu_t *p_spu, mtime_t i_duration ) { - int w; - int h; -} spu_scale_t; + spu_private_t *p_sys = p_spu->p; -static spu_scale_t spu_scale_create( int w, int h ) -{ - spu_scale_t s = { .w = w, .h = h }; - if( s.w <= 0 ) - s.w = SCALE_UNIT; - if( s.h <= 0 ) - s.h = SCALE_UNIT; - return s; -} -static spu_scale_t spu_scale_unit(void ) -{ - return spu_scale_create( SCALE_UNIT, SCALE_UNIT ); + 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 ); } -static spu_scale_t spu_scale_createq( int wn, int wd, int hn, int hd ) + +int spu_RegisterChannel( spu_t *p_spu ) { - return spu_scale_create( wn * SCALE_UNIT / wd, - hn * SCALE_UNIT / hd ); + 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; } -static int spu_scale_w( int v, const spu_scale_t s ) + +void spu_ClearChannel( spu_t *p_spu, int i_channel ) { - return v * s.w / SCALE_UNIT; + 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 ); } -static int spu_scale_h( int v, const spu_scale_t s ) + +void spu_ChangeFilters( spu_t *p_spu, const char *psz_filters ) { - return v * s.h / SCALE_UNIT; + 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 ); } -static int spu_invscale_w( int v, const spu_scale_t s ) + +/***************************************************************************** + * subpicture_t allocation + *****************************************************************************/ +struct subpicture_private_t { - return v * SCALE_UNIT / s.w; -} -static int spu_invscale_h( int v, const spu_scale_t s ) + video_format_t src; + video_format_t dst; +}; + +subpicture_t *subpicture_New( const subpicture_updater_t *p_upd ) { - return v * SCALE_UNIT / s.h; -} + subpicture_t *p_subpic = calloc( 1, sizeof(*p_subpic) ); + if( !p_subpic ) + return NULL; -/** - * A few area functions helpers - */ + p_subpic->i_order = 0; + 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; -typedef struct -{ - int i_x; - int i_y; - int i_width; - int i_height; + if( p_upd ) + { + subpicture_private_t *p_private = malloc( sizeof(*p_private) ); + if( !p_private ) + { + free( p_subpic ); + return NULL; + } + video_format_Init( &p_private->src, 0 ); + video_format_Init( &p_private->dst, 0 ); - spu_scale_t scale; -} spu_area_t; + p_subpic->updater = *p_upd; + p_subpic->p_private = p_private; + } + else + { + p_subpic->p_private = NULL; -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 }; - return a; + p_subpic->updater.pf_validate = NULL; + p_subpic->updater.pf_update = NULL; + p_subpic->updater.pf_destroy = NULL; + p_subpic->updater.p_sys = NULL; + } + return p_subpic; } -static spu_area_t spu_area_scaled( spu_area_t a ) + +void subpicture_Delete( subpicture_t *p_subpic ) { - if( a.scale.w == SCALE_UNIT && a.scale.h == SCALE_UNIT ) - return a; + subpicture_region_ChainDelete( p_subpic->p_region ); + p_subpic->p_region = NULL; - a.i_x = spu_scale_w( a.i_x, a.scale ); - a.i_y = spu_scale_h( a.i_y, a.scale ); + if( p_subpic->updater.pf_destroy ) + p_subpic->updater.pf_destroy( p_subpic ); - a.i_width = spu_scale_w( a.i_width, a.scale ); - a.i_height = spu_scale_h( a.i_height, a.scale ); + free( p_subpic->p_private ); + free( p_subpic ); +} - a.scale = spu_scale_unit(); - return a; +static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic ) +{ + p_subpic->p_next = *pp_head; + + *pp_head = p_subpic; } -static spu_area_t spu_area_unscaled( spu_area_t a, spu_scale_t s ) + +subpicture_t *subpicture_NewFromPicture( vlc_object_t *p_obj, + picture_t *p_picture, vlc_fourcc_t i_chroma ) { - if( a.scale.w == s.w && a.scale.h == s.h ) - return a; + /* */ + video_format_t fmt_in = p_picture->format; - a = spu_area_scaled( a ); + /* */ + video_format_t fmt_out; + fmt_out = fmt_in; + fmt_out.i_chroma = i_chroma; - a.i_x = spu_invscale_w( a.i_x, s ); - a.i_y = spu_invscale_h( a.i_y, s ); + /* */ + image_handler_t *p_image = image_HandlerCreate( p_obj ); + if( !p_image ) + return NULL; - a.i_width = spu_invscale_w( a.i_width, s ); - a.i_height = spu_invscale_h( a.i_height, s ); + picture_t *p_pip = image_Convert( p_image, p_picture, &fmt_in, &fmt_out ); - a.scale = s; - return a; -} -static bool spu_area_overlap( spu_area_t a, spu_area_t b ) -{ - const int i_dx = 0; - const int i_dy = 0; + image_HandlerDelete( p_image ); - a = spu_area_scaled( a ); - b = spu_area_scaled( b ); + if( !p_pip ) + return NULL; - return __MAX( a.i_x-i_dx, b.i_x ) < __MIN( a.i_x+a.i_width +i_dx, b.i_x+b.i_width ) && - __MAX( a.i_y-i_dy, b.i_y ) < __MIN( a.i_y+a.i_height+i_dy, b.i_y+b.i_height ); -} + subpicture_t *p_subpic = subpicture_New( NULL ); + if( !p_subpic ) + { + picture_Release( p_pip ); + return NULL; + } -/** - * 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; + p_subpic->i_original_picture_width = fmt_out.i_width; + p_subpic->i_original_picture_height = fmt_out.i_height; - assert( p_master->i_x == 0 && p_master->i_y == 0 ); + fmt_out.i_sar_num = + fmt_out.i_sar_den = 0; - /* Check for overlap - * XXX It is not fast O(n^2) but we should not have a lot of region */ - do + p_subpic->p_region = subpicture_region_New( &fmt_out ); + if( p_subpic->p_region ) { - b_ok = true; - for( int i = 0; i < i_sub; i++ ) - { - spu_area_t sub = spu_area_scaled( p_sub[i] ); + picture_Release( p_subpic->p_region->p_picture ); + p_subpic->p_region->p_picture = p_pip; + } + else + { + picture_Release( p_pip ); + } + return p_subpic; +} - if( !spu_area_overlap( a, sub ) ) - continue; +static void SubpictureUpdate( subpicture_t *p_subpicture, + const video_format_t *p_fmt_src, + const video_format_t *p_fmt_dst, + mtime_t i_ts ) +{ + subpicture_updater_t *p_upd = &p_subpicture->updater; + subpicture_private_t *p_private = p_subpicture->p_private; - if( i_align & SUBPICTURE_ALIGN_TOP ) - { - /* 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; - } - else if( i_align & SUBPICTURE_ALIGN_BOTTOM ) - { - /* 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; - } - else - { - /* TODO what to do in this case? */ - //fprintf( stderr, "Overlap with unsupported alignment\n" ); - break; - } + if( !p_upd->pf_validate ) + return; + if( !p_upd->pf_validate( p_subpicture, + !video_format_IsSimilar( p_fmt_src, + &p_private->src ), p_fmt_src, + !video_format_IsSimilar( p_fmt_dst, + &p_private->dst ), p_fmt_dst, + i_ts ) ) + return; - b_ok = false; - break; - } - } while( !b_ok ); + subpicture_region_ChainDelete( p_subpicture->p_region ); + p_subpicture->p_region = NULL; - if( b_moved ) - *p_dst = spu_area_unscaled( a, p_dst->scale ); -} + p_upd->pf_update( p_subpicture, p_fmt_src, p_fmt_dst, i_ts ); + video_format_Clean( &p_private->src ); + video_format_Clean( &p_private->dst ); -/** - * 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 ) + video_format_Copy( &p_private->src, p_fmt_src ); + video_format_Copy( &p_private->dst, p_fmt_dst ); +} + +/***************************************************************************** + * subpicture_region_t allocation + *****************************************************************************/ +subpicture_region_t *subpicture_region_New( const video_format_t *p_fmt ) { - const int i_delta_x = p_region->i_x; - const int i_delta_y = p_region->i_y; - int i_x, i_y; + subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) ); + if( !p_region ) + return NULL; - assert( p_region->i_x != INT_MAX && p_region->i_y != INT_MAX ); - if( p_region->i_align & SUBPICTURE_ALIGN_TOP ) - { - i_y = i_delta_y; - } - else if( p_region->i_align & SUBPICTURE_ALIGN_BOTTOM ) - { - i_y = p_subpic->i_original_picture_height - p_region->fmt.i_height - i_delta_y; - } - else + p_region->fmt = *p_fmt; + p_region->fmt.p_palette = NULL; + if( p_fmt->i_chroma == VLC_CODEC_YUVP ) { - i_y = p_subpic->i_original_picture_height / 2 - p_region->fmt.i_height / 2; + 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; } + 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_region->i_align & SUBPICTURE_ALIGN_LEFT ) - { - i_x = i_delta_x; - } - else if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT ) - { - i_x = p_subpic->i_original_picture_width - p_region->fmt.i_width - i_delta_x; - } - else - { - i_x = p_subpic->i_original_picture_width / 2 - p_region->fmt.i_width / 2; - } + if( p_fmt->i_chroma == VLC_CODEC_TEXT ) + return p_region; - if( p_subpic->b_absolute ) + p_region->p_picture = picture_NewFromFormat( p_fmt ); + if( !p_region->p_picture ) { - i_x = i_delta_x; - i_y = i_delta_y; + free( p_region->fmt.p_palette ); + free( p_region ); + return NULL; } - /* Margin shifts all subpictures */ - if( i_margin_y != 0 ) - i_y -= i_margin_y; + return p_region; +} - /* 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; +/* */ +void subpicture_region_Delete( subpicture_region_t *p_region ) +{ + if( !p_region ) + return; - 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; + if( p_region->p_private ) + SpuRegionPrivateDelete( p_region->p_private ); - *pi_x = i_x; - *pi_y = i_y; + if( p_region->p_picture ) + picture_Release( p_region->p_picture ); + + free( p_region->fmt.p_palette ); + + free( p_region->psz_text ); + free( p_region->psz_html ); + if( p_region->p_style ) + text_style_Delete( p_region->p_style ); + free( p_region ); } -/** - * This function computes the current alpha value for a given region. - */ -static int SpuRegionAlpha( subpicture_t *p_subpic, subpicture_region_t *p_region ) +/* */ +void subpicture_region_ChainDelete( subpicture_region_t *p_head ) { - /* Compute alpha blend value */ - int i_fade_alpha = 255; - if( p_subpic->b_fade ) + while( p_head ) { - mtime_t i_fade_start = ( p_subpic->i_stop + - p_subpic->i_start ) / 2; - mtime_t i_now = mdate(); + subpicture_region_t *p_next = p_head->p_next; - if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start ) - { - i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) / - ( p_subpic->i_stop - i_fade_start ); - } + subpicture_region_Delete( p_head ); + + p_head = p_next; } - return i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025; } -/** - * It will render the provided region onto p_pic_dst. - */ - -static void SpuRenderRegion( spu_t *p_spu, - picture_t *p_pic_dst, spu_area_t *p_area, - 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 ) -{ - spu_private_t *p_sys = p_spu->p; - - video_format_t fmt_original = p_region->fmt; - bool b_rerender_text = false; - bool b_restore_format = false; - int i_x_offset; - int i_y_offset; - - video_format_t region_fmt; - picture_t *p_region_picture; - /* 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 ) +/***************************************************************************** + * heap managment + *****************************************************************************/ +static void SpuHeapInit( spu_heap_t *p_heap ) +{ + for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) { - 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 ); - b_restore_format = b_rerender_text; + spu_heap_entry_t *e = &p_heap->p_entry[i]; - /* Check if the rendering has failed ... */ - if( p_region->fmt.i_chroma == VLC_FOURCC_TEXT ) - goto exit; + e->p_subpicture = NULL; + e->b_reject = false; } +} - /* Force palette if requested - * 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_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; - - - /* Compute the margin which is expressed in destination pixel unit - * The margin is applied only to subtitle and when no forced crop is - * requested (dvd menu) */ - int i_margin_y = 0; - if( !b_force_crop && p_subpic->b_subtitle ) - i_margin_y = spu_invscale_h( p_sys->i_margin, scale_size ); +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]; - /* 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 ); + if( e->p_subpicture ) + continue; - /* Save this position for subtitle overlap support - * it is really important that there are given without scale_size applied */ - *p_area = spu_area_create( i_x_offset, i_y_offset, - p_region->fmt.i_width, p_region->fmt.i_height, - scale_size ); + e->p_subpicture = p_subpic; + e->b_reject = false; + return VLC_SUCCESS; + } + return VLC_EGENERIC; +} - /* 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() ); +static void SpuHeapDeleteAt( spu_heap_t *p_heap, int i_index ) +{ + spu_heap_entry_t *e = &p_heap->p_entry[i_index]; - SpuAreaFixOverlap( p_area, &display, p_subtitle_area, i_subtitle_area, - p_region->i_align ); - } + if( e->p_subpicture ) + subpicture_Delete( e->p_subpicture ); - /* 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 ); + e->p_subpicture = NULL; +} - /* */ - if( b_force_palette ) +static int SpuHeapDeleteSubpicture( spu_heap_t *p_heap, subpicture_t *p_subpic ) +{ + for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) { - video_palette_t *p_palette = p_region->fmt.p_palette; - video_palette_t palette; + spu_heap_entry_t *e = &p_heap->p_entry[i]; - /* We suppose DVD palette here */ - palette.i_entries = 4; - for( int i = 0; i < 4; i++ ) - for( int j = 0; j < 4; j++ ) - palette.palette[i][j] = p_sys->palette[i][j]; + if( e->p_subpicture != p_subpic ) + continue; - if( p_palette->i_entries == palette.i_entries ) - { - for( int i = 0; i < p_palette->i_entries; i++ ) - for( int j = 0; j < 4; j++ ) - b_changed_palette |= p_palette->palette[i][j] != palette.palette[i][j]; - } - else - { - b_changed_palette = true; - } - *p_palette = palette; + SpuHeapDeleteAt( p_heap, i ); + return VLC_SUCCESS; } + return VLC_EGENERIC; +} - /* */ - region_fmt = p_region->fmt; - p_region_picture = p_region->p_picture; +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 subpicture_region_private_t *SpuRegionPrivateNew( video_format_t *p_fmt ) +{ + subpicture_region_private_t *p_private = malloc( sizeof(*p_private) ); - /* Scale from rendered size to destination size */ - if( p_sys->p_scale && p_sys->p_scale->p_module && - ( !b_using_palette || ( p_sys->p_scale_yuvp && p_sys->p_scale_yuvp->p_module ) ) && - ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_using_palette ) ) + if( !p_private ) + return NULL; + + p_private->fmt = *p_fmt; + if( p_fmt->p_palette ) { - const unsigned i_dst_width = spu_scale_w( p_region->fmt.i_width, scale_size ); - const unsigned i_dst_height = spu_scale_h( p_region->fmt.i_height, scale_size ); + 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; - /* Destroy the cache if unusable */ - if( p_region->p_private ) - { - subpicture_region_private_t *p_private = p_region->p_private; - bool b_changed = false; + return p_private; +} +static void SpuRegionPrivateDelete( subpicture_region_private_t *p_private ) +{ + if( p_private->p_picture ) + picture_Release( p_private->p_picture ); + free( p_private->fmt.p_palette ); + free( p_private ); +} - /* Check resize changes */ - if( i_dst_width != p_private->fmt.i_width || - i_dst_height != p_private->fmt.i_height ) - b_changed = true; +static void FilterRelease( filter_t *p_filter ) +{ + if( p_filter->p_module ) + module_unneed( p_filter, p_filter->p_module ); - /* Check forced palette changes */ - if( b_changed_palette ) - b_changed = true; + vlc_object_release( p_filter ); +} - if( b_changed ) - { - SpuRegionPrivateDestroy( p_private ); - p_region->p_private = NULL; - } - } +static void SpuRenderCreateAndLoadText( spu_t *p_spu ) +{ + filter_t *p_text; - /* Scale if needed into cache */ - if( !p_region->p_private ) - { - filter_t *p_scale = p_sys->p_scale; + assert( !p_spu->p->p_text ); - picture_t *p_picture = p_region->p_picture; - picture_Hold( p_picture ); + p_spu->p->p_text = + p_text = vlc_custom_create( p_spu, sizeof(filter_t), + VLC_OBJECT_GENERIC, "spu text" ); + if( !p_text ) + return; - /* Convert YUVP to YUVA/RGBA first for better scaling quality */ - if( b_using_palette ) - { - filter_t *p_scale_yuvp = p_sys->p_scale_yuvp; + es_format_Init( &p_text->fmt_in, VIDEO_ES, 0 ); - p_scale_yuvp->fmt_in.video = p_region->fmt; + es_format_Init( &p_text->fmt_out, VIDEO_ES, 0 ); + p_text->fmt_out.video.i_width = + p_text->fmt_out.video.i_visible_width = 32; + p_text->fmt_out.video.i_height = + p_text->fmt_out.video.i_visible_height = 32; - /* 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_text->pf_sub_buffer_new = spu_new_buffer; + p_text->pf_sub_buffer_del = spu_del_buffer; - p_picture = p_scale_yuvp->pf_video_filter( p_scale_yuvp, p_picture ); - if( !p_picture ) - { - /* Well we will try conversion+scaling */ - msg_Warn( p_spu, "%4.4s to %4.4s conversion failed", - (const char*)&p_scale_yuvp->fmt_in.video.i_chroma, - (const char*)&p_scale_yuvp->fmt_out.video.i_chroma ); - } - } + vlc_object_attach( p_text, p_spu ); - /* Conversion(except from YUVP)/Scaling */ - if( p_picture && - ( p_picture->format.i_width != i_dst_width || - p_picture->format.i_height != i_dst_height ) ) - { - p_scale->fmt_in.video = p_picture->format; - p_scale->fmt_out.video = p_picture->format; + /* FIXME TOCHECK shouldn't module_need( , , psz_modulename, false ) do the + * same than these 2 calls ? */ + char *psz_modulename = var_CreateGetString( p_spu, "text-renderer" ); + if( psz_modulename && *psz_modulename ) + { + p_text->p_module = module_need( p_text, "text renderer", + psz_modulename, true ); + } + free( psz_modulename ); - p_scale->fmt_out.video.i_width = i_dst_width; - p_scale->fmt_out.video.i_height = i_dst_height; + if( !p_text->p_module ) + p_text->p_module = module_need( p_text, "text renderer", NULL, false ); - p_scale->fmt_out.video.i_visible_width = - spu_scale_w( p_region->fmt.i_visible_width, scale_size ); - p_scale->fmt_out.video.i_visible_height = - spu_scale_h( p_region->fmt.i_visible_height, scale_size ); + /* 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 ); +} - p_picture = p_scale->pf_video_filter( p_scale, p_picture ); - if( !p_picture ) - msg_Err( p_spu, "scaling failed" ); - } +static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, + vlc_fourcc_t i_src_chroma, vlc_fourcc_t i_dst_chroma, + bool b_resize ) +{ + filter_t *p_scale; - /* */ - if( p_picture ) - { - p_region->p_private = SpuRegionPrivateCreate( &p_picture->format ); - if( p_region->p_private ) - { - p_region->p_private->p_picture = p_picture; - if( !p_region->p_private->p_picture ) - { - SpuRegionPrivateDestroy( p_region->p_private ); - p_region->p_private = NULL; - } - } - else - { - picture_Release( p_picture ); - } - } - } + p_scale = vlc_custom_create( p_obj, sizeof(filter_t), + VLC_OBJECT_GENERIC, "scale" ); + if( !p_scale ) + return NULL; - /* And use the scaled picture */ - if( p_region->p_private ) - { - region_fmt = p_region->p_private->fmt; - p_region_picture = p_region->p_private->p_picture; - } - } + es_format_Init( &p_scale->fmt_in, VIDEO_ES, 0 ); + p_scale->fmt_in.video.i_chroma = i_src_chroma; + p_scale->fmt_in.video.i_width = + p_scale->fmt_in.video.i_height = 32; - /* Force cropping if requested */ - if( b_force_crop ) - { - int i_crop_x = spu_scale_w( p_sys->i_crop_x, scale_size ); - int i_crop_y = spu_scale_h( p_sys->i_crop_y, scale_size ); - int i_crop_width = spu_scale_w( p_sys->i_crop_width, scale_size ); - int i_crop_height= spu_scale_h( p_sys->i_crop_height,scale_size ); + es_format_Init( &p_scale->fmt_out, VIDEO_ES, 0 ); + p_scale->fmt_out.video.i_chroma = i_dst_chroma; + p_scale->fmt_out.video.i_width = + p_scale->fmt_out.video.i_height = b_resize ? 16 : 32; - /* Find the intersection */ - if( i_crop_x + i_crop_width <= i_x_offset || - i_x_offset + (int)region_fmt.i_visible_width < i_crop_x || - i_crop_y + i_crop_height <= i_y_offset || - i_y_offset + (int)region_fmt.i_visible_height < i_crop_y ) - { - /* No intersection */ - region_fmt.i_visible_width = - region_fmt.i_visible_height = 0; - } - else - { - int i_x, i_y, i_x_end, i_y_end; - i_x = __MAX( i_crop_x, i_x_offset ); - i_y = __MAX( i_crop_y, i_y_offset ); - i_x_end = __MIN( i_crop_x + i_crop_width, - i_x_offset + (int)region_fmt.i_visible_width ); - i_y_end = __MIN( i_crop_y + i_crop_height, - i_y_offset + (int)region_fmt.i_visible_height ); + p_scale->pf_video_buffer_new = spu_new_video_buffer; + p_scale->pf_video_buffer_del = spu_del_video_buffer; - region_fmt.i_x_offset = i_x - i_x_offset; - region_fmt.i_y_offset = i_y - i_y_offset; - region_fmt.i_visible_width = i_x_end - i_x; - region_fmt.i_visible_height = i_y_end - i_y; + vlc_object_attach( p_scale, p_obj ); + p_scale->p_module = module_need( p_scale, "video filter2", NULL, false ); - i_x_offset = __MAX( i_x, 0 ); - i_y_offset = __MAX( i_y, 0 ); - } - } + return p_scale; +} +static void SpuRenderCreateAndLoadScale( spu_t *p_spu ) +{ + assert( !p_spu->p->p_scale ); + assert( !p_spu->p->p_scale_yuvp ); + /* 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_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_CODEC_YUVP, VLC_CODEC_YUVA, false ); +} - /* Update the blender */ - SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, ®ion_fmt ); +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, mtime_t render_date ) +{ + filter_t *p_text = p_spu->p->p_text; - if( p_sys->p_blend->p_module ) - { - const int i_alpha = SpuRegionAlpha( p_subpic, p_region ); + assert( p_region->fmt.i_chroma == VLC_CODEC_TEXT ); + + if( !p_text || !p_text->p_module ) + goto exit; + + /* Setup 3 variables which can be used to render + * time-dependent text (and effects). The first indicates + * the total amount of time the text will be on screen, + * the second the amount of time it has already been on + * screen (can be a negative value as text is layed out + * before it is rendered) and the third is a feedback + * variable from the renderer - if the renderer sets it + * then this particular text is time-dependent, eg. the + * visual progress bar inside the text in karaoke and the + * text needs to be rendered multiple times in order for + * the effect to work - we therefore need to return the + * region to its original state at the end of the loop, + * instead of leaving it in YUVA or YUVP. + * Any renderer which is unaware of how to render + * time-dependent text can happily ignore the variables + * and render the text the same as usual - it should at + * least show up on screen, but the effect won't change + * the text over time. + */ + var_SetTime( p_text, "spu-duration", p_subpic->i_stop - 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 ); - 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 ); + if( p_text->pf_render_html && p_region->psz_html ) + { + p_text->pf_render_html( p_text, p_region, p_region ); } - else + else if( p_text->pf_render_text ) { - 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_out.video.i_chroma ); + p_text->pf_render_text( p_text, p_region, p_region ); } + *pb_rerender_text = var_GetBool( p_text, "text-rerender" ); exit: - if( b_rerender_text ) - { - /* Some forms of subtitles need to be re-rendered more than - * once, eg. karaoke. We therefore restore the region to its - * 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_private ) - { - SpuRegionPrivateDestroy( p_region->p_private ); - p_region->p_private = NULL; - } - p_region->i_align &= ~SUBPICTURE_RENDERED; - } - if( b_restore_format ) - p_region->fmt = fmt_original; + p_region->i_align |= SUBPICTURE_RENDERED; } /** - * This function compares two 64 bits integers. - * It can be used by qsort. + * A few scale functions helpers. */ -static int IntegerCmp( int64_t i0, int64_t i1 ) +static spu_scale_t spu_scale_create( int w, int h ) { - return i0 < i1 ? -1 : i0 > i1 ? 1 : 0; + spu_scale_t s = { .w = w, .h = h }; + if( s.w <= 0 ) + s.w = SCALE_UNIT; + if( s.h <= 0 ) + s.h = SCALE_UNIT; + return s; +} +static spu_scale_t spu_scale_unit( void ) +{ + return spu_scale_create( SCALE_UNIT, SCALE_UNIT ); +} +static spu_scale_t spu_scale_createq( int wn, int wd, int hn, int hd ) +{ + return spu_scale_create( wn * SCALE_UNIT / wd, + hn * SCALE_UNIT / hd ); +} +static int spu_scale_w( int v, const spu_scale_t s ) +{ + return v * s.w / SCALE_UNIT; +} +static int spu_scale_h( int v, const spu_scale_t s ) +{ + return v * s.h / SCALE_UNIT; +} +static int spu_invscale_w( int v, const spu_scale_t s ) +{ + return v * SCALE_UNIT / s.w; } +static int spu_invscale_h( int v, const spu_scale_t s ) +{ + return v * SCALE_UNIT / s.h; +} + /** - * This function compares 2 subpictures using the following properties - * (ordered by priority) - * 1. absolute positionning - * 2. start time - * 3. creation order - * - * It can be used by qsort. - * - * XXX spu_RenderSubpictures depends heavily on this order. + * A few area functions helpers */ -static int SubpictureCmp( const void *s0, const void *s1 ) +static spu_area_t spu_area_create( int x, int y, int w, int h, spu_scale_t s ) { - subpicture_t *p_subpic0 = *(subpicture_t**)s0; - subpicture_t *p_subpic1 = *(subpicture_t**)s1; - int r; + spu_area_t a = { .i_x = x, .i_y = y, .i_width = w, .i_height = h, .scale = s }; + return a; +} +static spu_area_t spu_area_scaled( spu_area_t a ) +{ + if( a.scale.w == SCALE_UNIT && a.scale.h == SCALE_UNIT ) + return a; - 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_order, p_subpic1->i_order ); - return r; + a.i_x = spu_scale_w( a.i_x, a.scale ); + a.i_y = spu_scale_h( a.i_y, a.scale ); + + a.i_width = spu_scale_w( a.i_width, a.scale ); + a.i_height = spu_scale_h( a.i_height, a.scale ); + + a.scale = spu_scale_unit(); + return a; +} +static spu_area_t spu_area_unscaled( spu_area_t a, spu_scale_t s ) +{ + if( a.scale.w == s.w && a.scale.h == s.h ) + return a; + + a = spu_area_scaled( a ); + + a.i_x = spu_invscale_w( a.i_x, s ); + a.i_y = spu_invscale_h( a.i_y, s ); + + a.i_width = spu_invscale_w( a.i_width, s ); + a.i_height = spu_invscale_h( a.i_height, s ); + + a.scale = s; + return a; +} +static bool spu_area_overlap( spu_area_t a, spu_area_t b ) +{ + const int i_dx = 0; + const int i_dy = 0; + + a = spu_area_scaled( a ); + b = spu_area_scaled( b ); + + return __MAX( a.i_x-i_dx, b.i_x ) < __MIN( a.i_x+a.i_width +i_dx, b.i_x+b.i_width ) && + __MAX( a.i_y-i_dy, b.i_y ) < __MIN( a.i_y+a.i_height+i_dy, b.i_y+b.i_height ); } + /** - * This function renders all sub picture units in the list. + * Avoid area overlapping */ -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 ) +static void SpuAreaFixOverlap( spu_area_t *p_dst, + const spu_area_t *p_sub, int i_sub, int i_align ) { - spu_private_t *p_sys = p_spu->p; + spu_area_t a = spu_area_scaled( *p_dst ); + bool b_moved = false; + bool b_ok; - 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(); + /* Check for overlap + * XXX It is not fast O(n^2) but we should not have a lot of region */ + do + { + b_ok = true; + for( int i = 0; i < i_sub; i++ ) + { + spu_area_t sub = spu_area_scaled( p_sub[i] ); - unsigned int i_subpicture; - subpicture_t *pp_subpicture[VOUT_MAX_SUBPICTURES]; + if( !spu_area_overlap( a, sub ) ) + continue; - 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; + if( i_align & SUBPICTURE_ALIGN_TOP ) + { + /* We go down */ + int i_y = sub.i_y + sub.i_height; + a.i_y = i_y; + b_moved = true; + } + else if( i_align & SUBPICTURE_ALIGN_BOTTOM ) + { + /* We go up */ + int i_y = sub.i_y - a.i_height; + a.i_y = i_y; + b_moved = true; + } + else + { + /* TODO what to do in this case? */ + //fprintf( stderr, "Overlap with unsupported alignment\n" ); + break; + } - vlc_mutex_lock( &p_sys->lock ); + b_ok = false; + break; + } + } while( !b_ok ); - /* 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 ) - { - /* */ - if( p_subpic->pf_pre_render ) - p_subpic->pf_pre_render( p_spu, p_subpic, p_fmt_dst ); + if( b_moved ) + *p_dst = spu_area_unscaled( a, p_dst->scale ); +} + + +static void SpuAreaFitInside( spu_area_t *p_area, const spu_area_t *p_boundary ) +{ + spu_area_t a = spu_area_scaled( *p_area ); - 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; + 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; - p_subpic->pf_update_regions( p_spu, p_subpic, &fmt_org, i_current_date ); - } + 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; - /* */ - if( p_subpic->b_subtitle ) - { - for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next ) - i_subtitle_region_count++; - } + *p_area = spu_area_unscaled( a, p_area->scale ); +} - /* */ - pp_subpicture[i_subpicture++] = p_subpic; - } +/** + * Place a region + */ +static void SpuRegionPlace( int *pi_x, int *pi_y, + const subpicture_t *p_subpic, + const subpicture_region_t *p_region ) +{ + const int i_delta_x = p_region->i_x; + const int i_delta_y = p_region->i_y; + int i_x, i_y; - /* Be sure we have at least 1 picture to process */ - if( i_subpicture <= 0 ) + assert( p_region->i_x != INT_MAX && p_region->i_y != INT_MAX ); + if( p_region->i_align & SUBPICTURE_ALIGN_TOP ) { - vlc_mutex_unlock( &p_sys->lock ); - return; + i_y = i_delta_y; + } + else if( p_region->i_align & SUBPICTURE_ALIGN_BOTTOM ) + { + i_y = p_subpic->i_original_picture_height - p_region->fmt.i_height - i_delta_y; + } + else + { + i_y = p_subpic->i_original_picture_height / 2 - p_region->fmt.i_height / 2; } - /* 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_region->i_align & SUBPICTURE_ALIGN_LEFT ) + { + i_x = i_delta_x; + } + else if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT ) + { + i_x = p_subpic->i_original_picture_width - p_region->fmt.i_width - i_delta_x; + } + else + { + i_x = p_subpic->i_original_picture_width / 2 - p_region->fmt.i_width / 2; + } - /* 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) ); + if( p_subpic->b_absolute ) + { + i_x = i_delta_x; + i_y = i_delta_y; + } - /* Create the blending module */ - if( !p_sys->p_blend ) - SpuRenderCreateBlend( p_spu, p_fmt_dst->i_chroma, p_fmt_dst->i_aspect ); + *pi_x = i_x; + *pi_y = i_y; +} - /* Process all subpictures and regions (in the right order) */ - for( unsigned int i_index = 0; i_index < i_subpicture; i_index++ ) +/** + * This function computes the current alpha value for a given region. + */ +static int SpuRegionAlpha( subpicture_t *p_subpic, subpicture_region_t *p_region ) +{ + /* Compute alpha blend value */ + int i_fade_alpha = 255; + if( p_subpic->b_fade ) { - subpicture_t *p_subpic = pp_subpicture[i_index]; - subpicture_region_t *p_region; - - if( !p_subpic->p_region ) - continue; + mtime_t i_fade_start = ( p_subpic->i_stop + + p_subpic->i_start ) / 2; + mtime_t i_now = mdate(); - /* 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_now >= i_fade_start && p_subpic->i_stop > i_fade_start ) { - 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; + i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) / + ( p_subpic->i_stop - i_fade_start ); } + } + return i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025; +} - 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; +/** + * It will render the provided region onto p_pic_dst. + */ - p_sys->p_text->fmt_out.video.i_height = - p_sys->p_text->fmt_out.video.i_visible_height = i_render_height; - } +static void SpuRenderRegion( spu_t *p_spu, + picture_t *p_pic_dst, spu_area_t *p_area, + 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, + mtime_t render_date ) +{ + spu_private_t *p_sys = p_spu->p; - /* 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 ); + video_format_t fmt_original = p_region->fmt; + bool b_rerender_text = false; + bool b_restore_format = false; + int i_x_offset; + int i_y_offset; - /* 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; + video_format_t region_fmt; + picture_t *p_region_picture; - /* 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; - } - } + /* Invalidate area by default */ + *p_area = spu_area_create( 0,0, 0,0, scale_size ); - /* 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 text region */ + 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, render_date ); + b_restore_format = b_rerender_text; - /* 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 if the rendering has failed ... */ + if( p_region->fmt.i_chroma == VLC_CODEC_TEXT ) + goto exit; + } - /* Check scale validity */ - if( scale.w <= 0 || scale.h <= 0 ) - continue; + /* Force palette if requested + * 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_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; - /* */ - 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; + /* Compute the margin which is expressed in destination pixel unit + * The margin is applied only to subtitle and when no forced crop is + * requested (dvd menu) */ + int i_margin_y = 0; + if( !b_force_crop && p_subpic->b_subtitle ) + i_margin_y = spu_invscale_h( p_sys->i_margin, scale_size ); + + /* Place the picture + * We compute the position in the rendered size */ + SpuRegionPlace( &i_x_offset, &i_y_offset, + p_subpic, p_region ); + + /* Save this position for subtitle overlap support + * it is really important that there are given without scale_size applied */ + *p_area = spu_area_create( i_x_offset, i_y_offset, + p_region->fmt.i_width, p_region->fmt.i_height, + scale_size ); + + /* Handle overlapping subtitles when possible */ + if( p_subpic->b_subtitle && !p_subpic->b_absolute ) + { + SpuAreaFixOverlap( p_area, p_subtitle_area, i_subtitle_area, + p_region->i_align ); } - /* */ - if( p_subtitle_area != p_subtitle_area_buffer ) - free( p_subtitle_area ); + /* 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; - vlc_mutex_unlock( &p_sys->lock ); -} + /* 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_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. - *****************************************************************************/ -static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic ) -{ - p_subpic->p_next = *pp_head; + spu_area_t display = spu_area_create( 0, 0, p_fmt->i_width, p_fmt->i_height, + spu_scale_unit() ); + SpuAreaFitInside( &restrained, &display ); - *pp_head = p_subpic; -} + /* Fix the position for the current scale_size */ + i_x_offset = spu_scale_w( restrained.i_x, restrained.scale ); + i_y_offset = spu_scale_h( restrained.i_y, restrained.scale ); -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; + /* */ + if( b_force_palette ) + { + video_palette_t *p_palette = p_region->fmt.p_palette; + video_palette_t palette; + + /* We suppose DVD palette here */ + palette.i_entries = 4; + for( int i = 0; i < 4; i++ ) + for( int j = 0; j < 4; j++ ) + palette.palette[i][j] = p_sys->palette[i][j]; + + if( p_palette->i_entries == palette.i_entries ) + { + for( int i = 0; i < p_palette->i_entries; i++ ) + for( int j = 0; j < 4; j++ ) + b_changed_palette |= p_palette->palette[i][j] != palette.palette[i][j]; + } + else + { + b_changed_palette = true; + } + *p_palette = palette; + } - /* Run subpicture filters */ - filter_chain_SubFilter( p_sys->p_chain, display_date ); + /* */ + region_fmt = p_region->fmt; + p_region_picture = p_region->p_picture; - vlc_mutex_lock( &p_sys->lock ); - /* 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++ ) + /* Scale from rendered size to destination size */ + if( p_sys->p_scale && p_sys->p_scale->p_module && + ( !b_using_palette || ( p_sys->p_scale_yuvp && p_sys->p_scale_yuvp->p_module ) ) && + ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_using_palette ) ) { - subpicture_t *p_ephemer = NULL; - mtime_t ephemer_date = 0; - int i_index; + const unsigned i_dst_width = spu_scale_w( p_region->fmt.i_width, scale_size ); + const unsigned i_dst_height = spu_scale_h( p_region->fmt.i_height, scale_size ); - for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ ) + /* Destroy the cache if unusable */ + if( p_region->p_private ) { - spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_index]; - subpicture_t *p_current = p_entry->p_subpicture; + subpicture_region_private_t *p_private = p_region->p_private; + bool b_changed = false; - if( !p_current || p_entry->b_reject ) - { - if( p_entry->b_reject ) - SpuHeapDeleteAt( &p_sys->heap, i_index ); - continue; - } + /* Check resize changes */ + if( i_dst_width != p_private->fmt.i_width || + i_dst_height != p_private->fmt.i_height ) + b_changed = true; - if( p_current->i_channel != i_channel || - ( b_subtitle_only && !p_current->b_subtitle ) ) - { - continue; - } - if( display_date && - display_date < p_current->i_start ) + /* Check forced palette changes */ + if( b_changed_palette ) + b_changed = true; + + if( b_changed ) { - /* Too early, come back next monday */ - continue; + SpuRegionPrivateDelete( p_private ); + p_region->p_private = NULL; } + } + + /* Scale if needed into cache */ + if( !p_region->p_private && i_dst_width > 0 && i_dst_height > 0 ) + { + filter_t *p_scale = p_sys->p_scale; - if( p_current->i_start > ephemer_date ) - ephemer_date = p_current->i_start; + picture_t *p_picture = p_region->p_picture; + picture_Hold( p_picture ); - 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 */ + /* Convert YUVP to YUVA/RGBA first for better scaling quality */ + if( b_using_palette ) { - SpuHeapDeleteAt( &p_sys->heap, i_index ); + filter_t *p_scale_yuvp = p_sys->p_scale_yuvp; + + p_scale_yuvp->fmt_in.video = p_region->fmt; + + /* 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_CODEC_YUVA; + + p_picture = p_scale_yuvp->pf_video_filter( p_scale_yuvp, p_picture ); + if( !p_picture ) + { + /* Well we will try conversion+scaling */ + msg_Warn( p_spu, "%4.4s to %4.4s conversion failed", + (const char*)&p_scale_yuvp->fmt_in.video.i_chroma, + (const char*)&p_scale_yuvp->fmt_out.video.i_chroma ); + } } - else if( p_current->b_ephemer ) + + /* Conversion(except from YUVP)/Scaling */ + if( p_picture && + ( p_picture->format.i_width != i_dst_width || + p_picture->format.i_height != i_dst_height ) ) { - SubpictureChain( &p_ephemer, p_current ); + p_scale->fmt_in.video = p_picture->format; + p_scale->fmt_out.video = p_picture->format; + + p_scale->fmt_out.video.i_width = i_dst_width; + p_scale->fmt_out.video.i_height = i_dst_height; + + p_scale->fmt_out.video.i_visible_width = + spu_scale_w( p_region->fmt.i_visible_width, scale_size ); + p_scale->fmt_out.video.i_visible_height = + spu_scale_h( p_region->fmt.i_visible_height, scale_size ); + + p_picture = p_scale->pf_video_filter( p_scale, p_picture ); + if( !p_picture ) + msg_Err( p_spu, "scaling failed" ); } - else + + /* */ + if( p_picture ) { - SubpictureChain( &p_subpic, p_current ); + p_region->p_private = SpuRegionPrivateNew( &p_picture->format ); + if( p_region->p_private ) + { + p_region->p_private->p_picture = p_picture; + if( !p_region->p_private->p_picture ) + { + SpuRegionPrivateDelete( p_region->p_private ); + p_region->p_private = NULL; + } + } + else + { + picture_Release( p_picture ); + } } } - /* If we found ephemer subpictures, check if they have to be - * displayed or destroyed */ - while( p_ephemer != NULL ) + /* And use the scaled picture */ + if( p_region->p_private ) { - subpicture_t *p_tmp = p_ephemer; - p_ephemer = p_ephemer->p_next; - - if( p_tmp->i_start < ephemer_date ) - { - SpuHeapDeleteSubpicture( &p_sys->heap, p_tmp ); - } - else - { - SubpictureChain( &p_subpic, p_tmp ); - } + region_fmt = p_region->p_private->fmt; + p_region_picture = p_region->p_private->p_picture; } } - vlc_mutex_unlock( &p_sys->lock ); - return p_subpic; -} + /* Force cropping if requested */ + if( b_force_crop ) + { + int i_crop_x = spu_scale_w( p_sys->i_crop_x, scale_size ); + int i_crop_y = spu_scale_h( p_sys->i_crop_y, scale_size ); + int i_crop_width = spu_scale_w( p_sys->i_crop_width, scale_size ); + int i_crop_height= spu_scale_h( p_sys->i_crop_height,scale_size ); -/***************************************************************************** - * 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 */ + /* Find the intersection */ + if( i_crop_x + i_crop_width <= i_x_offset || + i_x_offset + (int)region_fmt.i_visible_width < i_crop_x || + i_crop_y + i_crop_height <= i_y_offset || + i_y_offset + (int)region_fmt.i_visible_height < i_crop_y ) + { + /* No intersection */ + region_fmt.i_visible_width = + region_fmt.i_visible_height = 0; + } + else + { + int i_x, i_y, i_x_end, i_y_end; + i_x = __MAX( i_crop_x, i_x_offset ); + i_y = __MAX( i_crop_y, i_y_offset ); + i_x_end = __MIN( i_crop_x + i_crop_width, + i_x_offset + (int)region_fmt.i_visible_width ); + i_y_end = __MIN( i_crop_y + i_crop_height, + i_y_offset + (int)region_fmt.i_visible_height ); - if( !b_locked ) - vlc_mutex_lock( &p_sys->lock ); + region_fmt.i_x_offset = i_x - i_x_offset; + region_fmt.i_y_offset = i_y - i_y_offset; + region_fmt.i_visible_width = i_x_end - i_x; + region_fmt.i_visible_height = i_y_end - i_y; - vlc_assert_locked( &p_sys->lock ); + i_x_offset = __MAX( i_x, 0 ); + i_y_offset = __MAX( i_y, 0 ); + } + } - for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ ) + /* Update the blender */ + 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 ) ) ) { - spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_subpic]; - subpicture_t *p_subpic = p_entry->p_subpicture; - - if( !p_subpic || p_subpic->i_channel != i_channel ) - continue; - - /* You cannot delete subpicture outside of spu_SortSubpictures */ - p_entry->b_reject = true; + msg_Err( p_spu, "blending %4.4s to %4.4s failed", + (char *)&p_sys->p_blend->fmt_in.video.i_chroma, + (char *)&p_sys->p_blend->fmt_out.video.i_chroma ); } - if( !b_locked ) - vlc_mutex_unlock( &p_sys->lock ); +exit: + if( b_rerender_text ) + { + /* Some forms of subtitles need to be re-rendered more than + * once, eg. karaoke. We therefore restore the region to its + * pre-rendered state, so the next time through everything is + * calculated again. + */ + if( p_region->p_picture ) + { + picture_Release( p_region->p_picture ); + p_region->p_picture = NULL; + } + if( p_region->p_private ) + { + SpuRegionPrivateDelete( p_region->p_private ); + p_region->p_private = NULL; + } + p_region->i_align &= ~SUBPICTURE_RENDERED; + } + if( b_restore_format ) + p_region->fmt = fmt_original; } -/***************************************************************************** - * spu_ControlDefault: default methods for the subpicture unit control. - *****************************************************************************/ -static int SpuControl( spu_t *p_spu, int i_query, va_list args ) +/** + * This function compares two 64 bits integers. + * It can be used by qsort. + */ +static int IntegerCmp( int64_t i0, int64_t i1 ) { - 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->lock ); - if( pi ) - *pi = p_sys->i_channel++; - vlc_mutex_unlock( &p_sys->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 i0 < i1 ? -1 : i0 > i1 ? 1 : 0; +} +/** + * This function compares 2 subpictures using the following properties + * (ordered by priority) + * 1. absolute positionning + * 2. start time + * 3. creation order (per channel) + * + * It can be used by qsort. + * + * XXX spu_RenderSubpictures depends heavily on this order. + */ +static int SubpictureCmp( const void *s0, const void *s1 ) +{ + subpicture_t *p_subpic0 = *(subpicture_t**)s0; + subpicture_t *p_subpic1 = *(subpicture_t**)s1; + int r; - return VLC_SUCCESS; + 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; } /***************************************************************************** @@ -1718,6 +1820,22 @@ static int CropCallback( vlc_object_t *p_object, char const *psz_var, return VLC_SUCCESS; } +/***************************************************************************** + * MarginCallback: called when requested subtitle position has changed * + *****************************************************************************/ + +static int MarginCallback( vlc_object_t *p_object, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + VLC_UNUSED( psz_var ); VLC_UNUSED( oldval ); VLC_UNUSED( p_object ); + spu_private_t *p_sys = ( spu_private_t* ) p_data; + + vlc_mutex_lock( &p_sys->lock ); + p_sys->i_margin = newval.i_int; + vlc_mutex_unlock( &p_sys->lock ); + return VLC_SUCCESS; +} + /***************************************************************************** * Buffers allocation callbacks for the filters *****************************************************************************/ @@ -1731,7 +1849,7 @@ static subpicture_t *sub_new_buffer( filter_t *p_filter ) { filter_owner_sys_t *p_sys = p_filter->p_owner; - subpicture_t *p_subpicture = subpicture_New(); + subpicture_t *p_subpicture = subpicture_New( NULL ); if( p_subpicture ) p_subpicture->i_channel = p_sys->i_channel; return p_subpicture; @@ -1745,7 +1863,7 @@ static void sub_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) static subpicture_t *spu_new_buffer( filter_t *p_filter ) { VLC_UNUSED(p_filter); - return subpicture_New(); + return subpicture_New( NULL ); } static void spu_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) { @@ -1758,8 +1876,7 @@ 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 ) { @@ -1779,7 +1896,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; @@ -1789,23 +1906,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 ); } -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->lock ); - filter_chain_Reset( p_sys->p_chain, NULL, NULL ); - spu_ParseChain( p_spu ); - vlc_mutex_unlock( &p_sys->lock ); - return VLC_SUCCESS; -} -