/*****************************************************************************
* 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 *, subpicture_region_t *,
const spu_scale_t scale_size,
const video_format_t *p_fmt,
- const spu_area_t *p_subtitle_area, int i_subtitle_area );
+ const spu_area_t *p_subtitle_area, int i_subtitle_area,
+ mtime_t render_date );
static void UpdateSPU ( spu_t *, vlc_object_t * );
static int CropCallback( vlc_object_t *, char const *,
void spu_RenderSubpictures( spu_t *p_spu,
picture_t *p_pic_dst, const video_format_t *p_fmt_dst,
subpicture_t *p_subpic_list,
- const video_format_t *p_fmt_src, bool b_paused )
+ const video_format_t *p_fmt_src,
+ mtime_t render_date )
{
spu_private_t *p_sys = p_spu->p;
+ const mtime_t system_date = mdate();
+
const int i_source_video_width = p_fmt_src->i_width;
const int i_source_video_height = p_fmt_src->i_height;
- const mtime_t i_current_date = mdate();
unsigned int i_subpicture;
subpicture_t *pp_subpicture[VOUT_MAX_SUBPICTURES];
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 )
+ if( p_subpic->pf_update_regions )
{
video_format_t fmt_org = *p_fmt_dst;
fmt_org.i_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 );
+ p_subpic->pf_update_regions( p_spu, p_subpic, &fmt_org,
+ p_subpic->b_subtitle ? render_date : system_date );
}
/* */
/* Create the blending module */
if( !p_sys->p_blend )
- p_spu->p->p_blend = filter_NewBlend( VLC_OBJECT(p_spu), p_fmt_dst->i_chroma );
+ p_spu->p->p_blend = filter_NewBlend( VLC_OBJECT(p_spu), p_fmt_dst );
/* Process all subpictures and regions (in the right order) */
for( unsigned int i_index = 0; i_index < i_subpicture; i_index++ )
/* */
SpuRenderRegion( p_spu, p_pic_dst, &area,
p_subpic, p_region, scale, p_fmt_dst,
- p_subtitle_area, i_subtitle_area );
+ p_subtitle_area, i_subtitle_area,
+ p_subpic->b_subtitle ? render_date : system_date );
if( p_subpic->b_subtitle )
{
* to be removed if a newer one is available), which makes it a lot
* more difficult to guess if a subpicture has to be rendered or not.
*****************************************************************************/
-subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date,
- bool b_paused, bool b_subtitle_only )
+subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t render_date,
+ bool b_subtitle_only )
{
spu_private_t *p_sys = p_spu->p;
int i_channel;
subpicture_t *p_subpic = NULL;
+ const mtime_t system_date = mdate();
/* Update sub-filter chain */
vlc_mutex_lock( &p_sys->lock );
}
/* Run subpicture filters */
- filter_chain_SubFilter( p_sys->p_chain, display_date );
+ filter_chain_SubFilter( p_sys->p_chain, render_date );
vlc_mutex_lock( &p_sys->lock );
bool pb_available_late[VOUT_MAX_SUBPICTURES];
int i_available = 0;
- mtime_t start_date = display_date;
- mtime_t ephemer_date = 0;
+ mtime_t start_date = render_date;
+ mtime_t ephemer_subtitle_date = 0;
+ mtime_t ephemer_system_date = 0;
+ int64_t i_ephemer_subtitle_order = INT64_MIN;
+ int64_t i_ephemer_system_order = INT64_MIN;
int i_index;
/* Select available pictures */
{
continue;
}
- if( display_date &&
- display_date < p_current->i_start )
+ if( render_date &&
+ render_date < p_current->i_start )
{
/* Too early, come back next monday */
continue;
}
- if( p_current->i_start > ephemer_date )
- ephemer_date = p_current->i_start;
+ mtime_t *pi_ephemer_date = p_current->b_subtitle ? &ephemer_subtitle_date : &ephemer_system_date;
+ int64_t *pi_ephemer_order = p_current->b_subtitle ? &i_ephemer_subtitle_order : &i_ephemer_system_order;
+ if( p_current->i_start >= *pi_ephemer_date )
+ {
+ *pi_ephemer_date = p_current->i_start;
+ if( p_current->i_order > *pi_ephemer_order )
+ *pi_ephemer_order = p_current->i_order;
+ }
- b_stop_valid = ( !p_current->b_ephemer || p_current->i_stop > p_current->i_start ) &&
- ( !p_current->b_subtitle || !b_paused ); /* XXX Assume that subtitle are pausable */
+ b_stop_valid = !p_current->b_ephemer || p_current->i_stop > p_current->i_start;
- b_late = b_stop_valid && p_current->i_stop <= display_date;
+ b_late = b_stop_valid && p_current->i_stop <= p_current->b_subtitle ? render_date : system_date;
/* start_date will be used for correct automatic overlap support
* in case picture that should not be displayed anymore (display_time)
* overlap with a picture to be displayed (p_current->i_start) */
- if( !b_late && !p_current->b_ephemer )
+ if( p_current->b_subtitle && !b_late && !p_current->b_ephemer )
start_date = p_current->i_start;
/* */
subpicture_t *p_current = p_available_subpic[i_index];
bool b_late = pb_available_late[i_index];
- if( ( b_late && p_current->i_stop <= __MAX( start_date, p_sys->i_last_sort_date ) ) ||
- ( p_current->b_ephemer && p_current->i_start < ephemer_date ) )
+ const mtime_t stop_date = p_current->b_subtitle ? __MAX( start_date, p_sys->i_last_sort_date ) : system_date;
+ const mtime_t ephemer_date = p_current->b_subtitle ? ephemer_subtitle_date : ephemer_system_date;
+ const int64_t i_ephemer_order = p_current->b_subtitle ? i_ephemer_subtitle_order : i_ephemer_system_order;
+
+ /* Destroy late and obsolete ephemer subpictures */
+ bool b_rejet = b_late && p_current->i_stop <= stop_date;
+ if( p_current->b_ephemer )
{
- /* Destroy late and obsolete ephemer subpictures */
- SpuHeapDeleteSubpicture( &p_sys->heap, p_current );
+ if( p_current->i_start < ephemer_date )
+ b_rejet = true;
+ else if( p_current->i_start == ephemer_date &&
+ p_current->i_order < i_ephemer_order )
+ b_rejet = true;
}
+
+ if( b_rejet )
+ SpuHeapDeleteSubpicture( &p_sys->heap, p_current );
else
- {
SubpictureChain( &p_subpic, p_current );
- }
}
}
- p_sys->i_last_sort_date = display_date;
+ p_sys->i_last_sort_date = render_date;
vlc_mutex_unlock( &p_sys->lock );
return p_subpic;
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;
static void SpuRenderText( spu_t *p_spu, bool *pb_rerender_text,
subpicture_t *p_subpic, subpicture_region_t *p_region,
- int i_min_scale_ratio )
+ int i_min_scale_ratio, mtime_t render_date )
{
filter_t *p_text = p_spu->p->p_text;
* the text over time.
*/
var_SetTime( p_text, "spu-duration", p_subpic->i_stop - p_subpic->i_start );
- var_SetTime( p_text, "spu-elapsed", mdate() - p_subpic->i_start );
+ var_SetTime( p_text, "spu-elapsed", render_date );
var_SetBool( p_text, "text-rerender", false );
var_SetInteger( p_text, "scale", i_min_scale_ratio );
subpicture_t *p_subpic, subpicture_region_t *p_region,
const spu_scale_t scale_size,
const video_format_t *p_fmt,
- const spu_area_t *p_subtitle_area, int i_subtitle_area )
+ const spu_area_t *p_subtitle_area, int i_subtitle_area,
+ mtime_t render_date )
{
spu_private_t *p_sys = p_spu->p;
if( p_region->fmt.i_chroma == VLC_CODEC_TEXT )
{
const int i_min_scale_ratio = SCALE_UNIT; /* FIXME what is the right value? (scale_size is not) */
- SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, i_min_scale_ratio );
+ SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region,
+ i_min_scale_ratio, render_date );
b_restore_format = b_rerender_text;
/* Check if the rendering has failed ... */
p_region_picture, SpuRegionAlpha( p_subpic, p_region ) ) )
{
msg_Err( p_spu, "blending %4.4s to %4.4s failed",
- (char *)&p_sys->p_blend->fmt_out.video.i_chroma,
+ (char *)&p_sys->p_blend->fmt_in.video.i_chroma,
(char *)&p_sys->p_blend->fmt_out.video.i_chroma );
}
projects / vlc / blobdiff