X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_subpictures.c;h=123d4da3e18856a9d6149eeb0ddc8c1931586329;hb=4b9c63a36eded246ad9ef1ea0de0cf7b38d29ad9;hp=84ac9996fee7792978c0492e72e982dc478b59aa;hpb=174f75debc6ff4b0b3a7037bc21e7b77bfe2a9d8;p=vlc diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index 84ac9996fe..123d4da3e1 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -30,22 +30,24 @@ # include "config.h" #endif +#include +#include + #include #include #include #include -#include +#include #include "../libvlc.h" #include "vout_internal.h" - -#include -#include +#include /***************************************************************************** * Local prototypes *****************************************************************************/ + /* Number of simultaneous subpictures */ -#define VOUT_MAX_SUBPICTURES (VOUT_MAX_PICTURES) +#define VOUT_MAX_SUBPICTURES (__MAX(VOUT_MAX_PICTURES, SPU_MAX_PREPARE_TIME/5000)) /* */ typedef struct @@ -86,6 +88,7 @@ struct spu_private_t /* Subpiture filters */ char *psz_chain_update; + vlc_mutex_t chain_lock; filter_chain_t *p_chain; /* */ @@ -140,6 +143,10 @@ static bool spu_area_overlap( spu_area_t, spu_area_t ); #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 ); @@ -148,15 +155,14 @@ static void SpuRenderRegion( spu_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 ); + 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 ); +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 * ); @@ -165,39 +171,36 @@ 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 SubFilterCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); - static int SubFilterAllocationInit( filter_t *, void * ); static void SubFilterAllocationClean( filter_t * ); /* */ static void SpuRenderCreateAndLoadText( spu_t * ); static void SpuRenderCreateAndLoadScale( spu_t * ); -static void SpuRenderCreateBlend( spu_t *, vlc_fourcc_t i_chroma, int i_aspect ); 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 */ @@ -210,12 +213,13 @@ spu_t *__spu_Create( vlc_object_t *p_this ) 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, @@ -231,25 +235,6 @@ spu_t *__spu_Create( vlc_object_t *p_this ) 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 ); - var_TriggerCallback( p_spu, "sub-filter" ); - - return VLC_SUCCESS; -} - /** * Destroy the subpicture unit * @@ -259,10 +244,8 @@ void spu_Destroy( spu_t *p_spu ) { spu_private_t *p_sys = p_spu->p; - var_DelCallback( p_spu, "sub-filter", SubFilterCallback, p_spu ); - 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 ); @@ -274,6 +257,7 @@ 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 */ @@ -290,28 +274,44 @@ 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) ); + var_Create( p_input, "highlight", VLC_VAR_BOOL ); var_AddCallback( p_input, "highlight", CropCallback, p_spu ); - vlc_object_release( p_input ); + 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 ); } else { - /* Delete callback */ + /* Delete callbacks */ + var_DelCallback( p_input, "sub-margin", MarginCallback, p_spu->p ); var_DelCallback( p_input, "highlight", CropCallback, p_spu ); - vlc_object_release( p_input ); + var_Destroy( p_input, "highlight" ); } } +/** + * 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 * @@ -324,9 +324,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 ); + /* 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 ) @@ -350,13 +350,15 @@ void spu_DisplaySubpicture( spu_t *p_spu, subpicture_t *p_subpic ) 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, bool b_paused ) + const video_format_t *p_fmt_src, + mtime_t render_subtitle_date ) { spu_private_t *p_sys = p_spu->p; + const mtime_t render_osd_date = mdate(); + 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]; @@ -375,20 +377,9 @@ void spu_RenderSubpictures( spu_t *p_spu, p_subpic != NULL; p_subpic = p_subpic->p_next ) { - /* */ - if( !b_paused && p_subpic->pf_pre_render ) - p_subpic->pf_pre_render( p_spu, p_subpic, p_fmt_dst ); - - if( !b_paused && 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 ); - } + SubpictureUpdate( p_subpic, + p_fmt_src, p_fmt_dst, + p_subpic->b_subtitle ? render_subtitle_date : render_osd_date ); /* */ if( p_subpic->b_subtitle ) @@ -420,7 +411,7 @@ void spu_RenderSubpictures( spu_t *p_spu, /* Create the blending module */ if( !p_sys->p_blend ) - SpuRenderCreateBlend( p_spu, p_fmt_dst->i_chroma, p_fmt_dst->i_aspect ); + p_spu->p->p_blend = filter_NewBlend( VLC_OBJECT(p_spu), p_fmt_dst ); /* Process all subpictures and regions (in the right order) */ for( unsigned int i_index = 0; i_index < i_subpicture; i_index++ ) @@ -468,16 +459,8 @@ void spu_RenderSubpictures( spu_t *p_spu, 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; - } + 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 */ @@ -505,7 +488,8 @@ void spu_RenderSubpictures( spu_t *p_spu, /* */ SpuRenderRegion( p_spu, p_pic_dst, &area, p_subpic, p_region, scale, p_fmt_dst, - p_subtitle_area, i_subtitle_area ); + p_subtitle_area, i_subtitle_area, + p_subpic->b_subtitle ? render_subtitle_date : render_osd_date ); if( p_subpic->b_subtitle ) { @@ -540,12 +524,13 @@ void spu_RenderSubpictures( spu_t *p_spu, * 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 ) +subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t render_subtitle_date, + bool b_subtitle_only ) { spu_private_t *p_sys = p_spu->p; int i_channel; subpicture_t *p_subpic = NULL; + const mtime_t render_osd_date = mdate(); /* Update sub-filter chain */ vlc_mutex_lock( &p_sys->lock ); @@ -553,6 +538,7 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, p_sys->psz_chain_update = NULL; vlc_mutex_unlock( &p_sys->lock ); + vlc_mutex_lock( &p_sys->chain_lock ); if( psz_chain_update ) { filter_chain_Reset( p_sys->p_chain, NULL, NULL ); @@ -561,9 +547,9 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, free( psz_chain_update ); } - /* Run subpicture filters */ - filter_chain_SubFilter( p_sys->p_chain, display_date ); + filter_chain_SubFilter( p_sys->p_chain, render_osd_date ); + vlc_mutex_unlock( &p_sys->chain_lock ); vlc_mutex_lock( &p_sys->lock ); @@ -575,8 +561,11 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, bool pb_available_late[VOUT_MAX_SUBPICTURES]; int i_available = 0; - mtime_t start_date = display_date; - mtime_t ephemer_date = 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 */ @@ -599,25 +588,31 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, { continue; } - if( display_date && - display_date < p_current->i_start ) + 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; } - if( p_current->i_start > ephemer_date ) - ephemer_date = p_current->i_start; + 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 ) && - ( !p_current->b_subtitle || !b_paused ); /* XXX Assume that subtitle are pausable */ + b_stop_valid = !p_current->b_ephemer || p_current->i_stop > p_current->i_start; - b_late = b_stop_valid && p_current->i_stop <= display_date; + 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( !b_late && !p_current->b_ephemer ) + if( p_current->b_subtitle && !b_late && !p_current->b_ephemer ) start_date = p_current->i_start; /* */ @@ -638,20 +633,29 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, subpicture_t *p_current = p_available_subpic[i_index]; bool b_late = pb_available_late[i_index]; - if( ( b_late && p_current->i_stop <= __MAX( start_date, p_sys->i_last_sort_date ) ) || - ( p_current->b_ephemer && p_current->i_start < ephemer_date ) ) + 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 ) { - /* Destroy late and obsolete ephemer subpictures */ - SpuHeapDeleteSubpicture( &p_sys->heap, p_current ); + 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 = display_date; + p_sys->i_last_sort_date = render_subtitle_date; vlc_mutex_unlock( &p_sys->lock ); return p_subpic; @@ -678,10 +682,62 @@ void spu_OffsetSubtitleDate( spu_t *p_spu, mtime_t 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 ); +} + /***************************************************************************** * subpicture_t allocation *****************************************************************************/ -subpicture_t *subpicture_New( void ) +struct subpicture_private_t +{ + video_format_t src; + video_format_t dst; +}; + +subpicture_t *subpicture_New( const subpicture_updater_t *p_upd ) { subpicture_t *p_subpic = calloc( 1, sizeof(*p_subpic) ); if( !p_subpic ) @@ -693,10 +749,30 @@ subpicture_t *subpicture_New( void ) 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; + 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 ); + + p_subpic->updater = *p_upd; + p_subpic->p_private = p_private; + } + else + { + p_subpic->p_private = NULL; + + 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; } @@ -705,10 +781,10 @@ 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 ); - } + if( p_subpic->updater.pf_destroy ) + p_subpic->updater.pf_destroy( p_subpic ); + + free( p_subpic->p_private ); free( p_subpic ); } @@ -719,6 +795,85 @@ static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic ) *pp_head = p_subpic; } +subpicture_t *subpicture_NewFromPicture( vlc_object_t *p_obj, + picture_t *p_picture, vlc_fourcc_t i_chroma ) +{ + /* */ + video_format_t fmt_in = p_picture->format; + + /* */ + video_format_t fmt_out; + fmt_out = fmt_in; + fmt_out.i_chroma = i_chroma; + + /* */ + image_handler_t *p_image = image_HandlerCreate( p_obj ); + if( !p_image ) + return NULL; + + picture_t *p_pip = image_Convert( p_image, p_picture, &fmt_in, &fmt_out ); + + image_HandlerDelete( p_image ); + + if( !p_pip ) + return NULL; + + subpicture_t *p_subpic = subpicture_New( NULL ); + if( !p_subpic ) + { + picture_Release( p_pip ); + return NULL; + } + + p_subpic->i_original_picture_width = fmt_out.i_width; + p_subpic->i_original_picture_height = fmt_out.i_height; + + fmt_out.i_sar_num = + fmt_out.i_sar_den = 0; + + p_subpic->p_region = subpicture_region_New( &fmt_out ); + if( p_subpic->p_region ) + { + picture_Release( p_subpic->p_region->p_picture ); + p_subpic->p_region->p_picture = p_pip; + } + else + { + picture_Release( p_pip ); + } + return p_subpic; +} + +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( !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; + + subpicture_region_ChainDelete( p_subpicture->p_region ); + p_subpicture->p_region = NULL; + + 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 ); + + video_format_Copy( &p_private->src, p_fmt_src ); + video_format_Copy( &p_private->dst, p_fmt_dst ); +} + /***************************************************************************** * subpicture_region_t allocation *****************************************************************************/ @@ -746,11 +901,10 @@ subpicture_region_t *subpicture_region_New( const video_format_t *p_fmt ) if( p_fmt->i_chroma == VLC_CODEC_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 ); + p_region->p_picture = picture_NewFromFormat( p_fmt ); if( !p_region->p_picture ) { - free( p_fmt->p_palette ); + free( p_region->fmt.p_palette ); free( p_region ); return NULL; } @@ -890,66 +1044,9 @@ static void FilterRelease( filter_t *p_filter ) if( p_filter->p_module ) module_unneed( p_filter, p_filter->p_module ); - vlc_object_detach( p_filter ); vlc_object_release( p_filter ); } -static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_aspect ) -{ - filter_t *p_blend; - - assert( !p_spu->p->p_blend ); - - p_spu->p->p_blend = - p_blend = vlc_custom_create( p_spu, sizeof(filter_t), - VLC_OBJECT_GENERIC, "blend" ); - if( !p_blend ) - return; - - es_format_Init( &p_blend->fmt_in, VIDEO_ES, 0 ); - - 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; - - /* The blend module will be loaded when needed with the real - * input format */ - p_blend->p_module = NULL; - - /* */ - 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; - - assert( p_blend ); - - /* */ - 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; - } - - /* */ - p_blend->fmt_in.video = *p_in_fmt; - - /* */ - 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_blend->p_module ) - p_blend->p_module = module_need( p_blend, "video blending", NULL, false ); -} static void SpuRenderCreateAndLoadText( spu_t *p_spu ) { filter_t *p_text; @@ -1016,8 +1113,8 @@ 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", NULL, false ); @@ -1040,7 +1137,7 @@ static void SpuRenderCreateAndLoadScale( spu_t *p_spu ) 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; @@ -1069,7 +1166,7 @@ static void SpuRenderText( spu_t *p_spu, bool *pb_rerender_text, * 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_SetTime( p_text, "spu-elapsed", render_date ); var_SetBool( p_text, "text-rerender", false ); var_SetInteger( p_text, "scale", i_min_scale_ratio ); @@ -1179,15 +1276,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 @@ -1204,8 +1298,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; } @@ -1213,8 +1305,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; } @@ -1235,13 +1325,31 @@ static void SpuAreaFixOverlap( spu_area_t *p_dst, } +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; @@ -1280,23 +1388,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; } @@ -1332,7 +1423,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; @@ -1352,7 +1444,8 @@ static void SpuRenderRegion( spu_t *p_spu, 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 ... */ @@ -1380,7 +1473,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 */ @@ -1391,16 +1484,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 ) @@ -1579,19 +1681,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 ); } @@ -1654,67 +1752,6 @@ static int SubpictureCmp( const void *s0, const void *s1 ) return r; } -/***************************************************************************** - * 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 ) -{ - spu_private_t *p_sys = p_spu->p; - int i_subpic; /* subpicture index */ - - vlc_mutex_lock( &p_sys->lock ); - - for( 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 == DEFAULT_CHAN ) ) - continue; - - /* You cannot delete subpicture outside of spu_SortSubpictures */ - p_entry->b_reject = true; - } - - vlc_mutex_unlock( &p_sys->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->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 ); - break; - - default: - msg_Dbg( p_spu, "control query not supported" ); - return VLC_EGENERIC; - } - - return VLC_SUCCESS; -} - /***************************************************************************** * Object variables callbacks *****************************************************************************/ @@ -1774,6 +1811,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 *****************************************************************************/ @@ -1787,7 +1840,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; @@ -1801,7 +1854,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 ) { @@ -1814,8 +1867,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 ) { @@ -1835,7 +1887,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; @@ -1845,24 +1897,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 ); + 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(psz_var); - - vlc_mutex_lock( &p_sys->lock ); - - free( p_sys->psz_chain_update ); - p_sys->psz_chain_update = strdup( newval.psz_string ); - - vlc_mutex_unlock( &p_sys->lock ); - return VLC_SUCCESS; -} -