X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_subpictures.c;h=697bf7dd53e0b0f8fde1e38d218937a1e3b4e41f;hb=3e356e56b23267a91a9e682cc63115926da77600;hp=9515c99c4e042014cdc4ea6aed78275586fca3f7;hpb=5d96d8416226429d5bcc5acea816b96de5a1a73c;p=vlc diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index 9515c99c4e..697bf7dd53 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -36,54 +36,156 @@ #include #include #include "../libvlc.h" +#include "vout_internal.h" #include +#include /***************************************************************************** * Local prototypes *****************************************************************************/ +/* Number of simultaneous subpictures */ +#define VOUT_MAX_SUBPICTURES (VOUT_MAX_PICTURES) + +#define VLC_FOURCC_YUVP VLC_FOURCC('Y','U','V','P') +#define VLC_FOURCC_YUVA VLC_FOURCC('Y','U','V','A') +#define VLC_FOURCC_RGBA VLC_FOURCC('R','G','B','A') +#define VLC_FOURCC_TEXT VLC_FOURCC('T','E','X','T') + +/* */ +typedef struct +{ + subpicture_t *p_subpicture; + bool b_reject; +} spu_heap_entry_t; + +typedef struct +{ + spu_heap_entry_t p_entry[VOUT_MAX_SUBPICTURES]; + +} spu_heap_t; + +static void SpuHeapInit( spu_heap_t * ); +static int SpuHeapPush( spu_heap_t *, subpicture_t * ); +static void SpuHeapDeleteAt( spu_heap_t *, int i_index ); +static int SpuHeapDeleteSubpicture( spu_heap_t *, subpicture_t * ); +static void SpuHeapClean( spu_heap_t *p_heap ); + +struct spu_private_t +{ + vlc_mutex_t lock; /* lock to protect all followings fields */ + + 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 i_margin; /**< force position of a subpicture */ + bool b_force_palette; /**< force palette of subpicture */ + uint8_t palette[4][4]; /**< forced palette */ + + /* Subpiture filters */ + 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 +{ + 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 spu_vaControlDefault( spu_t *, int, va_list ); +static int SpuControl( spu_t *, int, va_list ); + +static void SpuClearChannel( spu_t *p_spu, int i_channel, bool b_locked ); -static subpicture_t *sub_new_buffer( filter_t * ); -static void sub_del_buffer( filter_t *, subpicture_t * ); +/* 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 * ); static int spu_ParseChain( spu_t * ); + +/* Buffer aloccation fir SUB filter */ static int SubFilterCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -static int sub_filter_allocation_init( filter_t *, void * ); -static void sub_filter_allocation_clear( filter_t * ); -struct filter_owner_sys_t -{ - spu_t *p_spu; - int i_channel; -}; - -enum { - SCALE_DEFAULT, - SCALE_TEXT, - SCALE_SIZE -}; - -#define SCALE_UNIT (1000) - -static void FilterRelease( filter_t *p_filter ) -{ - if( p_filter->p_module ) - module_Unneed( p_filter, p_filter->p_module ); +static int SubFilterAllocationInit( filter_t *, void * ); +static void SubFilterAllocationClean( filter_t * ); - vlc_object_detach( p_filter ); - vlc_object_release( p_filter ); -} +/* */ +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 * @@ -91,32 +193,46 @@ static void FilterRelease( filter_t *p_filter ) */ spu_t *__spu_Create( vlc_object_t *p_this ) { - int i_index; - spu_t *p_spu = vlc_custom_create( p_this, sizeof( spu_t ), - VLC_OBJECT_GENERIC, "subpicture" ); + 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" ); - for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++) - { - p_spu->p_subpicture[i_index].i_status = FREE_SUBPICTURE; - } + if( !p_spu ) + return NULL; - p_spu->p_blend = NULL; - p_spu->p_text = NULL; - p_spu->p_scale = NULL; - p_spu->p_scale_yuvp = NULL; - p_spu->pf_control = spu_vaControlDefault; + /* Initialize spu fields */ + p_spu->pf_control = SpuControl; + p_spu->p = p_sys = (spu_private_t*)&p_spu[1]; - /* Register the default subpicture channel */ - p_spu->i_channel = 2; + /* Initialize private fields */ + vlc_mutex_init( &p_sys->lock ); + + SpuHeapInit( &p_sys->heap ); - vlc_mutex_init( &p_spu->subpicture_lock ); + 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_spu->p_chain = filter_chain_New( p_spu, "sub filter", false, - sub_filter_allocation_init, - sub_filter_allocation_clear, + 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; } @@ -127,12 +243,10 @@ spu_t *__spu_Create( vlc_object_t *p_this ) */ int spu_Init( spu_t *p_spu ) { - vlc_value_t val; + spu_private_t *p_sys = p_spu->p; /* If the user requested a sub margin, we force the position. */ - var_Create( p_spu, "sub-margin", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Get( p_spu, "sub-margin", &val ); - p_spu->i_margin = val.i_int; + 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 ); @@ -145,14 +259,16 @@ int spu_Init( spu_t *p_spu ) int spu_ParseChain( spu_t *p_spu ) { char *psz_parser = var_GetString( p_spu, "sub-filter" ); - if( filter_chain_AppendFromString( p_spu->p_chain, psz_parser ) < 0 ) - { - free( psz_parser ); + int i_ret; + + if( !psz_parser ) return VLC_EGENERIC; - } + + i_ret = filter_chain_AppendFromString( p_spu->p->p_chain, psz_parser ); free( psz_parser ); - return VLC_SUCCESS; + + return i_ret; } /** @@ -162,158 +278,501 @@ int spu_ParseChain( spu_t *p_spu ) */ void spu_Destroy( spu_t *p_spu ) { - int i_index; + spu_private_t *p_sys = p_spu->p; + + 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 ); /* Destroy all remaining subpictures */ - for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ ) + 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, false ); + + /* 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; + + /* 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++ ) { - if( p_spu->p_subpicture[i_index].i_status != FREE_SUBPICTURE ) + 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_DestroySubpicture( p_spu, &p_spu->p_subpicture[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 ); + } } } - if( p_spu->p_blend ) - FilterRelease( p_spu->p_blend ); + p_sys->i_last_sort_date = display_date; + vlc_mutex_unlock( &p_sys->lock ); - if( p_spu->p_text ) - FilterRelease( p_spu->p_text ); + return p_subpic; +} - if( p_spu->p_scale_yuvp ) - FilterRelease( p_spu->p_scale_yuvp ); +void spu_OffsetSubtitleDate( spu_t *p_spu, mtime_t i_duration ) +{ + spu_private_t *p_sys = p_spu->p; - if( p_spu->p_scale ) - FilterRelease( p_spu->p_scale ); + 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; - filter_chain_Delete( p_spu->p_chain ); + 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; - vlc_mutex_destroy( &p_spu->subpicture_lock ); - vlc_object_release( p_spu ); + return p_subpic; } -/** - * 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 ) +void subpicture_Delete( subpicture_t *p_subpic ) { - vlc_object_t *p_input; - - p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT ); - if( !p_input ) return; + subpicture_region_ChainDelete( p_subpic->p_region ); + p_subpic->p_region = NULL; - if( b_attach ) - { - UpdateSPU( p_spu, VLC_OBJECT(p_input) ); - var_AddCallback( p_input, "highlight", CropCallback, p_spu ); - vlc_object_release( p_input ); - } - else + if( p_subpic->pf_destroy ) { - /* Delete callback */ - var_DelCallback( p_input, "highlight", CropCallback, p_spu ); - vlc_object_release( p_input ); + p_subpic->pf_destroy( p_subpic ); } + free( p_subpic ); } -/** - * Create a subpicture region - * - * \param p_this vlc_object_t - * \param p_fmt the format that this subpicture region should have - */ -static void RegionPictureRelease( picture_t *p_pic ) +static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic ) { - free( p_pic->p_data_orig ); - /* We use pf_release nullity to know if the picture has already been released. */ - p_pic->pf_release = NULL; + p_subpic->p_next = *pp_head; + + *pp_head = p_subpic; } -subpicture_region_t *__spu_CreateRegion( vlc_object_t *p_this, - video_format_t *p_fmt ) + +/***************************************************************************** + * subpicture_region_t allocation + *****************************************************************************/ +subpicture_region_t *subpicture_region_New( const video_format_t *p_fmt ) { - subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) ); - if( !p_region ) return NULL; + subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) ); + if( !p_region ) + return NULL; - memset( p_region, 0, sizeof(subpicture_region_t) ); + p_region->fmt = *p_fmt; + p_region->fmt.p_palette = NULL; + if( p_fmt->i_chroma == VLC_FOURCC_YUVP ) + { + p_region->fmt.p_palette = calloc( 1, sizeof(*p_region->fmt.p_palette) ); + if( p_fmt->p_palette ) + *p_region->fmt.p_palette = *p_fmt->p_palette; + } p_region->i_alpha = 0xff; p_region->p_next = NULL; - p_region->p_cache = NULL; - p_region->fmt = *p_fmt; + p_region->p_private = NULL; p_region->psz_text = NULL; p_region->p_style = NULL; + p_region->p_picture = NULL; - if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') ) - p_fmt->p_palette = p_region->fmt.p_palette = - malloc( sizeof(video_palette_t) ); - else p_fmt->p_palette = p_region->fmt.p_palette = NULL; - - p_region->picture.p_data_orig = NULL; + if( p_fmt->i_chroma == VLC_FOURCC_TEXT ) + return p_region; - if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') ) return p_region; - - vout_AllocatePicture( p_this, &p_region->picture, p_fmt->i_chroma, - p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect ); - - if( !p_region->picture.i_planes ) + 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_region ); free( p_fmt->p_palette ); + free( p_region ); return NULL; } - p_region->picture.pf_release = RegionPictureRelease; - return p_region; } -/** - * Make a subpicture region from an existing picture_t - * - * \param p_this vlc_object_t - * \param p_fmt the format that this subpicture region should have - * \param p_pic a pointer to the picture creating the region (not freed) - */ -subpicture_region_t *__spu_MakeRegion( vlc_object_t *p_this, - video_format_t *p_fmt, - picture_t *p_pic ) -{ - subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) ); - (void)p_this; - if( !p_region ) return NULL; - memset( p_region, 0, sizeof(subpicture_region_t) ); - p_region->i_alpha = 0xff; - p_region->p_next = 0; - p_region->p_cache = 0; - p_region->fmt = *p_fmt; - p_region->psz_text = 0; - p_region->p_style = NULL; - - if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') ) - p_fmt->p_palette = p_region->fmt.p_palette = - malloc( sizeof(video_palette_t) ); - else p_fmt->p_palette = p_region->fmt.p_palette = NULL; +/* */ +void subpicture_region_Delete( subpicture_region_t *p_region ) +{ + if( !p_region ) + return; - memcpy( &p_region->picture, p_pic, sizeof(picture_t) ); - p_region->picture.pf_release = RegionPictureRelease; + if( p_region->p_private ) + SpuRegionPrivateDelete( p_region->p_private ); - return p_region; -} + if( p_region->p_picture ) + picture_Release( p_region->p_picture ); -/** - * Destroy a subpicture region - * - * \param p_this vlc_object_t - * \param p_region the subpicture region to destroy - */ -void __spu_DestroyRegion( vlc_object_t *p_this, subpicture_region_t *p_region ) -{ - if( !p_region ) return; - if( p_region->picture.pf_release ) - p_region->picture.pf_release( &p_region->picture ); free( p_region->fmt.p_palette ); - if( p_region->p_cache ) __spu_DestroyRegion( p_this, p_region->p_cache ); free( p_region->psz_text ); free( p_region->psz_html ); @@ -321,152 +780,128 @@ void __spu_DestroyRegion( vlc_object_t *p_this, subpicture_region_t *p_region ) free( p_region ); } -/** - * 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 ) +/* */ +void subpicture_region_ChainDelete( subpicture_region_t *p_head ) { - /* Check if status is valid */ - if( p_subpic->i_status != RESERVED_SUBPICTURE ) + while( p_head ) { - msg_Err( p_spu, "subpicture %p has invalid status #%d", - p_subpic, p_subpic->i_status ); - } + subpicture_region_t *p_next = p_head->p_next; - /* Remove reservation flag */ - p_subpic->i_status = READY_SUBPICTURE; + subpicture_region_Delete( p_head ); - if( p_subpic->i_channel == DEFAULT_CHAN ) - { - p_subpic->i_channel = 0xFFFF; - spu_Control( p_spu, SPU_CHANNEL_CLEAR, DEFAULT_CHAN ); - p_subpic->i_channel = DEFAULT_CHAN; + p_head = p_next; } } -/** - * Allocate a subpicture in the spu heap. - * - * This function create a reserved subpicture in the spu heap. - * A null pointer is returned if the function fails. This method provides an - * already allocated zone of memory in the spu data fields. It needs locking - * since several pictures can be created by several producers threads. - * \param p_spu the subpicture unit in which to create the subpicture - * \return NULL on error, a reserved subpicture otherwise - */ -subpicture_t *spu_CreateSubpicture( spu_t *p_spu ) -{ - int i_subpic; /* subpicture index */ - subpicture_t * p_subpic = NULL; /* first free subpicture */ - /* Get lock */ - vlc_mutex_lock( &p_spu->subpicture_lock ); - /* - * Look for an empty place - */ - p_subpic = NULL; - for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ ) +/***************************************************************************** + * heap managment + *****************************************************************************/ +static void SpuHeapInit( spu_heap_t *p_heap ) +{ + for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) { - if( p_spu->p_subpicture[i_subpic].i_status == FREE_SUBPICTURE ) - { - /* Subpicture is empty and ready for allocation */ - p_subpic = &p_spu->p_subpicture[i_subpic]; - p_spu->p_subpicture[i_subpic].i_status = RESERVED_SUBPICTURE; - break; - } + spu_heap_entry_t *e = &p_heap->p_entry[i]; + + e->p_subpicture = NULL; + e->b_reject = false; } +} - /* If no free subpicture could be found */ - if( p_subpic == NULL ) +static int SpuHeapPush( spu_heap_t *p_heap, subpicture_t *p_subpic ) +{ + for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) { - msg_Err( p_spu, "subpicture heap is full" ); - vlc_mutex_unlock( &p_spu->subpicture_lock ); - return NULL; + spu_heap_entry_t *e = &p_heap->p_entry[i]; + + if( e->p_subpicture ) + continue; + + e->p_subpicture = p_subpic; + e->b_reject = false; + return VLC_SUCCESS; } + return VLC_EGENERIC; +} - /* Copy subpicture information, set some default values */ - memset( p_subpic, 0, sizeof(subpicture_t) ); - p_subpic->i_status = RESERVED_SUBPICTURE; - p_subpic->b_absolute = true; - p_subpic->b_fade = false; - p_subpic->b_subtitle = false; - p_subpic->i_alpha = 0xFF; - p_subpic->p_region = NULL; - p_subpic->pf_render = NULL; - p_subpic->pf_destroy = NULL; - p_subpic->p_sys = NULL; - vlc_mutex_unlock( &p_spu->subpicture_lock ); +static void SpuHeapDeleteAt( spu_heap_t *p_heap, int i_index ) +{ + spu_heap_entry_t *e = &p_heap->p_entry[i_index]; - p_subpic->pf_create_region = __spu_CreateRegion; - p_subpic->pf_make_region = __spu_MakeRegion; - p_subpic->pf_destroy_region = __spu_DestroyRegion; + if( e->p_subpicture ) + subpicture_Delete( e->p_subpicture ); - return p_subpic; + e->p_subpicture = NULL; } -/** - * Remove a subpicture from the heap - * - * This function frees a previously reserved subpicture. - * It is meant to be used when the construction of a picture aborted. - * This function does not need locking since reserved subpictures are ignored - * by the spu. - */ -void spu_DestroySubpicture( spu_t *p_spu, subpicture_t *p_subpic ) +static int SpuHeapDeleteSubpicture( spu_heap_t *p_heap, subpicture_t *p_subpic ) { - /* Get lock */ - vlc_mutex_lock( &p_spu->subpicture_lock ); - - /* There can be race conditions so we need to check the status */ - if( p_subpic->i_status == FREE_SUBPICTURE ) + for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) { - vlc_mutex_unlock( &p_spu->subpicture_lock ); - return; - } + spu_heap_entry_t *e = &p_heap->p_entry[i]; - /* Check if status is valid */ - if( ( p_subpic->i_status != RESERVED_SUBPICTURE ) - && ( p_subpic->i_status != READY_SUBPICTURE ) ) - { - msg_Err( p_spu, "subpicture %p has invalid status %d", - p_subpic, p_subpic->i_status ); + if( e->p_subpicture != p_subpic ) + continue; + + SpuHeapDeleteAt( p_heap, i ); + return VLC_SUCCESS; } + return VLC_EGENERIC; +} - while( p_subpic->p_region ) +static void SpuHeapClean( spu_heap_t *p_heap ) +{ + for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ ) { - subpicture_region_t *p_region = p_subpic->p_region; - p_subpic->p_region = p_region->p_next; - spu_DestroyRegion( p_spu, p_region ); + spu_heap_entry_t *e = &p_heap->p_entry[i]; + if( e->p_subpicture ) + subpicture_Delete( e->p_subpicture ); } +} - if( p_subpic->pf_destroy ) +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_subpic->pf_destroy( p_subpic ); + 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; - p_subpic->i_status = FREE_SUBPICTURE; + 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 ); - vlc_mutex_unlock( &p_spu->subpicture_lock ); + vlc_object_detach( p_filter ); + vlc_object_release( p_filter ); } -/***************************************************************************** - * spu_RenderSubpictures: render a subpicture list - ***************************************************************************** - * This function renders all sub picture units in the list. - *****************************************************************************/ static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_aspect ) { filter_t *p_blend; - assert( !p_spu->p_blend ); + assert( !p_spu->p->p_blend ); - p_spu->p_blend = + p_spu->p->p_blend = p_blend = vlc_custom_create( p_spu, sizeof(filter_t), VLC_OBJECT_GENERIC, "blend" ); if( !p_blend ) @@ -487,9 +922,10 @@ static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_asp /* */ vlc_object_attach( p_blend, p_spu ); } -static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_height, const video_format_t *p_in_fmt ) +static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_height, + const video_format_t *p_in_fmt ) { - filter_t *p_blend = p_spu->p_blend; + filter_t *p_blend = p_spu->p->p_blend; assert( p_blend ); @@ -498,7 +934,7 @@ static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_heigh { /* 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 ); + module_unneed( p_blend, p_blend->p_module ); p_blend->p_module = NULL; } @@ -513,15 +949,15 @@ static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_heigh /* */ if( !p_blend->p_module ) - p_blend->p_module = module_Need( p_blend, "video blending", 0, 0 ); + p_blend->p_module = module_need( p_blend, "video blending", 0, 0 ); } -static void SpuRenderCreateAndLoadText( spu_t *p_spu, int i_width, int i_height ) +static void SpuRenderCreateAndLoadText( spu_t *p_spu ) { filter_t *p_text; - assert( !p_spu->p_text ); + assert( !p_spu->p->p_text ); - p_spu->p_text = + p_spu->p->p_text = p_text = vlc_custom_create( p_spu, sizeof(filter_t), VLC_OBJECT_GENERIC, "spu text" ); if( !p_text ) @@ -531,30 +967,38 @@ static void SpuRenderCreateAndLoadText( spu_t *p_spu, int i_width, int i_height 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 = 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 = 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; vlc_object_attach( p_text, p_spu ); - /* FIXME TOCHECK shouldn't module_Need( , , psz_modulename, false ) do the + /* 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", + p_text->p_module = module_need( p_text, "text renderer", psz_modulename, true ); } free( psz_modulename ); if( !p_text->p_module ) - p_text->p_module = module_Need( p_text, "text renderer", NULL, false ); + p_text->p_module = module_need( p_text, "text renderer", NULL, false ); + + /* Create a few variables used for enhanced text rendering */ + var_Create( p_text, "spu-duration", VLC_VAR_TIME ); + var_Create( p_text, "spu-elapsed", VLC_VAR_TIME ); + var_Create( p_text, "text-rerender", VLC_VAR_BOOL ); + var_Create( p_text, "scale", VLC_VAR_INTEGER ); } -static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, vlc_fourcc_t i_chroma ) +static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, + vlc_fourcc_t i_src_chroma, vlc_fourcc_t i_dst_chroma, + bool b_resize ) { filter_t *p_scale; @@ -564,40 +1008,46 @@ static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, vlc_fourcc_t i_chroma return NULL; es_format_Init( &p_scale->fmt_in, VIDEO_ES, 0 ); - p_scale->fmt_in.video.i_chroma = i_chroma; + 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( &p_scale->fmt_out, VIDEO_ES, 0 ); - p_scale->fmt_out.video.i_chroma = i_chroma; + p_scale->fmt_out.video.i_chroma = i_dst_chroma; p_scale->fmt_out.video.i_width = - p_scale->fmt_out.video.i_height = 16; + 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; vlc_object_attach( p_scale, p_obj ); - p_scale->p_module = module_Need( p_scale, "video filter2", 0, 0 ); + p_scale->p_module = module_need( p_scale, "video filter2", 0, 0 ); return p_scale; } - static void SpuRenderCreateAndLoadScale( spu_t *p_spu ) { - /* FIXME: We'll also be using it for YUVA and RGBA blending ... */ - - assert( !p_spu->p_scale ); - assert( !p_spu->p_scale_yuvp ); - p_spu->p_scale = CreateAndLoadScale( VLC_OBJECT(p_spu), VLC_FOURCC('Y','U','V','A') ); - p_spu->p_scale_yuvp = p_spu->p_scale_yuvp = CreateAndLoadScale( VLC_OBJECT(p_spu), VLC_FOURCC('Y','U','V','P') ); + assert( !p_spu->p->p_scale ); + assert( !p_spu->p->p_scale_yuvp ); + /* XXX p_spu->p_scale is used for all conversion/scaling except yuvp to + * yuva/rgba */ + p_spu->p->p_scale = CreateAndLoadScale( VLC_OBJECT(p_spu), + VLC_FOURCC_YUVA, VLC_FOURCC_YUVA, true ); + /* This one is used for YUVP to YUVA/RGBA without scaling + * FIXME rename it */ + p_spu->p->p_scale_yuvp = CreateAndLoadScale( VLC_OBJECT(p_spu), + VLC_FOURCC_YUVP, VLC_FOURCC_YUVA, false ); } 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 ) + subpicture_t *p_subpic, subpicture_region_t *p_region, + int i_min_scale_ratio ) { - assert( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') ); + filter_t *p_text = p_spu->p->p_text; - if( !p_spu->p_text || !p_spu->p_text->p_module ) + assert( p_region->fmt.i_chroma == VLC_FOURCC_TEXT ); + + if( !p_text || !p_text->p_module ) goto exit; /* Setup 3 variables which can be used to render @@ -619,35 +1069,20 @@ 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 ); - /* FIXME why these variables are recreated every time and not - * when text renderer module was created ? */ - var_Create( p_spu->p_text, "spu-duration", VLC_VAR_TIME ); - var_Create( p_spu->p_text, "spu-elapsed", VLC_VAR_TIME ); - var_Create( p_spu->p_text, "text-rerender", VLC_VAR_BOOL ); - var_Create( p_spu->p_text, "scale", VLC_VAR_INTEGER ); - - var_SetTime( p_spu->p_text, "spu-duration", p_subpic->i_stop - p_subpic->i_start ); - var_SetTime( p_spu->p_text, "spu-elapsed", mdate() - p_subpic->i_start ); - var_SetBool( p_spu->p_text, "text-rerender", false ); - var_SetInteger( p_spu->p_text, "scale", i_min_scale_ratio ); - - if( p_spu->p_text->pf_render_html && p_region->psz_html ) + if( p_text->pf_render_html && p_region->psz_html ) { - p_spu->p_text->pf_render_html( p_spu->p_text, - p_region, p_region ); + p_text->pf_render_html( p_text, p_region, p_region ); } - else if( p_spu->p_text->pf_render_text ) + else if( p_text->pf_render_text ) { - p_spu->p_text->pf_render_text( p_spu->p_text, - p_region, p_region ); + p_text->pf_render_text( p_text, p_region, p_region ); } - *pb_rerender_text = var_GetBool( p_spu->p_text, "text-rerender" ); - - var_Destroy( p_spu->p_text, "spu-duration" ); - var_Destroy( p_spu->p_text, "spu-elapsed" ); - var_Destroy( p_spu->p_text, "text-rerender" ); - var_Destroy( p_spu->p_text, "scale" ); + *pb_rerender_text = var_GetBool( p_text, "text-rerender" ); exit: p_region->i_align |= SUBPICTURE_RENDERED; @@ -656,12 +1091,6 @@ exit: /** * A few scale functions helpers. */ -typedef struct -{ - int w; - int h; -} spu_scale_t; - static spu_scale_t spu_scale_create( int w, int h ) { spu_scale_t s = { .w = w, .h = h }; @@ -671,6 +1100,10 @@ static spu_scale_t spu_scale_create( int w, int h ) s.h = SCALE_UNIT; return s; } +static spu_scale_t spu_scale_unit( void ) +{ + return spu_scale_create( SCALE_UNIT, SCALE_UNIT ); +} static spu_scale_t spu_scale_createq( int wn, int wd, int hn, int hd ) { return spu_scale_create( wn * SCALE_UNIT / wd, @@ -684,30 +1117,149 @@ static int spu_scale_h( int v, const spu_scale_t s ) { return v * s.h / SCALE_UNIT; } +static int spu_invscale_w( int v, const spu_scale_t s ) +{ + return v * SCALE_UNIT / s.w; +} +static int spu_invscale_h( int v, const spu_scale_t s ) +{ + return v * SCALE_UNIT / s.h; +} + +/** + * A few area functions helpers + */ +static spu_area_t spu_area_create( int x, int y, int w, int h, spu_scale_t s ) +{ + spu_area_t a = { .i_x = x, .i_y = y, .i_width = w, .i_height = h, .scale = s }; + return a; +} +static spu_area_t spu_area_scaled( spu_area_t a ) +{ + 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.scale = spu_scale_unit(); + return a; +} +static spu_area_t spu_area_unscaled( spu_area_t a, spu_scale_t s ) +{ + if( a.scale.w == s.w && a.scale.h == s.h ) + return a; + + a = spu_area_scaled( a ); + + a.i_x = spu_invscale_w( a.i_x, s ); + a.i_y = spu_invscale_h( a.i_y, s ); + + a.i_width = spu_invscale_w( a.i_width, s ); + a.i_height = spu_invscale_h( a.i_height, s ); + + a.scale = s; + return a; +} +static bool spu_area_overlap( spu_area_t a, spu_area_t b ) +{ + const int i_dx = 0; + const int i_dy = 0; + + a = spu_area_scaled( a ); + b = spu_area_scaled( b ); + + return __MAX( a.i_x-i_dx, b.i_x ) < __MIN( a.i_x+a.i_width +i_dx, b.i_x+b.i_width ) && + __MAX( a.i_y-i_dy, b.i_y ) < __MIN( a.i_y+a.i_height+i_dy, b.i_y+b.i_height ); +} + +/** + * 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 + { + 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 ) ) + continue; + + if( i_align & SUBPICTURE_ALIGN_TOP ) + { + /* We go down */ + int i_y = sub.i_y + sub.i_height; + if( i_y + a.i_height > p_master->i_height ) + break; + a.i_y = i_y; + b_moved = true; + } + else if( i_align & SUBPICTURE_ALIGN_BOTTOM ) + { + /* We go up */ + int i_y = sub.i_y - a.i_height; + if( i_y < 0 ) + break; + a.i_y = i_y; + b_moved = true; + } + else + { + /* TODO what to do in this case? */ + //fprintf( stderr, "Overlap with unsupported alignment\n" ); + break; + } + + b_ok = false; + break; + } + } while( !b_ok ); + + if( b_moved ) + *p_dst = spu_area_unscaled( a, p_dst->scale ); +} + /** * Place a region */ static void SpuRegionPlace( int *pi_x, int *pi_y, - const video_format_t *p_fmt, const subpicture_t *p_subpic, - const subpicture_region_t *p_region ) + const subpicture_region_t *p_region, + int i_margin_y ) { - int i_delta_x = p_region->i_x; - int i_delta_y = p_region->i_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_fmt->i_height - p_region->fmt.i_height - i_delta_y; + i_y = p_subpic->i_original_picture_height - p_region->fmt.i_height - i_delta_y; } else { - i_y = p_fmt->i_height / 2 - p_region->fmt.i_height / 2; + i_y = p_subpic->i_original_picture_height / 2 - p_region->fmt.i_height / 2; } if( p_region->i_align & SUBPICTURE_ALIGN_LEFT ) @@ -716,11 +1268,11 @@ static void SpuRegionPlace( int *pi_x, int *pi_y, } else if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT ) { - i_x = p_fmt->i_width - p_region->fmt.i_width - i_delta_x; + i_x = p_subpic->i_original_picture_width - p_region->fmt.i_width - i_delta_x; } else { - i_x = p_fmt->i_width / 2 - p_region->fmt.i_width / 2; + i_x = p_subpic->i_original_picture_width / 2 - p_region->fmt.i_width / 2; } if( p_subpic->b_absolute ) @@ -728,8 +1280,21 @@ static void SpuRegionPlace( int *pi_x, int *pi_y, i_x = i_delta_x; 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; @@ -737,31 +1302,62 @@ static void SpuRegionPlace( int *pi_x, int *pi_y, *pi_y = i_y; } +/** + * 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 ); + } + } + return i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025; +} + +/** + * It will render the provided region onto p_pic_dst. + */ + static void SpuRenderRegion( spu_t *p_spu, - picture_t *p_pic_dst, + 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 video_format_t *p_fmt, + const spu_area_t *p_subtitle_area, int i_subtitle_area ) { - video_format_t fmt_original; - bool b_rerender_text; + 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_fade_alpha; int i_x_offset; int i_y_offset; - filter_t *p_scale; - vlc_assert_locked( &p_spu->subpicture_lock ); + video_format_t region_fmt; + picture_t *p_region_picture; - fmt_original = p_region->fmt; - b_rerender_text = false; - if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') ) + /* Invalidate area by default */ + *p_area = spu_area_create( 0,0, 0,0, scale_size ); + + /* Render text region */ + if( p_region->fmt.i_chroma == VLC_FOURCC_TEXT ) { - SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, SCALE_UNIT ); + 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; /* Check if the rendering has failed ... */ - if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') ) + if( p_region->fmt.i_chroma == VLC_FOURCC_TEXT ) goto exit; } @@ -769,140 +1365,199 @@ static void SpuRenderRegion( spu_t *p_spu, * FIXME b_force_palette and b_force_crop are applied to all subpictures using palette * instead of only the right one (being the dvd spu). */ - const bool b_using_palette = p_region->fmt.i_chroma == VLC_FOURCC('Y','U','V','P'); - const bool b_force_palette = b_using_palette && p_spu->b_force_palette; - const bool b_force_crop = b_force_palette && p_spu->b_force_crop; + const bool b_using_palette = p_region->fmt.i_chroma == VLC_FOURCC_YUVP; + const bool b_force_palette = b_using_palette && p_sys->b_force_palette; + const bool b_force_crop = b_force_palette && p_sys->b_force_crop; + bool b_changed_palette = false; + + + /* Compute the margin which is expressed in destination pixel unit + * The margin is applied only to subtitle and when no forced crop is + * requested (dvd menu) */ + int i_margin_y = 0; + if( !b_force_crop && p_subpic->b_subtitle ) + i_margin_y = spu_invscale_h( p_sys->i_margin, scale_size ); + + /* 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 ); + + /* Save this position for subtitle overlap support + * it is really important that there are given without scale_size applied */ + *p_area = spu_area_create( i_x_offset, i_y_offset, + p_region->fmt.i_width, p_region->fmt.i_height, + scale_size ); + + /* Handle overlapping subtitles when possible */ + if( p_subpic->b_subtitle && !p_subpic->b_absolute ) + { + 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, + p_region->i_align ); + } + /* 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 ); + + /* */ if( b_force_palette ) { - /* It looks so wrong I won't comment - * p_palette->palette is [256][4] with a int i_entries - * p_spu->palette is [4][4] - * */ - p_region->fmt.p_palette->i_entries = 4; - memcpy( p_region->fmt.p_palette->palette, p_spu->palette, 4*sizeof(uint32_t) ); + video_palette_t *p_palette = p_region->fmt.p_palette; + video_palette_t palette; + + /* We suppose DVD palette here */ + palette.i_entries = 4; + for( int i = 0; i < 4; i++ ) + for( int j = 0; j < 4; j++ ) + palette.palette[i][j] = p_sys->palette[i][j]; + + if( p_palette->i_entries == palette.i_entries ) + { + for( int i = 0; i < p_palette->i_entries; i++ ) + for( int j = 0; j < 4; j++ ) + b_changed_palette |= p_palette->palette[i][j] != palette.palette[i][j]; + } + else + { + b_changed_palette = true; + } + *p_palette = palette; } - if( b_using_palette ) - p_scale = p_spu->p_scale_yuvp; - else - p_scale = p_spu->p_scale; + /* */ + region_fmt = p_region->fmt; + p_region_picture = p_region->p_picture; + - if( p_scale && - ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_force_palette ) ) + /* 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 ); - /* Destroy if cache is unusable */ - if( p_region->p_cache ) - { - if( p_region->p_cache->fmt.i_width != i_dst_width || - p_region->p_cache->fmt.i_height != i_dst_height || - b_force_palette ) + /* Destroy the cache if unusable */ + if( p_region->p_private ) + { + subpicture_region_private_t *p_private = p_region->p_private; + bool b_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; + + /* Check forced palette changes */ + if( b_changed_palette ) + b_changed = true; + + if( b_changed ) { - p_subpic->pf_destroy_region( VLC_OBJECT(p_spu), - p_region->p_cache ); - p_region->p_cache = NULL; + SpuRegionPrivateDelete( p_private ); + p_region->p_private = NULL; } } /* Scale if needed into cache */ - if( !p_region->p_cache ) + if( !p_region->p_private && i_dst_width > 0 && i_dst_height > 0 ) { - picture_t *p_pic; - - p_scale->fmt_in.video = p_region->fmt; - p_scale->fmt_out.video = p_region->fmt; - - p_region->p_cache = - p_subpic->pf_create_region( VLC_OBJECT(p_spu), - &p_scale->fmt_out.video ); - p_region->p_cache->p_next = p_region->p_next; - - if( p_scale->fmt_out.video.p_palette ) - *p_scale->fmt_out.video.p_palette = - *p_region->fmt.p_palette; + filter_t *p_scale = p_sys->p_scale; - vout_CopyPicture( p_spu, &p_region->p_cache->picture, - &p_region->picture ); + picture_t *p_picture = p_region->p_picture; + picture_Hold( p_picture ); - p_scale->fmt_out.video.i_width = i_dst_width; - p_scale->fmt_out.video.i_height = i_dst_height; + /* Convert YUVP to YUVA/RGBA first for better scaling quality */ + if( b_using_palette ) + { + filter_t *p_scale_yuvp = p_sys->p_scale_yuvp; + + p_scale_yuvp->fmt_in.video = p_region->fmt; + + /* TODO converting to RGBA for RGB video output is better */ + p_scale_yuvp->fmt_out.video = p_region->fmt; + p_scale_yuvp->fmt_out.video.i_chroma = VLC_FOURCC_YUVA; + + p_picture = p_scale_yuvp->pf_video_filter( p_scale_yuvp, p_picture ); + if( !p_picture ) + { + /* Well we will try conversion+scaling */ + msg_Warn( p_spu, "%4.4s to %4.4s conversion failed", + (const char*)&p_scale_yuvp->fmt_in.video.i_chroma, + (const char*)&p_scale_yuvp->fmt_out.video.i_chroma ); + } + } - 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 ); + /* Conversion(except from YUVP)/Scaling */ + if( p_picture && + ( p_picture->format.i_width != i_dst_width || + p_picture->format.i_height != i_dst_height ) ) + { + p_scale->fmt_in.video = p_picture->format; + p_scale->fmt_out.video = p_picture->format; - p_region->p_cache->fmt = p_scale->fmt_out.video; - p_region->p_cache->i_x = spu_scale_w( p_region->i_x, scale_size ); - p_region->p_cache->i_y = spu_scale_h( p_region->i_y, scale_size ); - p_region->p_cache->i_align = p_region->i_align; - p_region->p_cache->i_alpha = p_region->i_alpha; + p_scale->fmt_out.video.i_width = i_dst_width; + p_scale->fmt_out.video.i_height = i_dst_height; - p_pic = NULL; - if( p_scale->p_module ) - p_pic = p_scale->pf_video_filter( p_scale, &p_region->p_cache->picture ); - else - msg_Err( p_spu, "scaling failed (module not loaded)" ); + 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 ); - if( p_pic ) - { - p_region->p_cache->picture = *p_pic; - free( p_pic ); + p_picture = p_scale->pf_video_filter( p_scale, p_picture ); + if( !p_picture ) + msg_Err( p_spu, "scaling failed" ); } - else + + /* */ + if( p_picture ) { - p_subpic->pf_destroy_region( VLC_OBJECT(p_spu), - p_region->p_cache ); - p_region->p_cache = NULL; + p_region->p_private = SpuRegionPrivateNew( &p_picture->format ); + if( p_region->p_private ) + { + p_region->p_private->p_picture = p_picture; + if( !p_region->p_private->p_picture ) + { + SpuRegionPrivateDelete( p_region->p_private ); + p_region->p_private = NULL; + } + } + else + { + picture_Release( p_picture ); + } } } /* And use the scaled picture */ - if( p_region->p_cache ) + if( p_region->p_private ) { - p_region = p_region->p_cache; - fmt_original = p_region->fmt; + region_fmt = p_region->p_private->fmt; + p_region_picture = p_region->p_private->p_picture; } } - /* */ - SpuRegionPlace( &i_x_offset, &i_y_offset, - p_fmt, p_subpic, p_region ); - - if( p_spu->i_margin != 0 && !b_force_crop ) - { - int i_diff = 0; - int i_low = i_y_offset - p_spu->i_margin; - int i_high = i_low + p_region->fmt.i_height; - - /* crop extra margin to keep within bounds */ - if( i_low < 0 ) - i_diff = i_low; - if( i_high > (int)p_fmt->i_height ) - i_diff = i_high - p_fmt->i_height; - i_y_offset -= p_spu->i_margin + i_diff; - } - /* Force cropping if requested */ if( b_force_crop ) { - video_format_t *p_fmt = &p_region->fmt; - int i_crop_x = spu_scale_w( p_spu->i_crop_x, scale_size ); - int i_crop_y = spu_scale_h( p_spu->i_crop_y, scale_size ); - int i_crop_width = spu_scale_w( p_spu->i_crop_width, scale_size ); - int i_crop_height= spu_scale_h( p_spu->i_crop_height,scale_size ); + 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 ); /* Find the intersection */ if( i_crop_x + i_crop_width <= i_x_offset || - i_x_offset + (int)p_fmt->i_visible_width < i_crop_x || + 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)p_fmt->i_visible_height < i_crop_y ) + i_y_offset + (int)region_fmt.i_visible_height < i_crop_y ) { /* No intersection */ - p_fmt->i_visible_width = p_fmt->i_visible_height = 0; + region_fmt.i_visible_width = + region_fmt.i_visible_height = 0; } else { @@ -910,52 +1565,35 @@ static void SpuRenderRegion( spu_t *p_spu, 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)p_fmt->i_visible_width ); + i_x_offset + (int)region_fmt.i_visible_width ); i_y_end = __MIN( i_crop_y + i_crop_height, - i_y_offset + (int)p_fmt->i_visible_height ); - - p_fmt->i_x_offset = i_x - i_x_offset; - p_fmt->i_y_offset = i_y - i_y_offset; - p_fmt->i_visible_width = i_x_end - i_x; - p_fmt->i_visible_height = i_y_end - i_y; - - i_x_offset = i_x; - i_y_offset = i_y; - } - b_restore_format = true; - } + i_y_offset + (int)region_fmt.i_visible_height ); - i_x_offset = __MAX( i_x_offset, 0 ); - i_y_offset = __MAX( i_y_offset, 0 ); + 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; - /* Compute alpha blend value */ - 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 ); + i_x_offset = __MAX( i_x, 0 ); + i_y_offset = __MAX( i_y, 0 ); } } /* Update the blender */ - SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, &p_region->fmt ); + SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, ®ion_fmt ); - if( p_spu->p_blend->p_module ) + if( p_sys->p_blend->p_module ) { - p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst, - &p_region->picture, i_x_offset, i_y_offset, - i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025 ); + 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_spu->p_blend->fmt_out.video.i_chroma, - (char *)&p_spu->p_blend->fmt_out.video.i_chroma ); + (char *)&p_sys->p_blend->fmt_out.video.i_chroma, + (char *)&p_sys->p_blend->fmt_out.video.i_chroma ); } exit: @@ -966,258 +1604,52 @@ exit: * pre-rendered state, so the next time through everything is * calculated again. */ - p_region->picture.pf_release( &p_region->picture ); - memset( &p_region->picture, 0, sizeof( picture_t ) ); + picture_Release( p_region->p_picture ); + p_region->p_picture = NULL; + if( p_region->p_private ) + { + SpuRegionPrivateDelete( p_region->p_private ); + p_region->p_private = NULL; + } p_region->i_align &= ~SUBPICTURE_RENDERED; } if( b_restore_format ) p_region->fmt = fmt_original; } -void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt_a, - picture_t *p_pic_dst, - subpicture_t *p_subpic_list, - int i_scale_width_orig, int i_scale_height_orig ) +/** + * This function compares two 64 bits integers. + * It can be used by qsort. + */ +static int IntegerCmp( int64_t i0, int64_t i1 ) { - video_format_t fmt = *p_fmt_a, *p_fmt = &fmt; - const mtime_t i_current_date = mdate(); - int i_source_video_width; - int i_source_video_height; - subpicture_t *p_subpic; - spu_scale_t scale_size_org; - - /* Get lock */ - vlc_mutex_lock( &p_spu->subpicture_lock ); - - /* Be sure we have at least 1 picture to process */ - if( !p_subpic_list || p_subpic_list->i_status == FREE_SUBPICTURE ) - { - vlc_mutex_unlock( &p_spu->subpicture_lock ); - return; - } - - scale_size_org = spu_scale_create( i_scale_width_orig, i_scale_height_orig ); - - i_source_video_width = p_fmt->i_width * SCALE_UNIT / scale_size_org.w; - i_source_video_height = p_fmt->i_height * SCALE_UNIT / scale_size_org.h; - - /* */ - for( p_subpic = p_subpic_list; - p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE; /* Check again status (as we where unlocked) */ - p_subpic = p_subpic->p_next ) - { - /* */ - if( p_subpic->pf_pre_render ) - p_subpic->pf_pre_render( p_fmt, p_spu, p_subpic ); - - if( p_subpic->pf_update_regions ) - { - /* TODO do not reverse the scaling that was done before calling - * spu_RenderSubpictures, just pass it along (or do it inside - * spu_RenderSubpictures) */ - video_format_t fmt_org = *p_fmt; - 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( &fmt_org, p_spu, p_subpic, i_current_date ); - } - } - - /* Create the blending module */ - if( !p_spu->p_blend ) - SpuRenderCreateBlend( p_spu, p_fmt->i_chroma, p_fmt->i_aspect ); - - /* Load the scaling module */ - if( !p_spu->p_scale && !p_spu->p_scale_yuvp ) - SpuRenderCreateAndLoadScale( p_spu ); - - /* Load the text rendering module; it is possible there is a - * text region somewhere in the subpicture other than the first - * element in the region list, so just load it anyway as we'll - * probably want it sooner or later. */ - if( !p_spu->p_text ) - SpuRenderCreateAndLoadText( p_spu, p_fmt->i_width, p_fmt->i_height ); - - /* */ - for( p_subpic = p_subpic_list; ; p_subpic = p_subpic->p_next ) - { - subpicture_region_t *p_region; - - if( !p_subpic || p_subpic->i_status == FREE_SUBPICTURE ) - break; - - 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 ); - - i_render_width = i_source_video_width; - i_render_height = i_source_video_height; - } - - if( p_spu->p_text ) - { - p_spu->p_text->fmt_out.video.i_width = - p_spu->p_text->fmt_out.video.i_visible_width = i_render_width; - - p_spu->p_text->fmt_out.video.i_height = - p_spu->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) */ - scale.w = scale.w * p_fmt->i_width / i_source_video_width; - scale.h = scale.h * p_fmt->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->i_sar_den; - p_region->fmt.i_sar_num = p_fmt->i_sar_num; - } - } - - /* Take care of the aspect ratio */ - if( p_region->fmt.i_sar_num * p_fmt->i_sar_den != - p_region->fmt.i_sar_den * p_fmt->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->i_sar_den / - p_region->fmt.i_sar_den / p_fmt->i_sar_num; - } - - /* Render all regions */ - for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next ) - { - /* Check scale validity */ - if( scale.w <= 0 || scale.h <= 0 ) - continue; - - /* */ - SpuRenderRegion( p_spu, p_pic_dst, p_subpic, p_region, - scale, p_fmt ); - } - } - - vlc_mutex_unlock( &p_spu->subpicture_lock ); + return i0 < i1 ? -1 : i0 > i1 ? 1 : 0; } - -/***************************************************************************** - * spu_SortSubpictures: find the subpictures to display - ***************************************************************************** - * This function parses all subpictures and decides which ones need to be - * displayed. This operation does not need lock, since only READY_SUBPICTURE - * are handled. If no picture has been selected, display_date will depend on - * the subpicture. - * We also check for ephemer DVD subpictures (subpictures that have - * to be removed if a newer one is available), which makes it a lot - * more difficult to guess if a subpicture has to be rendered or not. - *****************************************************************************/ -subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, - bool b_paused, bool b_subtitle_only ) +/** + * 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 ) { - int i_channel; - subpicture_t *p_subpic = NULL; - - /* Run subpicture filters */ - filter_chain_SubFilter( p_spu->p_chain, display_date ); - - /* We get an easily parsable chained list of subpictures which - * ends with NULL since p_subpic was initialized to NULL. */ - for( i_channel = 0; i_channel < p_spu->i_channel; i_channel++ ) - { - subpicture_t *p_ephemer = NULL; - mtime_t ephemer_date = 0; - int i_index; - - for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ ) - { - subpicture_t *p_current = &p_spu->p_subpicture[i_index]; - - if( p_current->i_channel != i_channel || - p_current->i_status != READY_SUBPICTURE || - ( b_subtitle_only && !p_current->b_subtitle ) ) - { - continue; - } - if( display_date && - display_date < p_current->i_start ) - { - /* Too early, come back next monday */ - continue; - } - - if( p_current->i_start > ephemer_date ) - ephemer_date = p_current->i_start; - - if( display_date > p_current->i_stop && - ( !p_current->b_ephemer || p_current->i_stop > p_current->i_start ) && - !( p_current->b_subtitle && b_paused ) ) /* XXX Assume that subtitle are pausable */ - { - /* Too late, destroy the subpic */ - spu_DestroySubpicture( p_spu, &p_spu->p_subpicture[i_index] ); - continue; - } - - /* If this is an ephemer subpic, add it to our list */ - if( p_current->b_ephemer ) - { - p_current->p_next = p_ephemer; - p_ephemer = p_current; - - continue; - } - - p_current->p_next = p_subpic; - p_subpic = p_current; - } - - /* If we found ephemer subpictures, check if they have to be - * displayed or destroyed */ - while( p_ephemer != NULL ) - { - subpicture_t *p_tmp = p_ephemer; - p_ephemer = p_ephemer->p_next; - - if( p_tmp->i_start < ephemer_date ) - { - /* Ephemer subpicture has lived too long */ - spu_DestroySubpicture( p_spu, p_tmp ); - } - else - { - /* Ephemer subpicture can still live a bit */ - p_tmp->p_next = p_subpic; - p_subpic = p_tmp; - } - } - } - - return p_subpic; + subpicture_t *p_subpic0 = *(subpicture_t**)s0; + subpicture_t *p_subpic1 = *(subpicture_t**)s1; + int r; + + 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; } /***************************************************************************** @@ -1228,55 +1660,46 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, *****************************************************************************/ static void SpuClearChannel( spu_t *p_spu, int i_channel, bool b_locked ) { + spu_private_t *p_sys = p_spu->p; int i_subpic; /* subpicture index */ - subpicture_t *p_subpic = NULL; /* first free subpicture */ if( !b_locked ) - vlc_mutex_lock( &p_spu->subpicture_lock ); + vlc_mutex_lock( &p_sys->lock ); + + vlc_assert_locked( &p_sys->lock ); for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ ) { - p_subpic = &p_spu->p_subpicture[i_subpic]; - if( p_subpic->i_status == FREE_SUBPICTURE - || ( p_subpic->i_status != RESERVED_SUBPICTURE - && p_subpic->i_status != READY_SUBPICTURE ) ) - { - continue; - } + spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_subpic]; + subpicture_t *p_subpic = p_entry->p_subpicture; - if( p_subpic->i_channel == i_channel ) - { - while( p_subpic->p_region ) - { - subpicture_region_t *p_region = p_subpic->p_region; - p_subpic->p_region = p_region->p_next; - spu_DestroyRegion( p_spu, p_region ); - } + if( !p_subpic || p_subpic->i_channel != i_channel ) + continue; - if( p_subpic->pf_destroy ) p_subpic->pf_destroy( p_subpic ); - p_subpic->i_status = FREE_SUBPICTURE; - } + /* You cannot delete subpicture outside of spu_SortSubpictures */ + p_entry->b_reject = true; } if( !b_locked ) - vlc_mutex_unlock( &p_spu->subpicture_lock ); + vlc_mutex_unlock( &p_sys->lock ); } /***************************************************************************** * spu_ControlDefault: default methods for the subpicture unit control. *****************************************************************************/ -static int spu_vaControlDefault( spu_t *p_spu, int i_query, va_list args ) +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_spu->subpicture_lock ); + vlc_mutex_lock( &p_sys->lock ); if( pi ) - *pi = p_spu->i_channel++; - vlc_mutex_unlock( &p_spu->subpicture_lock ); + *pi = p_sys->i_channel++; + vlc_mutex_unlock( &p_sys->lock ); break; case SPU_CHANNEL_CLEAR: @@ -1304,40 +1727,37 @@ static int spu_vaControlDefault( spu_t *p_spu, int i_query, va_list args ) *****************************************************************************/ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) { + spu_private_t *p_sys = p_spu->p; vlc_value_t val; - vlc_mutex_lock( &p_spu->subpicture_lock ); + vlc_mutex_lock( &p_sys->lock ); - p_spu->b_force_palette = false; - p_spu->b_force_crop = false; + p_sys->b_force_palette = false; + p_sys->b_force_crop = false; if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) { - vlc_mutex_unlock( &p_spu->subpicture_lock ); + vlc_mutex_unlock( &p_sys->lock ); return; } - p_spu->b_force_crop = true; - var_Get( p_object, "x-start", &val ); - p_spu->i_crop_x = val.i_int; - var_Get( p_object, "y-start", &val ); - p_spu->i_crop_y = val.i_int; - var_Get( p_object, "x-end", &val ); - p_spu->i_crop_width = val.i_int - p_spu->i_crop_x; - var_Get( p_object, "y-end", &val ); - p_spu->i_crop_height = val.i_int - p_spu->i_crop_y; + 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; if( var_Get( p_object, "menu-palette", &val ) == VLC_SUCCESS ) { - memcpy( p_spu->palette, val.p_address, 16 ); - p_spu->b_force_palette = true; + memcpy( p_sys->palette, val.p_address, 16 ); + p_sys->b_force_palette = true; } - vlc_mutex_unlock( &p_spu->subpicture_lock ); + vlc_mutex_unlock( &p_sys->lock ); msg_Dbg( p_object, "crop: %i,%i,%i,%i, palette forced: %i", - p_spu->i_crop_x, p_spu->i_crop_y, - p_spu->i_crop_width, p_spu->i_crop_height, - p_spu->b_force_palette ); + 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 ); } /***************************************************************************** @@ -1348,7 +1768,8 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) static int CropCallback( vlc_object_t *p_object, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - (void)psz_var; (void)oldval; (void)newval; + VLC_UNUSED(oldval); VLC_UNUSED(newval); VLC_UNUSED(psz_var); + UpdateSPU( (spu_t *)p_data, p_object ); return VLC_SUCCESS; } @@ -1356,101 +1777,63 @@ static int CropCallback( vlc_object_t *p_object, char const *psz_var, /***************************************************************************** * 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 ) { filter_owner_sys_t *p_sys = p_filter->p_owner; - subpicture_t *p_subpicture = spu_CreateSubpicture( p_sys->p_spu ); - if( p_subpicture ) p_subpicture->i_channel = p_sys->i_channel; + + subpicture_t *p_subpicture = subpicture_New(); + if( p_subpicture ) + p_subpicture->i_channel = p_sys->i_channel; return p_subpicture; } - static void sub_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) { - filter_owner_sys_t *p_sys = p_filter->p_owner; - spu_DestroySubpicture( p_sys->p_spu, p_subpic ); + VLC_UNUSED( p_filter ); + subpicture_Delete( p_subpic ); } static subpicture_t *spu_new_buffer( filter_t *p_filter ) { - (void)p_filter; - subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t)); - if( !p_subpic ) return NULL; - memset( p_subpic, 0, sizeof(subpicture_t) ); - p_subpic->b_absolute = true; - - p_subpic->pf_create_region = __spu_CreateRegion; - p_subpic->pf_make_region = __spu_MakeRegion; - p_subpic->pf_destroy_region = __spu_DestroyRegion; - - return p_subpic; + VLC_UNUSED(p_filter); + return subpicture_New(); } - static void spu_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) { - while( p_subpic->p_region ) - { - subpicture_region_t *p_region = p_subpic->p_region; - p_subpic->p_region = p_region->p_next; - p_subpic->pf_destroy_region( VLC_OBJECT(p_filter), p_region ); - } - - free( p_subpic ); + VLC_UNUSED(p_filter); + subpicture_Delete( p_subpic ); } static picture_t *spu_new_video_buffer( filter_t *p_filter ) { - picture_t *p_picture = malloc( sizeof(picture_t) ); - if( !p_picture ) return NULL; - if( vout_AllocatePicture( p_filter, p_picture, - p_filter->fmt_out.video.i_chroma, - p_filter->fmt_out.video.i_width, - p_filter->fmt_out.video.i_height, - p_filter->fmt_out.video.i_aspect ) - != VLC_SUCCESS ) - { - free( p_picture ); - return NULL; - } + const video_format_t *p_fmt = &p_filter->fmt_out.video; - p_picture->pf_release = RegionPictureRelease; - - return p_picture; + VLC_UNUSED(p_filter); + return picture_New( p_fmt->i_chroma, + p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect ); } - -static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_pic ) +static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_picture ) { - (void)p_filter; - if( p_pic ) - { - free( p_pic->p_data_orig ); - free( p_pic ); - } + VLC_UNUSED(p_filter); + picture_Release( p_picture ); } -static int SubFilterCallback( vlc_object_t *p_object, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int SubFilterAllocationInit( filter_t *p_filter, void *p_data ) { - VLC_UNUSED(p_object); VLC_UNUSED(oldval); - VLC_UNUSED(newval); VLC_UNUSED(psz_var); - - spu_t *p_spu = (spu_t *)p_data; - vlc_mutex_lock( &p_spu->subpicture_lock ); - filter_chain_Reset( p_spu->p_chain, NULL, NULL ); - spu_ParseChain( p_spu ); - vlc_mutex_unlock( &p_spu->subpicture_lock ); - return VLC_SUCCESS; -} + spu_t *p_spu = p_data; -static int sub_filter_allocation_init( filter_t *p_filter, void *p_data ) -{ - spu_t *p_spu = (spu_t *)p_data; + filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) ); + if( !p_sys ) + return VLC_EGENERIC; p_filter->pf_sub_buffer_new = sub_new_buffer; p_filter->pf_sub_buffer_del = sub_del_buffer; - filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) ); - if( !p_sys ) return VLC_EGENERIC; - p_filter->p_owner = p_sys; spu_Control( p_spu, SPU_CHANNEL_REGISTER, &p_sys->i_channel ); p_sys->p_spu = p_spu; @@ -1458,9 +1841,27 @@ static int sub_filter_allocation_init( filter_t *p_filter, void *p_data ) return VLC_SUCCESS; } -static void sub_filter_allocation_clear( filter_t *p_filter ) +static void SubFilterAllocationClean( filter_t *p_filter ) { filter_owner_sys_t *p_sys = p_filter->p_owner; + SpuClearChannel( p_sys->p_spu, p_sys->i_channel, true ); free( p_filter->p_owner ); } + +static int SubFilterCallback( vlc_object_t *p_object, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + spu_t *p_spu = p_data; + spu_private_t *p_sys = p_spu->p; + + VLC_UNUSED(p_object); VLC_UNUSED(oldval); + VLC_UNUSED(newval); VLC_UNUSED(psz_var); + + vlc_mutex_lock( &p_sys->lock ); + filter_chain_Reset( p_sys->p_chain, NULL, NULL ); + spu_ParseChain( p_spu ); + vlc_mutex_unlock( &p_sys->lock ); + return VLC_SUCCESS; +} +