X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_subpictures.c;h=6434772c56e58473d76581829398310ecea5b95a;hb=398bac6ba1602e40aaa3a9cedaf2fdce608876f9;hp=84ac9996fee7792978c0492e72e982dc478b59aa;hpb=ec6a7b8ec1fc9f070d1d5242836b1d643f9f2dd8;p=vlc diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index 84ac9996fe..6434772c56 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -1,26 +1,26 @@ /***************************************************************************** * vout_subpictures.c : subpicture management functions ***************************************************************************** - * Copyright (C) 2000-2007 the VideoLAN team + * Copyright (C) 2000-2007 VLC authors and VideoLAN * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar * Gildas Bazin * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -30,1024 +30,240 @@ # include "config.h" #endif +#include +#include + #include +#include +#include #include -#include #include -#include +#include + #include "../libvlc.h" #include "vout_internal.h" - -#include -#include +#include "../misc/subpicture.h" /***************************************************************************** * 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 -{ - subpicture_t *p_subpicture; - bool b_reject; +typedef struct { + subpicture_t *subpicture; + bool reject; } spu_heap_entry_t; -typedef struct -{ - spu_heap_entry_t p_entry[VOUT_MAX_SUBPICTURES]; - +typedef struct { + spu_heap_entry_t entry[VOUT_MAX_SUBPICTURES]; } spu_heap_t; -static void SpuHeapInit( spu_heap_t * ); -static int SpuHeapPush( spu_heap_t *, subpicture_t * ); -static void SpuHeapDeleteAt( spu_heap_t *, int i_index ); -static int SpuHeapDeleteSubpicture( spu_heap_t *, subpicture_t * ); -static void SpuHeapClean( spu_heap_t *p_heap ); +struct spu_private_t { + vlc_mutex_t lock; /* lock to protect all followings fields */ + vlc_object_t *input; -struct spu_private_t -{ - vlc_mutex_t lock; /* lock to protect all followings fields */ - - spu_heap_t heap; + spu_heap_t heap; - int i_channel; /**< number of subpicture channels registered */ - filter_t *p_blend; /**< alpha blending module */ - filter_t *p_text; /**< text renderer module */ - filter_t *p_scale_yuvp; /**< scaling module for YUVP */ - filter_t *p_scale; /**< scaling module (all but YUVP) */ - bool b_force_crop; /**< force cropping of subpicture */ - int i_crop_x, i_crop_y, i_crop_width, i_crop_height; /**< cropping */ + int channel; /**< number of subpicture channels registered */ + filter_t *text; /**< text renderer module */ + filter_t *scale_yuvp; /**< scaling module for YUVP */ + filter_t *scale; /**< scaling module (all but YUVP) */ + bool force_crop; /**< force cropping of subpicture */ + struct { + int x; + int y; + int width; + int height; + } crop; /**< cropping */ - int i_margin; /**< force position of a subpicture */ - bool b_force_palette; /**< force palette of subpicture */ - uint8_t palette[4][4]; /**< forced palette */ + int margin; /**< force position of a subpicture */ + bool force_palette; /**< force palette of subpicture */ + uint8_t palette[4][4]; /**< forced palette */ /* Subpiture filters */ - char *psz_chain_update; - filter_chain_t *p_chain; + char *source_chain_update; + vlc_mutex_t source_chain_lock; + filter_chain_t *source_chain; + char *filter_chain_update; + vlc_mutex_t filter_chain_lock; + filter_chain_t *filter_chain; /* */ - mtime_t i_last_sort_date; -}; - -/* */ -struct subpicture_region_private_t -{ - video_format_t fmt; - picture_t *p_picture; + mtime_t last_sort_date; }; -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) -#if SUBPICTURE_RENDERED < SUBPICTURE_ALIGN_MASK -# error SUBPICTURE_RENDERED too low -#endif - -#define SCALE_UNIT (1000) - -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 ); - -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 ); - -/* Buffer allocation for SPU filter (blend, scale, ...) */ -static subpicture_t *spu_new_buffer( filter_t * ); -static void spu_del_buffer( filter_t *, subpicture_t * ); -static picture_t *spu_new_video_buffer( filter_t * ); -static void spu_del_video_buffer( filter_t *, picture_t * ); - -/* 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 - *****************************************************************************/ -/** - * 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 *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; - - /* Initialize spu fields */ - p_spu->pf_control = SpuControl; - p_spu->p = p_sys = (spu_private_t*)&p_spu[1]; - - /* Initialize private fields */ - vlc_mutex_init( &p_sys->lock ); - - SpuHeapInit( &p_sys->heap ); - - p_sys->p_blend = NULL; - p_sys->p_text = NULL; - p_sys->p_scale = NULL; - p_sys->p_scale_yuvp = NULL; - - /* Register the default subpicture channel */ - p_sys->i_channel = 2; - - vlc_object_attach( p_spu, p_this ); - - p_sys->psz_chain_update = NULL; - p_sys->p_chain = filter_chain_New( p_spu, "sub filter", false, - SubFilterAllocationInit, - SubFilterAllocationClean, - p_spu ); - - /* Load text and scale module */ - SpuRenderCreateAndLoadText( p_spu ); - SpuRenderCreateAndLoadScale( p_spu ); - - /* */ - p_sys->i_last_sort_date = -1; - - 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 - * - * \param p_this the parent object which destroys the subpicture unit - */ -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 ); - - if( p_sys->p_text ) - FilterRelease( p_sys->p_text ); - - if( p_sys->p_scale_yuvp ) - FilterRelease( p_sys->p_scale_yuvp ); - - if( p_sys->p_scale ) - FilterRelease( p_sys->p_scale ); - - filter_chain_Delete( p_sys->p_chain ); - free( p_sys->psz_chain_update ); - - /* Destroy all remaining subpictures */ - SpuHeapClean( &p_sys->heap ); - - vlc_mutex_destroy( &p_sys->lock ); - - vlc_object_release( p_spu ); -} - -/** - * Attach/Detach the SPU from any input - * - * \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 ) -{ - 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_AddCallback( p_input, "highlight", CropCallback, p_spu ); - vlc_object_release( p_input ); - } - else - { - /* Delete callback */ - var_DelCallback( p_input, "highlight", CropCallback, p_spu ); - vlc_object_release( p_input ); - } -} - -/** - * 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 - */ -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 ); - - /* p_private is for spu only and cannot be non NULL here */ - for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next ) - assert( r->p_private == NULL ); - - /* */ - vlc_mutex_lock( &p_sys->lock ); - if( SpuHeapPush( &p_sys->heap, p_subpic ) ) - { - vlc_mutex_unlock( &p_sys->lock ); - msg_Err( p_spu, "subpicture heap full" ); - subpicture_Delete( p_subpic ); - return; - } - vlc_mutex_unlock( &p_sys->lock ); -} - -/** - * This function renders all sub picture units in the list. - */ -void spu_RenderSubpictures( spu_t *p_spu, - picture_t *p_pic_dst, const video_format_t *p_fmt_dst, - subpicture_t *p_subpic_list, - const video_format_t *p_fmt_src, bool b_paused ) -{ - spu_private_t *p_sys = p_spu->p; - - const int i_source_video_width = p_fmt_src->i_width; - const int i_source_video_height = p_fmt_src->i_height; - const mtime_t i_current_date = mdate(); - - unsigned int i_subpicture; - subpicture_t *pp_subpicture[VOUT_MAX_SUBPICTURES]; - - unsigned int i_subtitle_region_count; - spu_area_t p_subtitle_area_buffer[VOUT_MAX_SUBPICTURES]; - spu_area_t *p_subtitle_area; - int i_subtitle_area; - - vlc_mutex_lock( &p_sys->lock ); - - /* 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( !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 ); - } - - /* */ - if( p_subpic->b_subtitle ) - { - for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next ) - i_subtitle_region_count++; - } - - /* */ - pp_subpicture[i_subpicture++] = p_subpic; - } - - /* Be sure we have at least 1 picture to process */ - if( i_subpicture <= 0 ) - { - vlc_mutex_unlock( &p_sys->lock ); - return; - } - - /* Now order subpicture array - * XXX The order is *really* important for overlap subtitles positionning */ - qsort( pp_subpicture, i_subpicture, sizeof(*pp_subpicture), SubpictureCmp ); - - /* Allocate area array for subtitle overlap */ - i_subtitle_area = 0; - p_subtitle_area = p_subtitle_area_buffer; - if( i_subtitle_region_count > sizeof(p_subtitle_area_buffer)/sizeof(*p_subtitle_area_buffer) ) - p_subtitle_area = calloc( i_subtitle_region_count, sizeof(*p_subtitle_area) ); - - /* Create the blending module */ - if( !p_sys->p_blend ) - SpuRenderCreateBlend( p_spu, p_fmt_dst->i_chroma, p_fmt_dst->i_aspect ); - - /* Process all subpictures and regions (in the right order) */ - for( unsigned int i_index = 0; i_index < i_subpicture; i_index++ ) - { - subpicture_t *p_subpic = pp_subpicture[i_index]; - subpicture_region_t *p_region; - - if( !p_subpic->p_region ) - continue; - - /* FIXME when possible use a better rendering size than source size - * (max of display size and source size for example) FIXME */ - int i_render_width = p_subpic->i_original_picture_width; - int i_render_height = p_subpic->i_original_picture_height; - if( !i_render_width || !i_render_height ) - { - if( i_render_width != 0 || i_render_height != 0 ) - msg_Err( p_spu, "unsupported original picture size %dx%d", - i_render_width, i_render_height ); - - p_subpic->i_original_picture_width = i_render_width = i_source_video_width; - p_subpic->i_original_picture_height = i_render_height = i_source_video_height; - } - - if( p_sys->p_text ) - { - p_sys->p_text->fmt_out.video.i_width = - p_sys->p_text->fmt_out.video.i_visible_width = i_render_width; - - p_sys->p_text->fmt_out.video.i_height = - p_sys->p_text->fmt_out.video.i_visible_height = i_render_height; - } - - /* Compute scaling from picture to source size */ - spu_scale_t scale = spu_scale_createq( i_source_video_width, i_render_width, - i_source_video_height, i_render_height ); - - /* Update scaling from source size to display size(p_fmt_dst) */ - scale.w = scale.w * p_fmt_dst->i_width / i_source_video_width; - scale.h = scale.h * p_fmt_dst->i_height / i_source_video_height; - - /* Set default subpicture aspect ratio - * FIXME if we only handle 1 aspect ratio per picture, why is it set per - * region ? */ - p_region = p_subpic->p_region; - if( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den ) - { - if( p_region->fmt.i_aspect != 0 ) - { - p_region->fmt.i_sar_den = p_region->fmt.i_aspect; - p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR; - } - else - { - p_region->fmt.i_sar_den = p_fmt_dst->i_sar_den; - p_region->fmt.i_sar_num = p_fmt_dst->i_sar_num; - } - } - - /* Take care of the aspect ratio */ - if( p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den != - p_region->fmt.i_sar_den * p_fmt_dst->i_sar_num ) - { - /* FIXME FIXME what about region->i_x/i_y ? */ - scale.w = scale.w * - (int64_t)p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den / - p_region->fmt.i_sar_den / p_fmt_dst->i_sar_num; - } - - /* Render all regions - * We always transform non absolute subtitle into absolute one on the - * first rendering to allow good subtitle overlap support. - */ - for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next ) - { - spu_area_t area; - - /* Check scale validity */ - if( scale.w <= 0 || scale.h <= 0 ) - continue; - - /* */ - SpuRenderRegion( p_spu, p_pic_dst, &area, - p_subpic, p_region, scale, p_fmt_dst, - p_subtitle_area, i_subtitle_area ); - - if( p_subpic->b_subtitle ) - { - area = spu_area_unscaled( area, scale ); - if( !p_subpic->b_absolute && area.i_width > 0 && area.i_height > 0 ) - { - p_region->i_x = area.i_x; - p_region->i_y = area.i_y; - } - if( p_subtitle_area ) - p_subtitle_area[i_subtitle_area++] = area; - } - } - if( p_subpic->b_subtitle ) - p_subpic->b_absolute = true; - } - - /* */ - if( p_subtitle_area != p_subtitle_area_buffer ) - free( p_subtitle_area ); - - vlc_mutex_unlock( &p_sys->lock ); -} - -/***************************************************************************** - * 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 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; - - /* Update sub-filter chain */ - vlc_mutex_lock( &p_sys->lock ); - char *psz_chain_update = p_sys->psz_chain_update; - p_sys->psz_chain_update = NULL; - vlc_mutex_unlock( &p_sys->lock ); - - if( psz_chain_update ) - { - filter_chain_Reset( p_sys->p_chain, NULL, NULL ); - - filter_chain_AppendFromString( p_spu->p->p_chain, psz_chain_update ); - - free( psz_chain_update ); - } - - /* Run subpicture filters */ - filter_chain_SubFilter( p_sys->p_chain, display_date ); - - 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++ ) - { - subpicture_t *p_available_subpic[VOUT_MAX_SUBPICTURES]; - bool pb_available_late[VOUT_MAX_SUBPICTURES]; - int i_available = 0; - - mtime_t start_date = display_date; - mtime_t ephemer_date = 0; - int i_index; - - /* Select available pictures */ - for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ ) - { - spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_index]; - subpicture_t *p_current = p_entry->p_subpicture; - bool b_stop_valid; - bool b_late; - - if( !p_current || p_entry->b_reject ) - { - if( p_entry->b_reject ) - SpuHeapDeleteAt( &p_sys->heap, i_index ); - continue; - } - - if( p_current->i_channel != i_channel || - ( b_subtitle_only && !p_current->b_subtitle ) ) - { - continue; - } - if( display_date && - display_date < p_current->i_start ) - { - /* Too early, come back next monday */ - continue; - } - - if( p_current->i_start > ephemer_date ) - ephemer_date = p_current->i_start; - - 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_late = b_stop_valid && p_current->i_stop <= display_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 ) - 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]; - - 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 ) ) - { - /* Destroy late and obsolete ephemer subpictures */ - SpuHeapDeleteSubpicture( &p_sys->heap, p_current ); - } - else - { - SubpictureChain( &p_subpic, p_current ); - } - } - } - - p_sys->i_last_sort_date = display_date; - vlc_mutex_unlock( &p_sys->lock ); - - return p_subpic; -} - -void spu_OffsetSubtitleDate( spu_t *p_spu, mtime_t i_duration ) -{ - spu_private_t *p_sys = p_spu->p; - - vlc_mutex_lock( &p_sys->lock ); - for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) - { - spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i]; - subpicture_t *p_current = p_entry->p_subpicture; - - if( p_current && p_current->b_subtitle ) - { - if( p_current->i_start > 0 ) - p_current->i_start += i_duration; - if( p_current->i_stop > 0 ) - p_current->i_stop += i_duration; - } - } - vlc_mutex_unlock( &p_sys->lock ); -} - -/***************************************************************************** - * 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_render = NULL; - p_subpic->pf_destroy = NULL; - p_subpic->p_sys = NULL; - - return p_subpic; -} - -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 SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic ) -{ - p_subpic->p_next = *pp_head; - - *pp_head = p_subpic; -} - -/***************************************************************************** - * subpicture_region_t allocation - *****************************************************************************/ -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_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; - } - - return p_region; -} - -/* */ -void subpicture_region_Delete( subpicture_region_t *p_region ) -{ - 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 ); - - 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 ); -} - -/* */ -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; - } -} - - /***************************************************************************** * heap managment *****************************************************************************/ -static void SpuHeapInit( spu_heap_t *p_heap ) +static void SpuHeapInit(spu_heap_t *heap) { - for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) - { - spu_heap_entry_t *e = &p_heap->p_entry[i]; + for (int i = 0; i < VOUT_MAX_SUBPICTURES; i++) { + spu_heap_entry_t *e = &heap->entry[i]; - e->p_subpicture = NULL; - e->b_reject = false; + e->subpicture = NULL; + e->reject = false; } } -static int SpuHeapPush( spu_heap_t *p_heap, subpicture_t *p_subpic ) +static int SpuHeapPush(spu_heap_t *heap, subpicture_t *subpic) { - for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) - { - spu_heap_entry_t *e = &p_heap->p_entry[i]; + for (int i = 0; i < VOUT_MAX_SUBPICTURES; i++) { + spu_heap_entry_t *e = &heap->entry[i]; - if( e->p_subpicture ) + if (e->subpicture) continue; - e->p_subpicture = p_subpic; - e->b_reject = false; + e->subpicture = subpic; + e->reject = false; return VLC_SUCCESS; } return VLC_EGENERIC; } -static void SpuHeapDeleteAt( spu_heap_t *p_heap, int i_index ) +static void SpuHeapDeleteAt(spu_heap_t *heap, int index) { - spu_heap_entry_t *e = &p_heap->p_entry[i_index]; + spu_heap_entry_t *e = &heap->entry[index]; - if( e->p_subpicture ) - subpicture_Delete( e->p_subpicture ); + if (e->subpicture) + subpicture_Delete(e->subpicture); - e->p_subpicture = NULL; + e->subpicture = NULL; } -static int SpuHeapDeleteSubpicture( spu_heap_t *p_heap, subpicture_t *p_subpic ) +static int SpuHeapDeleteSubpicture(spu_heap_t *heap, subpicture_t *subpic) { - for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) - { - spu_heap_entry_t *e = &p_heap->p_entry[i]; + for (int i = 0; i < VOUT_MAX_SUBPICTURES; i++) { + spu_heap_entry_t *e = &heap->entry[i]; - if( e->p_subpicture != p_subpic ) + if (e->subpicture != subpic) continue; - SpuHeapDeleteAt( p_heap, i ); + SpuHeapDeleteAt(heap, i); return VLC_SUCCESS; } return VLC_EGENERIC; } -static void SpuHeapClean( spu_heap_t *p_heap ) +static void SpuHeapClean(spu_heap_t *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 ); + for (int i = 0; i < VOUT_MAX_SUBPICTURES; i++) { + spu_heap_entry_t *e = &heap->entry[i]; + if (e->subpicture) + subpicture_Delete(e->subpicture); } } -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 ); -} +struct filter_owner_sys_t { + spu_t *spu; + int channel; +}; -static void FilterRelease( filter_t *p_filter ) +static void FilterRelease(filter_t *filter) { - if( p_filter->p_module ) - module_unneed( p_filter, p_filter->p_module ); + if (filter->p_module) + module_unneed(filter, filter->p_module); + if (filter->p_owner) + free(filter->p_owner); - vlc_object_detach( p_filter ); - vlc_object_release( p_filter ); + vlc_object_release(filter); } -static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_aspect ) +static picture_t *spu_new_video_buffer(filter_t *filter) { - 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; + const video_format_t *fmt = &filter->fmt_out.video; - /* */ - vlc_object_attach( p_blend, p_spu ); + VLC_UNUSED(filter); + return picture_NewFromFormat(fmt); } -static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_height, - const video_format_t *p_in_fmt ) +static void spu_del_video_buffer(filter_t *filter, picture_t *picture) { - 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 ); + VLC_UNUSED(filter); + picture_Release(picture); } -static void SpuRenderCreateAndLoadText( spu_t *p_spu ) -{ - filter_t *p_text; - assert( !p_spu->p->p_text ); +static int spu_get_attachments(filter_t *filter, + input_attachment_t ***attachment_ptr, + int *attachment_count) +{ + spu_t *spu = filter->p_owner->spu; - p_spu->p->p_text = - p_text = vlc_custom_create( p_spu, sizeof(filter_t), - VLC_OBJECT_GENERIC, "spu text" ); - if( !p_text ) - return; + int ret = VLC_EGENERIC; + if (spu->p->input) + ret = input_Control((input_thread_t*)spu->p->input, + INPUT_GET_ATTACHMENTS, + attachment_ptr, attachment_count); + return ret; +} - es_format_Init( &p_text->fmt_in, VIDEO_ES, 0 ); +static filter_t *SpuRenderCreateAndLoadText(spu_t *spu) +{ + filter_t *text = vlc_custom_create(spu, sizeof(*text), "spu text"); + if (!text) + return NULL; - 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; + text->p_owner = xmalloc(sizeof(*text->p_owner)); + text->p_owner->spu = spu; - p_text->pf_sub_buffer_new = spu_new_buffer; - p_text->pf_sub_buffer_del = spu_del_buffer; + es_format_Init(&text->fmt_in, VIDEO_ES, 0); - vlc_object_attach( p_text, p_spu ); + es_format_Init(&text->fmt_out, VIDEO_ES, 0); + text->fmt_out.video.i_width = + text->fmt_out.video.i_visible_width = 32; + text->fmt_out.video.i_height = + text->fmt_out.video.i_visible_height = 32; - /* 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 ); + text->pf_get_attachments = spu_get_attachments; - if( !p_text->p_module ) - p_text->p_module = module_need( p_text, "text renderer", NULL, false ); + text->p_module = module_need(text, "text renderer", "$text-renderer", false); /* Create a few variables used for enhanced text rendering */ - var_Create( p_text, "spu-duration", VLC_VAR_TIME ); - var_Create( p_text, "spu-elapsed", VLC_VAR_TIME ); - var_Create( p_text, "text-rerender", VLC_VAR_BOOL ); - var_Create( p_text, "scale", VLC_VAR_INTEGER ); + var_Create(text, "spu-elapsed", VLC_VAR_TIME); + var_Create(text, "text-rerender", VLC_VAR_BOOL); + + return text; } -static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, - vlc_fourcc_t i_src_chroma, vlc_fourcc_t i_dst_chroma, - bool b_resize ) +static filter_t *SpuRenderCreateAndLoadScale(vlc_object_t *object, + vlc_fourcc_t src_chroma, + vlc_fourcc_t dst_chroma, + bool require_resize) { - filter_t *p_scale; - - p_scale = vlc_custom_create( p_obj, sizeof(filter_t), - VLC_OBJECT_GENERIC, "scale" ); - if( !p_scale ) + filter_t *scale = vlc_custom_create(object, sizeof(*scale), "scale"); + if (!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; + es_format_Init(&scale->fmt_in, VIDEO_ES, 0); + scale->fmt_in.video.i_chroma = src_chroma; + scale->fmt_in.video.i_width = + scale->fmt_in.video.i_height = 32; - 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; + es_format_Init(&scale->fmt_out, VIDEO_ES, 0); + scale->fmt_out.video.i_chroma = dst_chroma; + scale->fmt_out.video.i_width = + scale->fmt_out.video.i_height = require_resize ? 16 : 32; - p_scale->pf_vout_buffer_new = spu_new_video_buffer; - p_scale->pf_vout_buffer_del = spu_del_video_buffer; + scale->pf_video_buffer_new = spu_new_video_buffer; + 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 ); + scale->p_module = module_need(scale, "video filter2", NULL, false); - 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 ); + return scale; } -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 ) +static void SpuRenderText(spu_t *spu, bool *rerender_text, + subpicture_region_t *region, + const vlc_fourcc_t *chroma_list, + mtime_t elapsed_time) { - filter_t *p_text = p_spu->p->p_text; + filter_t *text = spu->p->text; - assert( p_region->fmt.i_chroma == VLC_CODEC_TEXT ); + assert(region->fmt.i_chroma == VLC_CODEC_TEXT); - if( !p_text || !p_text->p_module ) - goto exit; + if (!text || !text->p_module) + return; /* Setup 3 variables which can be used to render * time-dependent text (and effects). The first indicates @@ -1068,59 +284,57 @@ static void SpuRenderText( spu_t *p_spu, bool *pb_rerender_text, * least show up on screen, but the effect won't change * the text over time. */ - 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_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 ); - } - *pb_rerender_text = var_GetBool( p_text, "text-rerender" ); - -exit: - p_region->i_align |= SUBPICTURE_RENDERED; + var_SetTime(text, "spu-elapsed", elapsed_time); + var_SetBool(text, "text-rerender", false); + + if (text->pf_render_html && region->psz_html) + text->pf_render_html(text, region, region, chroma_list); + else if (text->pf_render_text) + text->pf_render_text(text, region, region, chroma_list); + *rerender_text = var_GetBool(text, "text-rerender"); } /** * A few scale functions helpers. */ -static spu_scale_t spu_scale_create( int w, int h ) + +#define SCALE_UNIT (1000) +typedef struct { + int w; + int h; +} spu_scale_t; + +static spu_scale_t spu_scale_create(int w, int h) { spu_scale_t s = { .w = w, .h = h }; - if( s.w <= 0 ) + if (s.w <= 0) s.w = SCALE_UNIT; - if( s.h <= 0 ) + if (s.h <= 0) s.h = SCALE_UNIT; return s; } -static spu_scale_t spu_scale_unit( void ) +static spu_scale_t spu_scale_unit(void) { - return spu_scale_create( SCALE_UNIT, SCALE_UNIT ); + return spu_scale_create(SCALE_UNIT, SCALE_UNIT); } -static spu_scale_t spu_scale_createq( int wn, int wd, int hn, int hd ) +static spu_scale_t spu_scale_createq(int64_t wn, int64_t wd, int64_t hn, int64_t hd) { - return spu_scale_create( wn * SCALE_UNIT / wd, - hn * SCALE_UNIT / 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 ) +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 ) +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 ) +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 ) +static int spu_invscale_h(int v, const spu_scale_t s) { return v * SCALE_UNIT / s.h; } @@ -1128,591 +342,753 @@ static int spu_invscale_h( int v, const spu_scale_t s ) /** * A few area functions helpers */ -static spu_area_t spu_area_create( int x, int y, int w, int h, spu_scale_t s ) +typedef struct { + int x; + int y; + int width; + int height; + + spu_scale_t scale; +} spu_area_t; + +static spu_area_t spu_area_create(int x, int y, int w, int h, spu_scale_t s) { - spu_area_t a = { .i_x = x, .i_y = y, .i_width = w, .i_height = h, .scale = s }; + spu_area_t a = { .x = x, .y = y, .width = w, .height = h, .scale = s }; return a; } -static spu_area_t spu_area_scaled( spu_area_t a ) +static spu_area_t spu_area_scaled(spu_area_t a) { - if( a.scale.w == SCALE_UNIT && a.scale.h == SCALE_UNIT ) + if (a.scale.w == SCALE_UNIT && a.scale.h == SCALE_UNIT) return a; - 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.x = spu_scale_w(a.x, a.scale); + a.y = spu_scale_h(a.y, a.scale); + a.width = spu_scale_w(a.width, a.scale); + a.height = spu_scale_h(a.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 ) +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 ) + if (a.scale.w == s.w && a.scale.h == s.h) return a; - a = spu_area_scaled( 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.x = spu_invscale_w(a.x, s); + a.y = spu_invscale_h(a.y, s); + a.width = spu_invscale_w(a.width, s); + a.height = spu_invscale_h(a.height, s); a.scale = s; return a; } -static bool spu_area_overlap( spu_area_t a, spu_area_t b ) +static bool spu_area_overlap(spu_area_t a, spu_area_t b) { - const int i_dx = 0; - const int i_dy = 0; + const int dx = 0; + const int dy = 0; - a = spu_area_scaled( a ); - b = spu_area_scaled( b ); + 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 ); + return __MAX(a.x - dx, b.x) < __MIN(a.x + a.width + dx, b.x + b.width ) && + __MAX(a.y - dy, b.y) < __MIN(a.y + a.height + dy, b.y + b.height); } /** * 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 ) +static void SpuAreaFixOverlap(spu_area_t *dst, + const spu_area_t *sub_array, int sub_count, int 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 ); + spu_area_t a = spu_area_scaled(*dst); + bool is_moved = false; + bool is_ok; /* 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] ); - - if( !spu_area_overlap( a, sub ) ) + do { + is_ok = true; + for (int i = 0; i < sub_count; i++) { + spu_area_t sub = spu_area_scaled(sub_array[i]); + + if (!spu_area_overlap(a, sub)) continue; - if( i_align & SUBPICTURE_ALIGN_TOP ) - { + if (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 ) - { + int i_y = sub.y + sub.height; + a.y = i_y; + is_moved = true; + } else if (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 - { + int i_y = sub.y - a.height; + a.y = i_y; + is_moved = true; + } else { /* TODO what to do in this case? */ - //fprintf( stderr, "Overlap with unsupported alignment\n" ); + //fprintf(stderr, "Overlap with unsupported alignment\n"); break; } - b_ok = false; + is_ok = false; break; } - } while( !b_ok ); + } while (!is_ok); + + if (is_moved) + *dst = spu_area_unscaled(a, dst->scale); +} + + +static void SpuAreaFitInside(spu_area_t *area, const spu_area_t *boundary) +{ + spu_area_t a = spu_area_scaled(*area); + + const int i_error_x = (a.x + a.width) - boundary->width; + if (i_error_x > 0) + a.x -= i_error_x; + if (a.x < 0) + a.x = 0; + + const int i_error_y = (a.y + a.height) - boundary->height; + if (i_error_y > 0) + a.y -= i_error_y; + if (a.y < 0) + a.y = 0; + + *area = spu_area_unscaled(a, area->scale); +} + +/** + * Place a region + */ +static void SpuRegionPlace(int *x, int *y, + const subpicture_t *subpic, + const subpicture_region_t *region) +{ + assert(region->i_x != INT_MAX && region->i_y != INT_MAX); + if (subpic->b_absolute) { + *x = region->i_x; + *y = region->i_y; + } else { + if (region->i_align & SUBPICTURE_ALIGN_TOP) + *y = region->i_y; + else if (region->i_align & SUBPICTURE_ALIGN_BOTTOM) + *y = subpic->i_original_picture_height - region->fmt.i_height - region->i_y; + else + *y = subpic->i_original_picture_height / 2 - region->fmt.i_height / 2; + + if (region->i_align & SUBPICTURE_ALIGN_LEFT) + *x = region->i_x; + else if (region->i_align & SUBPICTURE_ALIGN_RIGHT) + *x = subpic->i_original_picture_width - region->fmt.i_width - region->i_x; + else + *x = subpic->i_original_picture_width / 2 - region->fmt.i_width / 2; + } +} + +/** + * This function compares two 64 bits integers. + * It can be used by qsort. + */ +static int IntegerCmp(int64_t i0, int64_t i1) +{ + return i0 < i1 ? -1 : i0 > i1 ? 1 : 0; +} +/** + * This function compares 2 subpictures using the following properties + * (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 *subpic0 = *(subpicture_t**)s0; + subpicture_t *subpic1 = *(subpicture_t**)s1; + int r; + + r = IntegerCmp(!subpic0->b_absolute, !subpic1->b_absolute); + if (!r) + r = IntegerCmp(subpic0->i_start, subpic1->i_start); + if (!r) + r = IntegerCmp(subpic0->i_channel, subpic1->i_channel); + if (!r) + r = IntegerCmp(subpic0->i_order, subpic1->i_order); + return r; +} + +/***************************************************************************** + * SpuSelectSubpictures: 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 SpuSelectSubpictures(spu_t *spu, + unsigned int *subpicture_count, + subpicture_t **subpicture_array, + mtime_t render_subtitle_date, + mtime_t render_osd_date, + bool ignore_osd) +{ + spu_private_t *sys = spu->p; + + /* */ + *subpicture_count = 0; + + /* Create a list of channels */ + int channel[VOUT_MAX_SUBPICTURES]; + int channel_count = 0; + + for (int index = 0; index < VOUT_MAX_SUBPICTURES; index++) { + spu_heap_entry_t *entry = &sys->heap.entry[index]; + if (!entry->subpicture || entry->reject) + continue; + const int i_channel = entry->subpicture->i_channel; + int i; + for (i = 0; i < channel_count; i++) { + if (channel[i] == i_channel) + break; + } + if (channel_count <= i) + channel[channel_count++] = i_channel; + } + + /* Fill up the subpicture_array arrays with relevent pictures */ + for (int i = 0; i < channel_count; i++) { + subpicture_t *available_subpic[VOUT_MAX_SUBPICTURES]; + bool is_available_late[VOUT_MAX_SUBPICTURES]; + int available_count = 0; + + mtime_t start_date = render_subtitle_date; + mtime_t ephemer_subtitle_date = 0; + mtime_t ephemer_osd_date = 0; + int64_t ephemer_subtitle_order = INT64_MIN; + int64_t ephemer_system_order = INT64_MIN; + + /* Select available pictures */ + for (int index = 0; index < VOUT_MAX_SUBPICTURES; index++) { + spu_heap_entry_t *entry = &sys->heap.entry[index]; + subpicture_t *current = entry->subpicture; + bool is_stop_valid; + bool is_late; + + if (!current || entry->reject) { + if (entry->reject) + SpuHeapDeleteAt(&sys->heap, index); + continue; + } + + if (current->i_channel != channel[i] || + (ignore_osd && !current->b_subtitle)) + continue; + + const mtime_t render_date = current->b_subtitle ? render_subtitle_date : render_osd_date; + if (render_date && + render_date < current->i_start) { + /* Too early, come back next monday */ + continue; + } + + mtime_t *ephemer_date_ptr = current->b_subtitle ? &ephemer_subtitle_date : &ephemer_osd_date; + int64_t *ephemer_order_ptr = current->b_subtitle ? &ephemer_subtitle_order : &ephemer_system_order; + if (current->i_start >= *ephemer_date_ptr) { + *ephemer_date_ptr = current->i_start; + if (current->i_order > *ephemer_order_ptr) + *ephemer_order_ptr = current->i_order; + } - if( b_moved ) - *p_dst = spu_area_unscaled( a, p_dst->scale ); -} + is_stop_valid = !current->b_ephemer || current->i_stop > current->i_start; + is_late = is_stop_valid && current->i_stop <= render_date; -/** - * 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 int i_delta_x = p_region->i_x; - const int i_delta_y = p_region->i_y; - int i_x, i_y; - - 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 - { - i_y = p_subpic->i_original_picture_height / 2 - p_region->fmt.i_height / 2; - } + /* 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 (current->i_start) */ + if (current->b_subtitle && !is_late && !current->b_ephemer) + start_date = current->i_start; - 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; - } + /* */ + available_subpic[available_count] = current; + is_available_late[available_count] = is_late; + available_count++; + } - if( p_subpic->b_absolute ) - { - i_x = i_delta_x; - i_y = i_delta_y; - } + /* Only forced old picture display at the transition */ + if (start_date < sys->last_sort_date) + start_date = sys->last_sort_date; + if (start_date <= 0) + start_date = INT64_MAX; - /* 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; -} + /* Select pictures to be displayed */ + for (int index = 0; index < available_count; index++) { + subpicture_t *current = available_subpic[index]; + bool is_late = is_available_late[index]; + + const mtime_t stop_date = current->b_subtitle ? __MAX(start_date, sys->last_sort_date) : render_osd_date; + const mtime_t ephemer_date = current->b_subtitle ? ephemer_subtitle_date : ephemer_osd_date; + const int64_t ephemer_order = current->b_subtitle ? ephemer_subtitle_order : ephemer_system_order; + + /* Destroy late and obsolete ephemer subpictures */ + bool is_rejeted = is_late && current->i_stop <= stop_date; + if (current->b_ephemer) { + if (current->i_start < ephemer_date) + is_rejeted = true; + else if (current->i_start == ephemer_date && + current->i_order < ephemer_order) + is_rejeted = true; + } -/** - * 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 ) - { - mtime_t i_fade_start = ( p_subpic->i_stop + - p_subpic->i_start ) / 2; - mtime_t i_now = mdate(); - - 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 ); + if (is_rejeted) + SpuHeapDeleteSubpicture(&sys->heap, current); + else + subpicture_array[(*subpicture_count)++] = current; } } - return i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025; + + sys->last_sort_date = render_subtitle_date; } -/** - * 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; +/** + * It will transform the provided region into another region suitable for rendering. + */ +static void SpuRenderRegion(spu_t *spu, + subpicture_region_t **dst_ptr, spu_area_t *dst_area, + subpicture_t *subpic, subpicture_region_t *region, + const spu_scale_t scale_size, + const vlc_fourcc_t *chroma_list, + const video_format_t *fmt, + const spu_area_t *subtitle_area, int subtitle_area_count, + mtime_t render_date) +{ + spu_private_t *sys = spu->p; + + video_format_t fmt_original = region->fmt; + bool restore_text = false; + int x_offset; + int y_offset; video_format_t region_fmt; - picture_t *p_region_picture; + picture_t *region_picture; /* Invalidate area by default */ - *p_area = spu_area_create( 0,0, 0,0, scale_size ); + *dst_area = spu_area_create(0,0, 0,0, scale_size); + *dst_ptr = NULL; /* 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 ); - b_restore_format = b_rerender_text; + if (region->fmt.i_chroma == VLC_CODEC_TEXT) { + SpuRenderText(spu, &restore_text, region, + chroma_list, + render_date - subpic->i_start); /* Check if the rendering has failed ... */ - if( p_region->fmt.i_chroma == VLC_CODEC_TEXT ) + if (region->fmt.i_chroma == VLC_CODEC_TEXT) goto exit; } /* Force palette if requested - * FIXME b_force_palette and b_force_crop are applied to all subpictures using palette + * FIXME b_force_palette and 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; - + const bool using_palette = region->fmt.i_chroma == VLC_CODEC_YUVP; + const bool force_palette = using_palette && sys->force_palette; + const bool force_crop = force_palette && sys->force_crop; + bool 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 ); + int y_margin = 0; + if (!force_crop && subpic->b_subtitle) + y_margin = spu_invscale_h(sys->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, i_margin_y ); + SpuRegionPlace(&x_offset, &y_offset, + subpic, 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 ); + *dst_area = spu_area_create(x_offset, y_offset, + region->fmt.i_width, region->fmt.i_height, + scale_size); /* 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() ); + if (subpic->b_subtitle && !subpic->b_absolute) + SpuAreaFixOverlap(dst_area, subtitle_area, subtitle_area_count, + region->i_align); - SpuAreaFixOverlap( p_area, &display, 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 = *dst_area; + + /* apply margin to subtitles and correct if they go over the picture edge */ + if (subpic->b_subtitle) + restrained.y -= y_margin; + + spu_area_t display = spu_area_create(0, 0, fmt->i_width, 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 ); + x_offset = spu_scale_w(restrained.x, restrained.scale); + y_offset = spu_scale_h(restrained.y, restrained.scale); /* */ - if( b_force_palette ) - { - video_palette_t *p_palette = p_region->fmt.p_palette; - video_palette_t palette; + if (force_palette) { + video_palette_t *old_palette = region->fmt.p_palette; + video_palette_t new_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; + new_palette.i_entries = 4; + for (int i = 0; i < 4; i++) + for (int j = 0; j < 4; j++) + new_palette.palette[i][j] = sys->palette[i][j]; + + if (old_palette->i_entries == new_palette.i_entries) { + for (int i = 0; i < old_palette->i_entries; i++) + for (int j = 0; j < 4; j++) + changed_palette |= old_palette->palette[i][j] != new_palette.palette[i][j]; + } else { + changed_palette = true; } - *p_palette = palette; + *old_palette = new_palette; } /* */ - region_fmt = p_region->fmt; - p_region_picture = p_region->p_picture; + region_fmt = region->fmt; + region_picture = region->p_picture; + bool convert_chroma = true; + for (int i = 0; chroma_list[i] && convert_chroma; i++) { + if (region_fmt.i_chroma == chroma_list[i]) + convert_chroma = false; + } /* 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 ) ) - { - 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 ); + if (sys->scale && sys->scale->p_module && + (!using_palette || (sys->scale_yuvp && sys->scale_yuvp->p_module)) && + (scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || + using_palette || convert_chroma)) { + const unsigned dst_width = spu_scale_w(region->fmt.i_width, scale_size); + const unsigned dst_height = spu_scale_h(region->fmt.i_height, scale_size); /* Destroy the cache if unusable */ - if( p_region->p_private ) - { - subpicture_region_private_t *p_private = p_region->p_private; - bool b_changed = false; + if (region->p_private) { + subpicture_region_private_t *private = region->p_private; + bool is_changed = false; /* Check resize changes */ - if( i_dst_width != p_private->fmt.i_width || - i_dst_height != p_private->fmt.i_height ) - b_changed = true; + if (dst_width != private->fmt.i_width || + dst_height != private->fmt.i_height) + is_changed = true; /* Check forced palette changes */ - if( b_changed_palette ) - b_changed = true; + if (changed_palette) + is_changed = true; - if( b_changed ) - { - SpuRegionPrivateDelete( p_private ); - p_region->p_private = NULL; + if (convert_chroma && private->fmt.i_chroma != chroma_list[0]) + is_changed = true; + + if (is_changed) { + subpicture_region_private_Delete(private); + 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 (!region->p_private && dst_width > 0 && dst_height > 0) { + filter_t *scale = sys->scale; - picture_t *p_picture = p_region->p_picture; - picture_Hold( p_picture ); + picture_t *picture = region->p_picture; + picture_Hold(picture); /* Convert YUVP to YUVA/RGBA first for better scaling quality */ - if( b_using_palette ) - { - filter_t *p_scale_yuvp = p_sys->p_scale_yuvp; + if (using_palette) { + filter_t *scale_yuvp = sys->scale_yuvp; - p_scale_yuvp->fmt_in.video = p_region->fmt; + scale_yuvp->fmt_in.video = 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; + scale_yuvp->fmt_out.video = region->fmt; + scale_yuvp->fmt_out.video.i_chroma = chroma_list[0]; - p_picture = p_scale_yuvp->pf_video_filter( p_scale_yuvp, p_picture ); - if( !p_picture ) - { + picture = scale_yuvp->pf_video_filter(scale_yuvp, picture); + if (!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 ); + msg_Warn(spu, "%4.4s to %4.4s conversion failed", + (const char*)&scale_yuvp->fmt_in.video.i_chroma, + (const char*)&scale_yuvp->fmt_out.video.i_chroma); } } /* Conversion(except from YUVP)/Scaling */ - if( p_picture && - ( p_picture->format.i_width != i_dst_width || - p_picture->format.i_height != i_dst_height ) ) + if (picture && + (picture->format.i_width != dst_width || + picture->format.i_height != dst_height || + (convert_chroma && !using_palette))) { - 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" ); + scale->fmt_in.video = picture->format; + scale->fmt_out.video = picture->format; + if (convert_chroma) + scale->fmt_out.i_codec = + scale->fmt_out.video.i_chroma = chroma_list[0]; + + scale->fmt_out.video.i_width = dst_width; + scale->fmt_out.video.i_height = dst_height; + + scale->fmt_out.video.i_visible_width = + spu_scale_w(region->fmt.i_visible_width, scale_size); + scale->fmt_out.video.i_visible_height = + spu_scale_h(region->fmt.i_visible_height, scale_size); + + picture = scale->pf_video_filter(scale, picture); + if (!picture) + msg_Err(spu, "scaling failed"); } /* */ - if( p_picture ) - { - 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; + if (picture) { + region->p_private = subpicture_region_private_New(&picture->format); + if (region->p_private) { + region->p_private->p_picture = picture; + if (!region->p_private->p_picture) { + subpicture_region_private_Delete(region->p_private); + region->p_private = NULL; } - } - else - { - picture_Release( p_picture ); + } else { + picture_Release(picture); } } } /* 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; + if (region->p_private) { + region_fmt = region->p_private->fmt; + region_picture = region->p_private->p_picture; } } /* 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 ); + if (force_crop) { + int crop_x = spu_scale_w(sys->crop.x, scale_size); + int crop_y = spu_scale_h(sys->crop.y, scale_size); + int crop_width = spu_scale_w(sys->crop.width, scale_size); + int crop_height= spu_scale_h(sys->crop.height,scale_size); /* 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 ) - { + if (crop_x + crop_width <= x_offset || + x_offset + (int)region_fmt.i_visible_width < crop_x || + crop_y + crop_height <= y_offset || + y_offset + (int)region_fmt.i_visible_height < crop_y) { /* No intersection */ - region_fmt.i_visible_width = + 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 ); - - 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; - - i_x_offset = __MAX( i_x, 0 ); - i_y_offset = __MAX( i_y, 0 ); + } else { + int x, y, x_end, y_end; + x = __MAX(crop_x, x_offset); + y = __MAX(crop_y, y_offset); + x_end = __MIN(crop_x + crop_width, + x_offset + (int)region_fmt.i_visible_width); + y_end = __MIN(crop_y + crop_height, + y_offset + (int)region_fmt.i_visible_height); + + region_fmt.i_x_offset = x - x_offset; + region_fmt.i_y_offset = y - y_offset; + region_fmt.i_visible_width = x_end - x; + region_fmt.i_visible_height = y_end - y; + + x_offset = __MAX(x, 0); + y_offset = __MAX(y, 0); } } - /* 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 - { - 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 ); + subpicture_region_t *dst = *dst_ptr = subpicture_region_New(®ion_fmt); + if (dst) { + dst->i_x = x_offset; + dst->i_y = y_offset; + dst->i_align = 0; + if (dst->p_picture) + picture_Release(dst->p_picture); + dst->p_picture = picture_Hold(region_picture); + int fade_alpha = 255; + if (subpic->b_fade) { + mtime_t fade_start = subpic->i_start + 3 * (subpic->i_stop - subpic->i_start) / 4; + + if (fade_start <= render_date && fade_start < subpic->i_stop) + fade_alpha = 255 * (subpic->i_stop - render_date) / + (subpic->i_stop - fade_start); + } + dst->i_alpha = fade_alpha * subpic->i_alpha * region->i_alpha / 65025; } exit: - if( b_rerender_text ) - { + if (restore_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 (region->p_picture) { + picture_Release(region->p_picture); + region->p_picture = NULL; } - if( p_region->p_private ) - { - SpuRegionPrivateDelete( p_region->p_private ); - p_region->p_private = NULL; + if (region->p_private) { + subpicture_region_private_Delete(region->p_private); + region->p_private = NULL; } - p_region->i_align &= ~SUBPICTURE_RENDERED; + region->fmt = fmt_original; } - if( b_restore_format ) - p_region->fmt = fmt_original; } /** - * This function compares two 64 bits integers. - * It can be used by qsort. - */ -static int IntegerCmp( int64_t i0, int64_t i1 ) -{ - return i0 < i1 ? -1 : i0 > i1 ? 1 : 0; -} -/** - * This function compares 2 subpictures using the following properties - * (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. + * This function renders all sub picture units in the list. */ -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; +static subpicture_t *SpuRenderSubpictures(spu_t *spu, + unsigned int i_subpicture, + subpicture_t **pp_subpicture, + const vlc_fourcc_t *chroma_list, + const video_format_t *fmt_dst, + const video_format_t *fmt_src, + mtime_t render_subtitle_date, + mtime_t render_osd_date) +{ + spu_private_t *sys = spu->p; + + /* Count the number of regions and subtitle regions */ + unsigned int subtitle_region_count = 0; + unsigned int region_count = 0; + for (unsigned i = 0; i < i_subpicture; i++) { + const subpicture_t *subpic = pp_subpicture[i]; + + unsigned count = 0; + for (subpicture_region_t *r = subpic->p_region; r != NULL; r = r->p_next) + count++; + + if (subpic->b_subtitle) + subtitle_region_count += count; + region_count += count; + } + if (region_count <= 0) + return NULL; - 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; -} + /* Create the output subpicture */ + subpicture_t *output = subpicture_New(NULL); + if (!output) + return NULL; + output->i_original_picture_width = fmt_dst->i_width; + output->i_original_picture_height = fmt_dst->i_height; + subpicture_region_t **output_last_ptr = &output->p_region; -/***************************************************************************** - * 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 */ + /* Allocate area array for subtitle overlap */ + spu_area_t subtitle_area_buffer[VOUT_MAX_SUBPICTURES]; + spu_area_t *subtitle_area; + int subtitle_area_count; - vlc_mutex_lock( &p_sys->lock ); + subtitle_area_count = 0; + subtitle_area = subtitle_area_buffer; + if (subtitle_region_count > sizeof(subtitle_area_buffer)/sizeof(*subtitle_area_buffer)) + subtitle_area = calloc(subtitle_region_count, sizeof(*subtitle_area)); - 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; + /* Process all subpictures and regions (in the right order) */ + for (unsigned int index = 0; index < i_subpicture; index++) { + subpicture_t *subpic = pp_subpicture[index]; + subpicture_region_t *region; - if( !p_subpic ) - continue; - if( p_subpic->i_channel != i_channel && ( i_channel != -1 || p_subpic->i_channel == DEFAULT_CHAN ) ) + if (!subpic->p_region) continue; - /* You cannot delete subpicture outside of spu_SortSubpictures */ - p_entry->b_reject = true; - } + if (subpic->i_original_picture_width <= 0 || + subpic->i_original_picture_height <= 0) { + if (subpic->i_original_picture_width > 0 || + subpic->i_original_picture_height > 0) + msg_Err(spu, "original picture size %dx%d is unsupported", + subpic->i_original_picture_width, + subpic->i_original_picture_height); + else + msg_Warn(spu, "original picture size is undefined"); - vlc_mutex_unlock( &p_sys->lock ); -} + subpic->i_original_picture_width = fmt_src->i_width; + subpic->i_original_picture_height = fmt_src->i_height; + } -/***************************************************************************** - * 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; + if (sys->text) { + /* FIXME aspect ratio ? */ + sys->text->fmt_out.video.i_width = + sys->text->fmt_out.video.i_visible_width = subpic->i_original_picture_width; + + sys->text->fmt_out.video.i_height = + sys->text->fmt_out.video.i_visible_height = subpic->i_original_picture_height; + } + + /* Render all regions + * We always transform non absolute subtitle into absolute one on the + * first rendering to allow good subtitle overlap support. + */ + for (region = subpic->p_region; region != NULL; region = region->p_next) { + spu_area_t area; + + /* Compute region scale AR */ + video_format_t region_fmt = region->fmt; + if (region_fmt.i_sar_num <= 0 || region_fmt.i_sar_den <= 0) { + region_fmt.i_sar_num = (int64_t)fmt_dst->i_width * fmt_dst->i_sar_num * subpic->i_original_picture_height; + region_fmt.i_sar_den = (int64_t)fmt_dst->i_height * fmt_dst->i_sar_den * subpic->i_original_picture_width; + vlc_ureduce(®ion_fmt.i_sar_num, ®ion_fmt.i_sar_den, + region_fmt.i_sar_num, region_fmt.i_sar_den, 65536); + } + + /* Compute scaling from original size to destination size + * FIXME The current scaling ensure that the heights match, the width being + * cropped. + */ + spu_scale_t scale = spu_scale_createq((int64_t)fmt_dst->i_height * fmt_dst->i_sar_den * region_fmt.i_sar_num, + (int64_t)subpic->i_original_picture_height * fmt_dst->i_sar_num * region_fmt.i_sar_den, + fmt_dst->i_height, + subpic->i_original_picture_height); + + /* Check scale validity */ + if (scale.w <= 0 || scale.h <= 0) + continue; + + /* */ + SpuRenderRegion(spu, output_last_ptr, &area, + subpic, region, scale, + chroma_list, fmt_dst, + subtitle_area, subtitle_area_count, + subpic->b_subtitle ? render_subtitle_date : render_osd_date); + if (*output_last_ptr) + output_last_ptr = &(*output_last_ptr)->p_next; + + if (subpic->b_subtitle) { + area = spu_area_unscaled(area, scale); + if (!subpic->b_absolute && area.width > 0 && area.height > 0) { + region->i_x = area.x; + region->i_y = area.y; + } + if (subtitle_area) + subtitle_area[subtitle_area_count++] = area; + } + } + if (subpic->b_subtitle && subpic->p_region) + subpic->b_absolute = true; } - return VLC_SUCCESS; + /* */ + if (subtitle_area != subtitle_area_buffer) + free(subtitle_area); + + return output; } /***************************************************************************** @@ -1725,39 +1101,37 @@ static int SpuControl( spu_t *p_spu, int i_query, va_list args ) * This function is called from CropCallback and at initialization time, to * retrieve crop information from the input. *****************************************************************************/ -static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) +static void UpdateSPU(spu_t *spu, vlc_object_t *object) { - spu_private_t *p_sys = p_spu->p; + spu_private_t *sys = spu->p; vlc_value_t val; - vlc_mutex_lock( &p_sys->lock ); + vlc_mutex_lock(&sys->lock); - p_sys->b_force_palette = false; - p_sys->b_force_crop = false; + sys->force_palette = false; + sys->force_crop = false; - if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) - { - vlc_mutex_unlock( &p_sys->lock ); + if (var_Get(object, "highlight", &val) || !val.b_bool) { + vlc_mutex_unlock(&sys->lock); return; } - p_sys->b_force_crop = true; - p_sys->i_crop_x = var_GetInteger( p_object, "x-start" ); - 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; + sys->force_crop = true; + sys->crop.x = var_GetInteger(object, "x-start"); + sys->crop.y = var_GetInteger(object, "y-start"); + sys->crop.width = var_GetInteger(object, "x-end") - sys->crop.x; + sys->crop.height = var_GetInteger(object, "y-end") - sys->crop.y; - if( var_Get( p_object, "menu-palette", &val ) == VLC_SUCCESS ) - { - memcpy( p_sys->palette, val.p_address, 16 ); - p_sys->b_force_palette = true; + if (var_Get(object, "menu-palette", &val) == VLC_SUCCESS) { + memcpy(sys->palette, val.p_address, 16); + sys->force_palette = true; } - vlc_mutex_unlock( &p_sys->lock ); + vlc_mutex_unlock(&sys->lock); - msg_Dbg( p_object, "crop: %i,%i,%i,%i, palette forced: %i", - p_sys->i_crop_x, p_sys->i_crop_y, - p_sys->i_crop_width, p_sys->i_crop_height, - p_sys->b_force_palette ); + msg_Dbg(object, "crop: %i,%i,%i,%i, palette forced: %i", + sys->crop.x, sys->crop.y, + sys->crop.width, sys->crop.height, + sys->force_palette); } /***************************************************************************** @@ -1765,104 +1139,445 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) ***************************************************************************** * This callback is called from the input thread when we need cropping *****************************************************************************/ -static int CropCallback( vlc_object_t *p_object, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int CropCallback(vlc_object_t *object, char const *var, + vlc_value_t oldval, vlc_value_t newval, void *data) { - VLC_UNUSED(oldval); VLC_UNUSED(newval); VLC_UNUSED(psz_var); + VLC_UNUSED(oldval); VLC_UNUSED(newval); VLC_UNUSED(var); - UpdateSPU( (spu_t *)p_data, p_object ); + UpdateSPU((spu_t *)data, object); return VLC_SUCCESS; } /***************************************************************************** * Buffers allocation callbacks for the filters *****************************************************************************/ -struct filter_owner_sys_t -{ - spu_t *p_spu; - int i_channel; -}; -static subpicture_t *sub_new_buffer( filter_t *p_filter ) +static subpicture_t *sub_new_buffer(filter_t *filter) { - filter_owner_sys_t *p_sys = p_filter->p_owner; + filter_owner_sys_t *sys = filter->p_owner; - subpicture_t *p_subpicture = subpicture_New(); - if( p_subpicture ) - p_subpicture->i_channel = p_sys->i_channel; - return p_subpicture; + subpicture_t *subpicture = subpicture_New(NULL); + if (subpicture) + subpicture->i_channel = sys->channel; + return subpicture; } -static void sub_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) +static void sub_del_buffer(filter_t *filter, subpicture_t *subpic) { - VLC_UNUSED( p_filter ); - subpicture_Delete( p_subpic ); + VLC_UNUSED(filter); + subpicture_Delete(subpic); } -static subpicture_t *spu_new_buffer( filter_t *p_filter ) +static int SubSourceAllocationInit(filter_t *filter, void *data) { - VLC_UNUSED(p_filter); - return subpicture_New(); + spu_t *spu = data; + + filter_owner_sys_t *sys = malloc(sizeof(*sys)); + if (!sys) + return VLC_EGENERIC; + + filter->pf_sub_buffer_new = sub_new_buffer; + filter->pf_sub_buffer_del = sub_del_buffer; + + filter->p_owner = sys; + sys->channel = spu_RegisterChannel(spu); + sys->spu = spu; + + return VLC_SUCCESS; } -static void spu_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) + +static void SubSourceAllocationClean(filter_t *filter) { - VLC_UNUSED(p_filter); - subpicture_Delete( p_subpic ); + filter_owner_sys_t *sys = filter->p_owner; + + spu_ClearChannel(sys->spu, sys->channel); + free(filter->p_owner); } -static picture_t *spu_new_video_buffer( 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 *object) { - const video_format_t *p_fmt = &p_filter->fmt_out.video; + spu_t *spu = vlc_custom_create(object, + sizeof(spu_t) + sizeof(spu_private_t), + "subpicture"); + if (!spu) + return NULL; + + /* Initialize spu fields */ + spu_private_t *sys = spu->p = (spu_private_t*)&spu[1]; + + /* Initialize private fields */ + vlc_mutex_init(&sys->lock); + + SpuHeapInit(&sys->heap); + + sys->text = NULL; + sys->scale = NULL; + sys->scale_yuvp = NULL; + + sys->margin = var_InheritInteger(spu, "sub-margin"); + + /* Register the default subpicture channel */ + sys->channel = SPU_DEFAULT_CHANNEL + 1; + + sys->source_chain_update = NULL; + sys->filter_chain_update = NULL; + vlc_mutex_init(&sys->source_chain_lock); + vlc_mutex_init(&sys->filter_chain_lock); + sys->source_chain = filter_chain_New(spu, "sub source", false, + SubSourceAllocationInit, + SubSourceAllocationClean, + spu); + sys->filter_chain = filter_chain_New(spu, "sub filter", false, + NULL, + NULL, + spu); + + /* Load text and scale module */ + sys->text = SpuRenderCreateAndLoadText(spu); + + /* XXX spu->p_scale is used for all conversion/scaling except yuvp to + * yuva/rgba */ + sys->scale = SpuRenderCreateAndLoadScale(VLC_OBJECT(spu), + VLC_CODEC_YUVA, VLC_CODEC_RGBA, true); + + /* This one is used for YUVP to YUVA/RGBA without scaling + * FIXME rename it */ + sys->scale_yuvp = SpuRenderCreateAndLoadScale(VLC_OBJECT(spu), + VLC_CODEC_YUVP, VLC_CODEC_YUVA, false); + + /* */ + sys->last_sort_date = -1; - VLC_UNUSED(p_filter); - return picture_New( p_fmt->i_chroma, - p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect ); + return spu; } -static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_picture ) + +/** + * Destroy the subpicture unit + * + * \param p_this the parent object which destroys the subpicture unit + */ +void spu_Destroy(spu_t *spu) { - VLC_UNUSED(p_filter); - picture_Release( p_picture ); + spu_private_t *sys = spu->p; + + if (sys->text) + FilterRelease(sys->text); + + if (sys->scale_yuvp) + FilterRelease(sys->scale_yuvp); + + if (sys->scale) + FilterRelease(sys->scale); + + filter_chain_Delete(sys->source_chain); + filter_chain_Delete(sys->filter_chain); + vlc_mutex_destroy(&sys->source_chain_lock); + vlc_mutex_destroy(&sys->filter_chain_lock); + free(sys->source_chain_update); + free(sys->filter_chain_update); + + /* Destroy all remaining subpictures */ + SpuHeapClean(&sys->heap); + + vlc_mutex_destroy(&sys->lock); + + vlc_object_release(spu); } -static int SubFilterAllocationInit( filter_t *p_filter, void *p_data ) +/** + * Attach/Detach the SPU from any input + * + * \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 *spu, vlc_object_t *input, bool attach) { - spu_t *p_spu = p_data; + if (attach) { + UpdateSPU(spu, input); + var_Create(input, "highlight", VLC_VAR_BOOL); + var_AddCallback(input, "highlight", CropCallback, spu); - filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) ); - if( !p_sys ) - return VLC_EGENERIC; + vlc_mutex_lock(&spu->p->lock); + spu->p->input = input; + + if (spu->p->text) + FilterRelease(spu->p->text); + spu->p->text = SpuRenderCreateAndLoadText(spu); + + vlc_mutex_unlock(&spu->p->lock); + } else { + vlc_mutex_lock(&spu->p->lock); + spu->p->input = NULL; + vlc_mutex_unlock(&spu->p->lock); + + /* Delete callbacks */ + var_DelCallback(input, "highlight", CropCallback, spu); + var_Destroy(input, "highlight"); + } +} - p_filter->pf_sub_buffer_new = sub_new_buffer; - p_filter->pf_sub_buffer_del = sub_del_buffer; +/** + * Inform the SPU filters of mouse event + */ +int spu_ProcessMouse(spu_t *spu, + const vlc_mouse_t *mouse, + const video_format_t *fmt) +{ + spu_private_t *sys = spu->p; - p_filter->p_owner = p_sys; - spu_Control( p_spu, SPU_CHANNEL_REGISTER, &p_sys->i_channel ); - p_sys->p_spu = p_spu; + vlc_mutex_lock(&sys->source_chain_lock); + filter_chain_MouseEvent(sys->source_chain, mouse, fmt); + vlc_mutex_unlock(&sys->source_chain_lock); return VLC_SUCCESS; } -static void SubFilterAllocationClean( filter_t *p_filter ) +/** + * Display a subpicture + * + * Remove the reservation flag of a subpicture, which will cause it to be + * ready for display. + * \param spu the subpicture unit object + * \param subpic the subpicture to display + */ +void spu_PutSubpicture(spu_t *spu, subpicture_t *subpic) +{ + spu_private_t *sys = spu->p; + + /* Update sub-filter chain */ + vlc_mutex_lock(&sys->lock); + char *chain_update = sys->filter_chain_update; + sys->filter_chain_update = NULL; + vlc_mutex_unlock(&sys->lock); + + bool is_left_empty = false; + + vlc_mutex_lock(&sys->filter_chain_lock); + if (chain_update) { + filter_chain_Reset(sys->filter_chain, NULL, NULL); + + filter_chain_AppendFromString(spu->p->filter_chain, chain_update); + + /* "sub-source" was formerly "sub-filter", so now the "sub-filter" + configuration may contain sub-filters or sub-sources configurations. + if the filters chain was left empty it may indicate that it's a sub-source configuration */ + is_left_empty = (filter_chain_GetLength(spu->p->filter_chain) == 0); + } + vlc_mutex_unlock(&sys->filter_chain_lock); + + + if (is_left_empty) { + /* try to use the configuration as a sub-source configuration */ + + vlc_mutex_lock(&sys->lock); + if (!sys->source_chain_update || !*sys->source_chain_update) { + free(sys->source_chain_update); + sys->source_chain_update = chain_update; + chain_update = NULL; + } + vlc_mutex_unlock(&sys->lock); + } + + free(chain_update); + + /* Run filter chain on the new subpicture */ + subpic = filter_chain_SubFilter(spu->p->filter_chain, subpic); + if (!subpic) + return; + + /* SPU_DEFAULT_CHANNEL always reset itself */ + if (subpic->i_channel == SPU_DEFAULT_CHANNEL) + spu_ClearChannel(spu, SPU_DEFAULT_CHANNEL); + + /* p_private is for spu only and cannot be non NULL here */ + for (subpicture_region_t *r = subpic->p_region; r != NULL; r = r->p_next) + assert(r->p_private == NULL); + + /* */ + vlc_mutex_lock(&sys->lock); + if (SpuHeapPush(&sys->heap, subpic)) { + vlc_mutex_unlock(&sys->lock); + msg_Err(spu, "subpicture heap full"); + subpicture_Delete(subpic); + return; + } + vlc_mutex_unlock(&sys->lock); +} + +subpicture_t *spu_Render(spu_t *spu, + const vlc_fourcc_t *chroma_list, + const video_format_t *fmt_dst, + const video_format_t *fmt_src, + mtime_t render_subtitle_date, + mtime_t render_osd_date, + bool ignore_osd) +{ + spu_private_t *sys = spu->p; + + /* Update sub-source chain */ + vlc_mutex_lock(&sys->lock); + char *chain_update = sys->source_chain_update; + sys->source_chain_update = NULL; + vlc_mutex_unlock(&sys->lock); + + vlc_mutex_lock(&sys->source_chain_lock); + if (chain_update) { + filter_chain_Reset(sys->source_chain, NULL, NULL); + + filter_chain_AppendFromString(spu->p->source_chain, chain_update); + + free(chain_update); + } + /* Run subpicture sources */ + filter_chain_SubSource(sys->source_chain, render_osd_date); + vlc_mutex_unlock(&sys->source_chain_lock); + + static const vlc_fourcc_t chroma_list_default_yuv[] = { + VLC_CODEC_YUVA, + VLC_CODEC_RGBA, + VLC_CODEC_YUVP, + 0, + }; + static const vlc_fourcc_t chroma_list_default_rgb[] = { + VLC_CODEC_RGBA, + VLC_CODEC_YUVA, + VLC_CODEC_YUVP, + 0, + }; + + if (!chroma_list || *chroma_list == 0) + chroma_list = vlc_fourcc_IsYUV(fmt_dst->i_chroma) ? chroma_list_default_yuv + : chroma_list_default_rgb; + + vlc_mutex_lock(&sys->lock); + + unsigned int subpicture_count; + subpicture_t *subpicture_array[VOUT_MAX_SUBPICTURES]; + + /* Get an array of subpictures to render */ + SpuSelectSubpictures(spu, &subpicture_count, subpicture_array, + render_subtitle_date, render_osd_date, ignore_osd); + if (subpicture_count <= 0) { + vlc_mutex_unlock(&sys->lock); + return NULL; + } + + /* Updates the subpictures */ + for (unsigned i = 0; i < subpicture_count; i++) { + subpicture_t *subpic = subpicture_array[i]; + subpicture_Update(subpic, + fmt_src, fmt_dst, + subpic->b_subtitle ? render_subtitle_date : render_osd_date); + } + + /* Now order the subpicture array + * XXX The order is *really* important for overlap subtitles positionning */ + qsort(subpicture_array, subpicture_count, sizeof(*subpicture_array), SubpictureCmp); + + /* Render the subpictures */ + subpicture_t *render = SpuRenderSubpictures(spu, + subpicture_count, subpicture_array, + chroma_list, + fmt_dst, + fmt_src, + render_subtitle_date, + render_osd_date); + vlc_mutex_unlock(&sys->lock); + + return render; +} + +void spu_OffsetSubtitleDate(spu_t *spu, mtime_t duration) { - filter_owner_sys_t *p_sys = p_filter->p_owner; + spu_private_t *sys = spu->p; - SpuClearChannel( p_sys->p_spu, p_sys->i_channel ); - free( p_filter->p_owner ); + vlc_mutex_lock(&sys->lock); + for (int i = 0; i < VOUT_MAX_SUBPICTURES; i++) { + spu_heap_entry_t *entry = &sys->heap.entry[i]; + subpicture_t *current = entry->subpicture; + + if (current && current->b_subtitle) { + if (current->i_start > 0) + current->i_start += duration; + if (current->i_stop > 0) + current->i_stop += duration; + } + } + vlc_mutex_unlock(&sys->lock); } -static int SubFilterCallback( vlc_object_t *p_object, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +int spu_RegisterChannel(spu_t *spu) { - spu_t *p_spu = p_data; - spu_private_t *p_sys = p_spu->p; + spu_private_t *sys = spu->p; - VLC_UNUSED(p_object); VLC_UNUSED(oldval); VLC_UNUSED(psz_var); + vlc_mutex_lock(&sys->lock); + int channel = sys->channel++; + vlc_mutex_unlock(&sys->lock); - vlc_mutex_lock( &p_sys->lock ); + return channel; +} - free( p_sys->psz_chain_update ); - p_sys->psz_chain_update = strdup( newval.psz_string ); +void spu_ClearChannel(spu_t *spu, int channel) +{ + spu_private_t *sys = spu->p; - vlc_mutex_unlock( &p_sys->lock ); - return VLC_SUCCESS; + vlc_mutex_lock(&sys->lock); + + for (int i = 0; i < VOUT_MAX_SUBPICTURES; i++) { + spu_heap_entry_t *entry = &sys->heap.entry[i]; + subpicture_t *subpic = entry->subpicture; + + if (!subpic) + continue; + if (subpic->i_channel != channel && (channel != -1 || subpic->i_channel == SPU_DEFAULT_CHANNEL)) + continue; + + /* You cannot delete subpicture outside of spu_SortSubpictures */ + entry->reject = true; + } + + vlc_mutex_unlock(&sys->lock); +} + +void spu_ChangeSources(spu_t *spu, const char *filters) +{ + spu_private_t *sys = spu->p; + + vlc_mutex_lock(&sys->lock); + + free(sys->source_chain_update); + sys->source_chain_update = strdup(filters); + + vlc_mutex_unlock(&sys->lock); +} + +void spu_ChangeFilters(spu_t *spu, const char *filters) +{ + spu_private_t *sys = spu->p; + + vlc_mutex_lock(&sys->lock); + + free(sys->filter_chain_update); + sys->filter_chain_update = strdup(filters); + + vlc_mutex_unlock(&sys->lock); +} + +void spu_ChangeMargin(spu_t *spu, int margin) +{ + spu_private_t *sys = spu->p; + + vlc_mutex_lock(&sys->lock); + sys->margin = margin; + vlc_mutex_unlock(&sys->lock); }