X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_subpictures.c;h=45d05414e16870e470c86ec4be329e3b608b38d7;hb=59117b28623d003c2bf3374bf551f126da4322dc;hp=e440967c9cdce5a6348d67ecf1b5bb26e1275abd;hpb=e87593bb6a622515e011370e52ccf426c92b02a8;p=vlc diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index e440967c9c..45d05414e1 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -30,17 +30,20 @@ # include "config.h" #endif +#include +#include + #include #include #include #include -#include +#include #include "../libvlc.h" #include "vout_internal.h" #include - -#include -#include +#include +#include +#include "../misc/subpicture.h" /***************************************************************************** * Local prototypes @@ -71,6 +74,7 @@ static void SpuHeapClean( spu_heap_t *p_heap ); struct spu_private_t { vlc_mutex_t lock; /* lock to protect all followings fields */ + vlc_object_t *p_input; spu_heap_t heap; @@ -88,21 +92,13 @@ struct spu_private_t /* Subpiture filters */ char *psz_chain_update; + vlc_mutex_t chain_lock; filter_chain_t *p_chain; /* */ mtime_t i_last_sort_date; }; -/* */ -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 { @@ -156,23 +152,19 @@ static void SpuRenderRegion( spu_t *, 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 MarginCallback( 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 ); /* Buffer allocation for SPU filter (blend, scale, ...) */ -static subpicture_t *spu_new_buffer( filter_t * ); -static void spu_del_buffer( filter_t *, subpicture_t * ); +struct filter_owner_sys_t +{ + spu_t *p_spu; + int i_channel; +}; +static int spu_get_attachments( filter_t *, + input_attachment_t ***, int * ); static picture_t *spu_new_video_buffer( filter_t * ); static void spu_del_video_buffer( filter_t *, picture_t * ); /* Buffer aloccation fir SUB filter */ -static int SubFilterCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); - static int SubFilterAllocationInit( filter_t *, void * ); static void SubFilterAllocationClean( filter_t * ); @@ -184,24 +176,25 @@ 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 */ @@ -214,12 +207,13 @@ spu_t *__spu_Create( vlc_object_t *p_this ) p_sys->p_scale = NULL; p_sys->p_scale_yuvp = NULL; - /* Register the default subpicture channel */ - p_sys->i_channel = 2; + p_sys->i_margin = var_InheritInteger( p_spu, "sub-margin" ); - vlc_object_attach( p_spu, p_this ); + /* Register the default subpicture channel */ + p_sys->i_channel = SPU_DEFAULT_CHANNEL + 1; p_sys->psz_chain_update = NULL; + vlc_mutex_init( &p_sys->chain_lock ); p_sys->p_chain = filter_chain_New( p_spu, "sub filter", false, SubFilterAllocationInit, SubFilterAllocationClean, @@ -235,28 +229,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. */ - /* NOTE position is initialized from "sub-margin" belonging to - input_thread_t in UpdateSPU() */ - p_sys->i_margin = 0; - //obsolete: 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 * @@ -266,8 +238,6 @@ 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 ) filter_DeleteBlend( p_sys->p_blend ); @@ -281,6 +251,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 */ @@ -297,30 +268,51 @@ void spu_Destroy( spu_t *p_spu ) * \param p_this the object in which to destroy the subpicture unit * \param b_attach to select attach or detach */ -void spu_Attach( spu_t *p_spu, vlc_object_t *p_this, bool b_attach ) +void spu_Attach( spu_t *p_spu, vlc_object_t *p_input, bool b_attach ) { - vlc_object_t *p_input; - - p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT ); - if( !p_input ) - return; - if( b_attach ) { - UpdateSPU( p_spu, VLC_OBJECT(p_input) ); + UpdateSPU( p_spu, p_input ); + var_Create( p_input, "highlight", VLC_VAR_BOOL ); var_AddCallback( p_input, "highlight", CropCallback, p_spu ); - var_AddCallback( p_input, "sub-margin", MarginCallback, p_spu->p ); - vlc_object_release( p_input ); + + vlc_mutex_lock( &p_spu->p->lock ); + p_spu->p->p_input = p_input; + + FilterRelease( p_spu->p->p_text ); + p_spu->p->p_text = NULL; + SpuRenderCreateAndLoadText( p_spu ); + + vlc_mutex_unlock( &p_spu->p->lock ); } else { - /* Delete callback */ + vlc_mutex_lock( &p_spu->p->lock ); + p_spu->p->p_input = NULL; + vlc_mutex_unlock( &p_spu->p->lock ); + + /* Delete callbacks */ var_DelCallback( p_input, "highlight", CropCallback, p_spu ); - var_DelCallback( p_input, "sub-margin", MarginCallback, p_spu->p ); - 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 * @@ -333,9 +325,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 ) @@ -386,17 +378,9 @@ void spu_RenderSubpictures( spu_t *p_spu, p_subpic != NULL; p_subpic = p_subpic->p_next ) { - if( p_subpic->pf_update_regions ) - { - video_format_t fmt_org = *p_fmt_dst; - fmt_org.i_width = - fmt_org.i_visible_width = i_source_video_width; - fmt_org.i_height = - fmt_org.i_visible_height = i_source_video_height; - - p_subpic->pf_update_regions( p_spu, p_subpic, &fmt_org, - p_subpic->b_subtitle ? render_subtitle_date : render_osd_date ); - } + subpicture_Update( p_subpic, + p_fmt_src, p_fmt_dst, + p_subpic->b_subtitle ? render_subtitle_date : render_osd_date ); /* */ if( p_subpic->b_subtitle ) @@ -476,16 +460,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 */ @@ -553,7 +529,6 @@ 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(); @@ -563,6 +538,7 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t render_subtitle_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 ); @@ -571,16 +547,37 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t render_subtitle_date, free( psz_chain_update ); } - /* Run subpicture filters */ filter_chain_SubFilter( p_sys->p_chain, render_osd_date ); + vlc_mutex_unlock( &p_sys->chain_lock ); vlc_mutex_lock( &p_sys->lock ); + /* Create a list of channels */ + int pi_channel[VOUT_MAX_SUBPICTURES]; + int i_channel_count = 0; + + for( int i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ ) + { + spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_index]; + if( !p_entry->p_subpicture || p_entry->b_reject ) + continue; + const int i_channel = p_entry->p_subpicture->i_channel; + int i; + for( i = 0; i < i_channel_count; i++ ) + { + if( pi_channel[i] == i_channel ) + break; + } + if( i_channel_count <= i ) + pi_channel[i_channel_count++] = i_channel; + } + /* We get an easily parsable chained list of subpictures which * ends with NULL since p_subpic was initialized to NULL. */ - for( i_channel = 0; i_channel < p_sys->i_channel; i_channel++ ) + for( int i = 0; i < i_channel_count; i++ ) { + const int i_channel = pi_channel[i]; subpicture_t *p_available_subpic[VOUT_MAX_SUBPICTURES]; bool pb_available_late[VOUT_MAX_SUBPICTURES]; int i_available = 0; @@ -706,171 +703,69 @@ void spu_OffsetSubtitleDate( spu_t *p_spu, mtime_t i_duration ) vlc_mutex_unlock( &p_sys->lock ); } -/***************************************************************************** - * subpicture_t allocation - *****************************************************************************/ -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_destroy = NULL; - p_subpic->p_sys = NULL; - - return p_subpic; -} - -void subpicture_Delete( subpicture_t *p_subpic ) +int spu_RegisterChannel( spu_t *p_spu ) { - 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 ); -} + spu_private_t *p_sys = p_spu->p; -static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic ) -{ - p_subpic->p_next = *pp_head; + vlc_mutex_lock( &p_sys->lock ); + int i_channel = p_sys->i_channel++; + vlc_mutex_unlock( &p_sys->lock ); - *pp_head = p_subpic; + return i_channel; } -subpicture_t *subpicture_NewFromPicture( vlc_object_t *p_obj, - picture_t *p_picture, vlc_fourcc_t i_chroma ) +void spu_ClearChannel( spu_t *p_spu, int i_channel ) { - /* */ - 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 ); + spu_private_t *p_sys = p_spu->p; - if( !p_pip ) - return NULL; + vlc_mutex_lock( &p_sys->lock ); - subpicture_t *p_subpic = subpicture_New(); - if( !p_subpic ) + for( int i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_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; + spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_subpic]; + subpicture_t *p_subpic = p_entry->p_subpicture; - fmt_out.i_aspect = 0; - fmt_out.i_sar_num = - fmt_out.i_sar_den = 0; + if( !p_subpic ) + continue; + if( p_subpic->i_channel != i_channel && ( i_channel != -1 || p_subpic->i_channel == SPU_DEFAULT_CHANNEL ) ) + continue; - 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 ); + /* You cannot delete subpicture outside of spu_SortSubpictures */ + p_entry->b_reject = true; } - return p_subpic; + + vlc_mutex_unlock( &p_sys->lock ); } -/***************************************************************************** - * subpicture_region_t allocation - *****************************************************************************/ -subpicture_region_t *subpicture_region_New( const video_format_t *p_fmt ) +void spu_ChangeFilters( spu_t *p_spu, const char *psz_filters ) { - subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) ); - if( !p_region ) - return NULL; + spu_private_t *p_sys = p_spu->p; - p_region->fmt = *p_fmt; - p_region->fmt.p_palette = NULL; - if( p_fmt->i_chroma == VLC_CODEC_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_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 ); - if( !p_region->p_picture ) - { - free( p_fmt->p_palette ); - free( p_region ); - return NULL; - } + vlc_mutex_lock( &p_sys->lock ); + + free( p_sys->psz_chain_update ); + p_sys->psz_chain_update = strdup( psz_filters ); - return p_region; + vlc_mutex_unlock( &p_sys->lock ); } -/* */ -void subpicture_region_Delete( subpicture_region_t *p_region ) +void spu_ChangeMargin( spu_t *p_spu, int i_margin ) { - if( !p_region ) - return; - - if( p_region->p_private ) - SpuRegionPrivateDelete( p_region->p_private ); - - if( p_region->p_picture ) - picture_Release( p_region->p_picture ); - - free( p_region->fmt.p_palette ); + spu_private_t *p_sys = p_spu->p; - 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 ); + vlc_mutex_lock( &p_sys->lock ); + p_sys->i_margin = i_margin; + vlc_mutex_unlock( &p_sys->lock ); } /* */ -void subpicture_region_ChainDelete( subpicture_region_t *p_head ) +static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic ) { - while( p_head ) - { - subpicture_region_t *p_next = p_head->p_next; - - subpicture_region_Delete( p_head ); + p_subpic->p_next = *pp_head; - p_head = p_next; - } + *pp_head = p_subpic; } - - /***************************************************************************** * heap managment *****************************************************************************/ @@ -936,38 +831,13 @@ static void SpuHeapClean( spu_heap_t *p_heap ) } } -static subpicture_region_private_t *SpuRegionPrivateNew( 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 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 ); -} - static void FilterRelease( filter_t *p_filter ) { if( p_filter->p_module ) module_unneed( p_filter, p_filter->p_module ); + if( p_filter->p_owner ) + free( p_filter->p_owner ); - vlc_object_detach( p_filter ); vlc_object_release( p_filter ); } @@ -983,6 +853,9 @@ static void SpuRenderCreateAndLoadText( spu_t *p_spu ) if( !p_text ) return; + p_text->p_owner = xmalloc( sizeof(*p_text->p_owner) ); + p_text->p_owner->p_spu = p_spu; + es_format_Init( &p_text->fmt_in, VIDEO_ES, 0 ); es_format_Init( &p_text->fmt_out, VIDEO_ES, 0 ); @@ -991,8 +864,7 @@ static void SpuRenderCreateAndLoadText( spu_t *p_spu ) p_text->fmt_out.video.i_height = p_text->fmt_out.video.i_visible_height = 32; - p_text->pf_sub_buffer_new = spu_new_buffer; - p_text->pf_sub_buffer_del = spu_del_buffer; + p_text->pf_get_attachments = spu_get_attachments; vlc_object_attach( p_text, p_spu ); @@ -1037,8 +909,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 ); @@ -1200,15 +1072,12 @@ static bool spu_area_overlap( spu_area_t a, spu_area_t b ) * Avoid area overlapping */ static void SpuAreaFixOverlap( spu_area_t *p_dst, - const spu_area_t *p_master, const spu_area_t *p_sub, int i_sub, int i_align ) { spu_area_t a = spu_area_scaled( *p_dst ); bool b_moved = false; bool b_ok; - assert( p_master->i_x == 0 && p_master->i_y == 0 ); - /* Check for overlap * XXX It is not fast O(n^2) but we should not have a lot of region */ do @@ -1225,8 +1094,6 @@ static void SpuAreaFixOverlap( spu_area_t *p_dst, { /* We go down */ int i_y = sub.i_y + sub.i_height; - if( i_y + a.i_height > p_master->i_height ) - break; a.i_y = i_y; b_moved = true; } @@ -1234,8 +1101,6 @@ static void SpuAreaFixOverlap( spu_area_t *p_dst, { /* We go up */ int i_y = sub.i_y - a.i_height; - if( i_y < 0 ) - break; a.i_y = i_y; b_moved = true; } @@ -1256,13 +1121,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; @@ -1301,23 +1184,6 @@ static void SpuRegionPlace( int *pi_x, int *pi_y, i_y = i_delta_y; } - /* Margin shifts all subpictures */ - if( i_margin_y != 0 ) - i_y -= i_margin_y; - - /* Clamp offset to not go out of the screen (when possible) */ - const int i_error_x = (i_x + p_region->fmt.i_width) - p_subpic->i_original_picture_width; - if( i_error_x > 0 ) - i_x -= i_error_x; - if( i_x < 0 ) - i_x = 0; - - const int i_error_y = (i_y + p_region->fmt.i_height) - p_subpic->i_original_picture_height; - if( i_error_y > 0 ) - i_y -= i_error_y; - if( i_y < 0 ) - i_y = 0; - *pi_x = i_x; *pi_y = i_y; } @@ -1403,7 +1269,7 @@ static void SpuRenderRegion( spu_t *p_spu, /* Place the picture * We compute the position in the rendered size */ SpuRegionPlace( &i_x_offset, &i_y_offset, - p_subpic, p_region, i_margin_y ); + p_subpic, p_region ); /* Save this position for subtitle overlap support * it is really important that there are given without scale_size applied */ @@ -1414,16 +1280,25 @@ static void SpuRenderRegion( spu_t *p_spu, /* Handle overlapping subtitles when possible */ if( p_subpic->b_subtitle && !p_subpic->b_absolute ) { - spu_area_t display = spu_area_create( 0, 0, p_fmt->i_width, p_fmt->i_height, - spu_scale_unit() ); - - SpuAreaFixOverlap( p_area, &display, p_subtitle_area, i_subtitle_area, + SpuAreaFixOverlap( p_area, p_subtitle_area, i_subtitle_area, p_region->i_align ); } + /* we copy the area: for the subtitle overlap support we want + * to only save the area without margin applied */ + spu_area_t restrained = *p_area; + + /* apply margin to subtitles and correct if they go over the picture edge */ + if( p_subpic->b_subtitle ) + restrained.i_y -= i_margin_y; + + spu_area_t display = spu_area_create( 0, 0, p_fmt->i_width, p_fmt->i_height, + spu_scale_unit() ); + SpuAreaFitInside( &restrained, &display ); + /* Fix the position for the current scale_size */ - i_x_offset = spu_scale_w( p_area->i_x, p_area->scale ); - i_y_offset = spu_scale_h( p_area->i_y, p_area->scale ); + i_x_offset = spu_scale_w( restrained.i_x, restrained.scale ); + i_y_offset = spu_scale_h( restrained.i_y, restrained.scale ); /* */ if( b_force_palette ) @@ -1480,7 +1355,7 @@ static void SpuRenderRegion( spu_t *p_spu, if( b_changed ) { - SpuRegionPrivateDelete( p_private ); + subpicture_region_private_Delete( p_private ); p_region->p_private = NULL; } } @@ -1538,13 +1413,13 @@ static void SpuRenderRegion( spu_t *p_spu, /* */ if( p_picture ) { - p_region->p_private = SpuRegionPrivateNew( &p_picture->format ); + p_region->p_private = subpicture_region_private_New( &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 ); + subpicture_region_private_Delete( p_region->p_private ); p_region->p_private = NULL; } } @@ -1629,7 +1504,7 @@ exit: } if( p_region->p_private ) { - SpuRegionPrivateDelete( p_region->p_private ); + subpicture_region_private_Delete( p_region->p_private ); p_region->p_private = NULL; } p_region->i_align &= ~SUBPICTURE_RENDERED; @@ -1673,67 +1548,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 *****************************************************************************/ @@ -1765,7 +1579,6 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) p_sys->i_crop_y = var_GetInteger( p_object, "y-start" ); p_sys->i_crop_width = var_GetInteger( p_object, "x-end" ) - p_sys->i_crop_x; p_sys->i_crop_height = var_GetInteger( p_object, "y-end" ) - p_sys->i_crop_y; - p_sys->i_margin = var_GetInteger( p_object, "sub-margin" ); if( var_Get( p_object, "menu-palette", &val ) == VLC_SUCCESS ) { @@ -1794,36 +1607,28 @@ 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 *****************************************************************************/ -struct filter_owner_sys_t -{ - spu_t *p_spu; - int i_channel; -}; +static int spu_get_attachments( filter_t *p_filter, + input_attachment_t ***ppp_attachment, + int *pi_attachment ) +{ + spu_t *p_spu = p_filter->p_owner->p_spu; + + int i_ret = VLC_EGENERIC; + if( p_spu->p->p_input ) + i_ret = input_Control( (input_thread_t*)p_spu->p->p_input, + INPUT_GET_ATTACHMENTS, + ppp_attachment, pi_attachment ); + return i_ret; +} static subpicture_t *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; @@ -1833,25 +1638,12 @@ static void sub_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) VLC_UNUSED( p_filter ); subpicture_Delete( p_subpic ); } - -static subpicture_t *spu_new_buffer( filter_t *p_filter ) -{ - VLC_UNUSED(p_filter); - return subpicture_New(); -} -static void spu_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) -{ - VLC_UNUSED(p_filter); - subpicture_Delete( p_subpic ); -} - static picture_t *spu_new_video_buffer( filter_t *p_filter ) { const video_format_t *p_fmt = &p_filter->fmt_out.video; VLC_UNUSED(p_filter); - return picture_New( p_fmt->i_chroma, - p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect ); + return picture_NewFromFormat( p_fmt ); } static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_picture ) { @@ -1871,7 +1663,7 @@ static int SubFilterAllocationInit( filter_t *p_filter, void *p_data ) p_filter->pf_sub_buffer_del = sub_del_buffer; p_filter->p_owner = p_sys; - spu_Control( p_spu, SPU_CHANNEL_REGISTER, &p_sys->i_channel ); + p_sys->i_channel = spu_RegisterChannel( p_spu ); p_sys->p_spu = p_spu; return VLC_SUCCESS; @@ -1881,24 +1673,7 @@ static void SubFilterAllocationClean( filter_t *p_filter ) { filter_owner_sys_t *p_sys = p_filter->p_owner; - SpuClearChannel( p_sys->p_spu, p_sys->i_channel ); + 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; -} -