Commit 16d54c3d authored by Laurent Aimar's avatar Laurent Aimar

No functionnal changes.

parent 9c5ebdcd
...@@ -48,6 +48,12 @@ ...@@ -48,6 +48,12 @@
#define VLC_FOURCC_RGBA VLC_FOURCC('R','G','B','A') #define VLC_FOURCC_RGBA VLC_FOURCC('R','G','B','A')
#define VLC_FOURCC_TEXT VLC_FOURCC('T','E','X','T') #define VLC_FOURCC_TEXT VLC_FOURCC('T','E','X','T')
/* TODO export */
static subpicture_t *subpicture_New( void );
static void subpicture_Delete( subpicture_t *p_subpic );
static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic );
/* */
typedef struct typedef struct
{ {
subpicture_t *p_subpicture; subpicture_t *p_subpicture;
...@@ -60,6 +66,12 @@ typedef struct ...@@ -60,6 +66,12 @@ typedef struct
} spu_heap_t; } 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 struct spu_private_t
{ {
vlc_mutex_t lock; /* lock to protect all followings fields */ vlc_mutex_t lock; /* lock to protect all followings fields */
...@@ -67,8 +79,6 @@ struct spu_private_t ...@@ -67,8 +79,6 @@ struct spu_private_t
spu_heap_t heap; spu_heap_t heap;
int i_channel; /**< number of subpicture channels registered */ int i_channel; /**< number of subpicture channels registered */
int64_t i_subpicture_order; /**< number of created subpicture since spu creation */
filter_t *p_blend; /**< alpha blending module */ filter_t *p_blend; /**< alpha blending module */
filter_t *p_text; /**< text renderer module */ filter_t *p_text; /**< text renderer module */
filter_t *p_scale_yuvp; /**< scaling module for YUVP */ filter_t *p_scale_yuvp; /**< scaling module for YUVP */
...@@ -90,15 +100,56 @@ struct subpicture_region_private_t ...@@ -90,15 +100,56 @@ struct subpicture_region_private_t
video_format_t fmt; video_format_t fmt;
picture_t *p_picture; 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 /* Subpicture rendered flag
* FIXME ? it could be moved to private ? */ * FIXME ? it could be moved to private ? */
#define SUBPICTURE_RENDERED (0x1000) #define SUBPICTURE_RENDERED (0x1000)
#ifdef SUBPICTURE_RENDERED < SUBPICTURE_ALIGN_MASK #if SUBPICTURE_RENDERED < SUBPICTURE_ALIGN_MASK
# error SUBPICTURE_RENDERED too low # error SUBPICTURE_RENDERED too low
#endif #endif
static void SpuRegionPrivateDestroy( subpicture_region_private_t *p_private ); #define SCALE_UNIT (1000)
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 void UpdateSPU ( spu_t *, vlc_object_t * );
static int CropCallback( vlc_object_t *, char const *, static int CropCallback( vlc_object_t *, char const *,
...@@ -123,205 +174,15 @@ static int SubFilterCallback( vlc_object_t *, char const *, ...@@ -123,205 +174,15 @@ static int SubFilterCallback( vlc_object_t *, char const *,
static int SubFilterAllocationInit( filter_t *, void * ); static int SubFilterAllocationInit( filter_t *, void * );
static void SubFilterAllocationClean( filter_t * ); static void SubFilterAllocationClean( filter_t * );
#define SCALE_UNIT (1000)
/* */
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_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_private = NULL;
p_region->psz_text = NULL;
p_region->p_style = NULL;
p_region->p_picture = NULL;
if( p_fmt->i_chroma == VLC_FOURCC_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 )
SpuRegionPrivateDestroy( 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 );
//free( p_region->p_style ); FIXME --fenrir plugin does not allocate the memory for it. I think it might lead to segfault, video renderer can live longer than the decoder
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;
}
}
/**
* This function create a new empty subpicture.
*/
static 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;
}
static 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 SpuHeapInit( spu_heap_t *p_heap )
{
for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
{
spu_heap_entry_t *e = &p_heap->p_entry[i];
e->p_subpicture = NULL;
e->b_reject = false;
}
}
static int SpuHeapPush( spu_heap_t *p_heap, subpicture_t *p_subpic )
{
for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
{
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;
}
static void SpuHeapDeleteAt( spu_heap_t *p_heap, int i_index )
{
spu_heap_entry_t *e = &p_heap->p_entry[i_index];
if( e->p_subpicture )
subpicture_Delete( e->p_subpicture );
e->p_subpicture = NULL;
}
static int SpuHeapDeleteSubpicture( spu_heap_t *p_heap, subpicture_t *p_subpic )
{
for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
{
spu_heap_entry_t *e = &p_heap->p_entry[i];
if( e->p_subpicture != p_subpic )
continue;
SpuHeapDeleteAt( p_heap, i );
return VLC_SUCCESS;
}
return VLC_EGENERIC;
}
static void SpuHeapClean( spu_heap_t *p_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 );
}
}
static subpicture_region_private_t *SpuRegionPrivateCreate( 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 SpuRegionPrivateDestroy( 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 SpuRenderCreateAndLoadText( spu_t *p_spu ); static void SpuRenderCreateAndLoadText( spu_t * );
static void SpuRenderCreateAndLoadScale( spu_t *p_spu ); 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 ); static void FilterRelease( filter_t *p_filter );
/*****************************************************************************
* Public API
*****************************************************************************/
/** /**
* Creates the subpicture unit * Creates the subpicture unit
* *
...@@ -347,8 +208,6 @@ spu_t *__spu_Create( vlc_object_t *p_this ) ...@@ -347,8 +208,6 @@ spu_t *__spu_Create( vlc_object_t *p_this )
SpuHeapInit( &p_sys->heap ); SpuHeapInit( &p_sys->heap );
p_sys->i_subpicture_order = 1;
p_sys->p_blend = NULL; p_sys->p_blend = NULL;
p_sys->p_text = NULL; p_sys->p_text = NULL;
p_sys->p_scale = NULL; p_sys->p_scale = NULL;
...@@ -528,1072 +387,1260 @@ void spu_DestroySubpicture( spu_t *p_spu, subpicture_t *p_subpic ) ...@@ -528,1072 +387,1260 @@ void spu_DestroySubpicture( spu_t *p_spu, subpicture_t *p_subpic )
subpicture_Delete( p_subpic ); subpicture_Delete( p_subpic );
} }
static void FilterRelease( filter_t *p_filter ) /**
* 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 )
{ {
if( p_filter->p_module ) spu_private_t *p_sys = p_spu->p;
module_unneed( p_filter, p_filter->p_module );
vlc_object_detach( p_filter ); const int i_source_video_width = p_fmt_src->i_width;
vlc_object_release( p_filter ); const int i_source_video_height = p_fmt_src->i_height;
} const mtime_t i_current_date = mdate();
static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_aspect ) unsigned int i_subpicture;
{ subpicture_t *pp_subpicture[VOUT_MAX_SUBPICTURES];
filter_t *p_blend;
assert( !p_spu->p->p_blend ); 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;
p_spu->p->p_blend = vlc_mutex_lock( &p_sys->lock );
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;
/* 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 )
{
/* */ /* */
vlc_object_attach( p_blend, p_spu ); if( p_subpic->pf_pre_render )
} p_subpic->pf_pre_render( p_spu, p_subpic, p_fmt_dst );
static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_height,
const video_format_t *p_in_fmt )
{
filter_t *p_blend = p_spu->p->p_blend;
assert( p_blend ); if( p_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_blend->p_module && p_blend->fmt_in.video.i_chroma != p_in_fmt->i_chroma ) if( p_subpic->b_subtitle )
{ {
/* The chroma is not the same, we need to reload the blend module for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next )
* XXX to match the old behaviour just test !p_blend->fmt_in.video.i_chroma */ i_subtitle_region_count++;
module_unneed( p_blend, p_blend->p_module );
p_blend->p_module = NULL;
} }
/* */ /* */
p_blend->fmt_in.video = *p_in_fmt; pp_subpicture[i_subpicture++] = p_subpic;
}
/* */ /* Be sure we have at least 1 picture to process */
p_blend->fmt_out.video.i_width = if( i_subpicture <= 0 )
p_blend->fmt_out.video.i_visible_width = i_out_width; {
p_blend->fmt_out.video.i_height = vlc_mutex_unlock( &p_sys->lock );
p_blend->fmt_out.video.i_visible_height = i_out_height; return;
}
/* */ /* Now order subpicture array
if( !p_blend->p_module ) * XXX The order is *really* important for overlap subtitles positionning */
p_blend->p_module = module_need( p_blend, "video blending", 0, 0 ); qsort( pp_subpicture, i_subpicture, sizeof(*pp_subpicture), SubpictureCmp );
}
static void SpuRenderCreateAndLoadText( spu_t *p_spu )
{
filter_t *p_text;
assert( !p_spu->p->p_text ); /* 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) );
p_spu->p->p_text = /* Create the blending module */
p_text = vlc_custom_create( p_spu, sizeof(filter_t), if( !p_sys->p_blend )
VLC_OBJECT_GENERIC, "spu text" ); SpuRenderCreateBlend( p_spu, p_fmt_dst->i_chroma, p_fmt_dst->i_aspect );
if( !p_text )
return;
es_format_Init( &p_text->fmt_in, VIDEO_ES, 0 ); /* 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;
es_format_Init( &p_text->fmt_out, VIDEO_ES, 0 ); if( !p_subpic->p_region )
p_text->fmt_out.video.i_width = continue;
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;
p_text->pf_sub_buffer_new = spu_new_buffer; /* FIXME when possible use a better rendering size than source size
p_text->pf_sub_buffer_del = spu_del_buffer; * (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 );
vlc_object_attach( p_text, p_spu ); 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;
}
/* FIXME TOCHECK shouldn't module_need( , , psz_modulename, false ) do the if( p_sys->p_text )
* 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_sys->p_text->fmt_out.video.i_width =
psz_modulename, true ); 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;
} }
free( psz_modulename );
if( !p_text->p_module ) /* Compute scaling from picture to source size */
p_text->p_module = module_need( p_text, "text renderer", NULL, false ); spu_scale_t scale = spu_scale_createq( i_source_video_width, i_render_width,
i_source_video_height, i_render_height );
/* Create a few variables used for enhanced text rendering */ /* Update scaling from source size to display size(p_fmt_dst) */
var_Create( p_text, "spu-duration", VLC_VAR_TIME ); scale.w = scale.w * p_fmt_dst->i_width / i_source_video_width;
var_Create( p_text, "spu-elapsed", VLC_VAR_TIME ); scale.h = scale.h * p_fmt_dst->i_height / i_source_video_height;
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, /* Set default subpicture aspect ratio
vlc_fourcc_t i_src_chroma, vlc_fourcc_t i_dst_chroma, * FIXME if we only handle 1 aspect ratio per picture, why is it set per
bool b_resize ) * region ? */
{ p_region = p_subpic->p_region;
filter_t *p_scale; if( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den )
{
if( p_region->fmt.i_aspect != 0 )
{
p_region->fmt.i_sar_den = p_region->fmt.i_aspect;
p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR;
}
else
{
p_region->fmt.i_sar_den = p_fmt_dst->i_sar_den;
p_region->fmt.i_sar_num = p_fmt_dst->i_sar_num;
}
}
p_scale = vlc_custom_create( p_obj, sizeof(filter_t), /* Take care of the aspect ratio */
VLC_OBJECT_GENERIC, "scale" ); if( p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den !=
if( !p_scale ) p_region->fmt.i_sar_den * p_fmt_dst->i_sar_num )
return NULL; {
/* 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;
}
es_format_Init( &p_scale->fmt_in, VIDEO_ES, 0 ); /* Render all regions
p_scale->fmt_in.video.i_chroma = i_src_chroma; * We always transform non absolute subtitle into absolute one on the
p_scale->fmt_in.video.i_width = * first rendering to allow good subtitle overlap support.
p_scale->fmt_in.video.i_height = 32; */
for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next )
{
spu_area_t area;
es_format_Init( &p_scale->fmt_out, VIDEO_ES, 0 ); /* Check scale validity */
p_scale->fmt_out.video.i_chroma = i_dst_chroma; if( scale.w <= 0 || scale.h <= 0 )
p_scale->fmt_out.video.i_width = continue;
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; SpuRenderRegion( p_spu, p_pic_dst, &area,
p_subpic, p_region, scale, p_fmt_dst,
p_subtitle_area, i_subtitle_area );
vlc_object_attach( p_scale, p_obj ); if( p_subpic->b_subtitle )
p_scale->p_module = module_need( p_scale, "video filter2", 0, 0 ); {
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;
}
return p_scale; /* */
} if( p_subtitle_area != p_subtitle_area_buffer )
static void SpuRenderCreateAndLoadScale( spu_t *p_spu ) free( p_subtitle_area );
{
assert( !p_spu->p->p_scale ); vlc_mutex_unlock( &p_sys->lock );
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, * spu_SortSubpictures: find the subpictures to display
int i_min_scale_ratio ) *****************************************************************************
* 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 )
{ {
filter_t *p_text = p_spu->p->p_text; spu_private_t *p_sys = p_spu->p;
int i_channel;
subpicture_t *p_subpic = NULL;
assert( p_region->fmt.i_chroma == VLC_FOURCC_TEXT ); /* Run subpicture filters */
filter_chain_SubFilter( p_sys->p_chain, display_date );
if( !p_text || !p_text->p_module ) vlc_mutex_lock( &p_sys->lock );
goto exit;
/* Setup 3 variables which can be used to render /* We get an easily parsable chained list of subpictures which
* time-dependent text (and effects). The first indicates * ends with NULL since p_subpic was initialized to NULL. */
* the total amount of time the text will be on screen, for( i_channel = 0; i_channel < p_sys->i_channel; i_channel++ )
* the second the amount of time it has already been on {
* screen (can be a negative value as text is layed out subpicture_t *p_ephemer = NULL;
* before it is rendered) and the third is a feedback mtime_t ephemer_date = 0;
* variable from the renderer - if the renderer sets it int i_index;
* then this particular text is time-dependent, eg. the
* visual progress bar inside the text in karaoke and the
* text needs to be rendered multiple times in order for
* the effect to work - we therefore need to return the
* region to its original state at the end of the loop,
* instead of leaving it in YUVA or YUVP.
* Any renderer which is unaware of how to render
* time-dependent text can happily ignore the variables
* and render the text the same as usual - it should at
* 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 ) for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
{ {
p_text->pf_render_html( p_text, p_region, p_region ); spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_index];
subpicture_t *p_current = p_entry->p_subpicture;
if( !p_current || p_entry->b_reject )
{
if( p_entry->b_reject )
SpuHeapDeleteAt( &p_sys->heap, i_index );
continue;
} }
else if( p_text->pf_render_text )
if( p_current->i_channel != i_channel ||
( b_subtitle_only && !p_current->b_subtitle ) )
{ {
p_text->pf_render_text( p_text, p_region, p_region ); continue;
}
if( display_date &&
display_date < p_current->i_start )
{
/* Too early, come back next monday */
continue;
} }
*pb_rerender_text = var_GetBool( p_text, "text-rerender" );
exit: if( p_current->i_start > ephemer_date )
p_region->i_align |= SUBPICTURE_RENDERED; 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 */
{
SpuHeapDeleteAt( &p_sys->heap, i_index );
}
else if( p_current->b_ephemer )
{
SubpictureChain( &p_ephemer, p_current );
}
else
{
SubpictureChain( &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 )
{
SpuHeapDeleteSubpicture( &p_sys->heap, p_tmp );
}
else
{
SubpictureChain( &p_subpic, p_tmp );
}
}
}
vlc_mutex_unlock( &p_sys->lock );
return p_subpic;
} }
/*****************************************************************************
* subpicture_t allocation
*****************************************************************************/
/** /**
* A few scale functions helpers. * This function create a new empty subpicture.
*/ */
typedef struct static subpicture_t *subpicture_New( void )
{ {
int w; subpicture_t *p_subpic = calloc( 1, sizeof(*p_subpic) );
int h; if( !p_subpic )
} spu_scale_t; return NULL;
static spu_scale_t spu_scale_create( int w, int h ) p_subpic->i_order = 0;
{ p_subpic->b_absolute = true;
spu_scale_t s = { .w = w, .h = h }; p_subpic->b_fade = false;
if( s.w <= 0 ) p_subpic->b_subtitle = false;
s.w = SCALE_UNIT; p_subpic->i_alpha = 0xFF;
if( s.h <= 0 ) p_subpic->p_region = NULL;
s.h = SCALE_UNIT; p_subpic->pf_render = NULL;
return s; p_subpic->pf_destroy = NULL;
} p_subpic->p_sys = NULL;
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,
hn * SCALE_UNIT / hd );
}
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 )
{
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;
}
/** return p_subpic;
* A few area functions helpers }
*/
typedef struct static void subpicture_Delete( subpicture_t *p_subpic )
{ {
int i_x; subpicture_region_ChainDelete( p_subpic->p_region );
int i_y; p_subpic->p_region = NULL;
int i_width;
int i_height;
spu_scale_t scale; if( p_subpic->pf_destroy )
} spu_area_t; {
p_subpic->pf_destroy( p_subpic );
}
free( p_subpic );
}
static spu_area_t spu_area_create( int x, int y, int w, int h, spu_scale_t s ) static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic )
{ {
spu_area_t a = { .i_x = x, .i_y = y, .i_width = w, .i_height = h, .scale = s }; p_subpic->p_next = *pp_head;
return a;
*pp_head = p_subpic;
} }
static spu_area_t spu_area_scaled( spu_area_t a )
/*****************************************************************************
* subpicture_region_t allocation
*****************************************************************************/
subpicture_region_t *subpicture_region_New( const video_format_t *p_fmt )
{ {
if( a.scale.w == SCALE_UNIT && a.scale.h == SCALE_UNIT ) subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) );
return a; if( !p_region )
return NULL;
a.i_x = spu_scale_w( a.i_x, a.scale ); p_region->fmt = *p_fmt;
a.i_y = spu_scale_h( a.i_y, a.scale ); 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_private = NULL;
p_region->psz_text = NULL;
p_region->p_style = NULL;
p_region->p_picture = NULL;
a.i_width = spu_scale_w( a.i_width, a.scale ); if( p_fmt->i_chroma == VLC_FOURCC_TEXT )
a.i_height = spu_scale_h( a.i_height, a.scale ); return p_region;
a.scale = spu_scale_unit(); p_region->p_picture = picture_New( p_fmt->i_chroma, p_fmt->i_width, p_fmt->i_height,
return a; p_fmt->i_aspect );
if( !p_region->p_picture )
{
free( p_fmt->p_palette );
free( p_region );
return NULL;
}
return p_region;
} }
static spu_area_t spu_area_unscaled( spu_area_t a, spu_scale_t s )
/* */
void subpicture_region_Delete( subpicture_region_t *p_region )
{ {
if( a.scale.w == s.w && a.scale.h == s.h ) if( !p_region )
return a; return;
a = spu_area_scaled( a ); if( p_region->p_private )
SpuRegionPrivateDelete( p_region->p_private );
a.i_x = spu_invscale_w( a.i_x, s ); if( p_region->p_picture )
a.i_y = spu_invscale_h( a.i_y, s ); picture_Release( p_region->p_picture );
a.i_width = spu_invscale_w( a.i_width, s ); free( p_region->fmt.p_palette );
a.i_height = spu_invscale_h( a.i_height, s );
a.scale = s; free( p_region->psz_text );
return a; free( p_region->psz_html );
//free( p_region->p_style ); FIXME --fenrir plugin does not allocate the memory for it. I think it might lead to segfault, video renderer can live longer than the decoder
free( p_region );
} }
static bool spu_area_overlap( spu_area_t a, spu_area_t b )
/* */
void subpicture_region_ChainDelete( subpicture_region_t *p_head )
{ {
const int i_dx = 0; while( p_head )
const int i_dy = 0; {
subpicture_region_t *p_next = p_head->p_next;
a = spu_area_scaled( a ); subpicture_region_Delete( p_head );
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 ) && p_head = p_next;
__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 */ * heap managment
do *****************************************************************************/
static void SpuHeapInit( spu_heap_t *p_heap )
{
for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
{ {
b_ok = true; spu_heap_entry_t *e = &p_heap->p_entry[i];
for( int i = 0; i < i_sub; i++ )
e->p_subpicture = NULL;
e->b_reject = false;
}
}
static int SpuHeapPush( spu_heap_t *p_heap, subpicture_t *p_subpic )
{
for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
{ {
spu_area_t sub = spu_area_scaled( p_sub[i] ); spu_heap_entry_t *e = &p_heap->p_entry[i];
if( !spu_area_overlap( a, sub ) ) if( e->p_subpicture )
continue; continue;
if( i_align & SUBPICTURE_ALIGN_TOP ) e->p_subpicture = p_subpic;
{ e->b_reject = false;
/* We go down */ return VLC_SUCCESS;
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;
} }
return VLC_EGENERIC;
}
b_ok = false; static void SpuHeapDeleteAt( spu_heap_t *p_heap, int i_index )
break; {
} spu_heap_entry_t *e = &p_heap->p_entry[i_index];
} while( !b_ok );
if( b_moved ) if( e->p_subpicture )
*p_dst = spu_area_unscaled( a, p_dst->scale ); subpicture_Delete( e->p_subpicture );
}
e->p_subpicture = NULL;
}
/** static int SpuHeapDeleteSubpicture( spu_heap_t *p_heap, subpicture_t *p_subpic )
* 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; for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
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; spu_heap_entry_t *e = &p_heap->p_entry[i];
}
if( p_region->i_align & SUBPICTURE_ALIGN_LEFT ) if( e->p_subpicture != p_subpic )
{ continue;
i_x = i_delta_x;
} SpuHeapDeleteAt( p_heap, i );
else if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT ) return VLC_SUCCESS;
{
i_x = p_subpic->i_original_picture_width - p_region->fmt.i_width - i_delta_x;
} }
else return VLC_EGENERIC;
}
static void SpuHeapClean( spu_heap_t *p_heap )
{
for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
{ {
i_x = p_subpic->i_original_picture_width / 2 - p_region->fmt.i_width / 2; spu_heap_entry_t *e = &p_heap->p_entry[i];
if( e->p_subpicture )
subpicture_Delete( e->p_subpicture );
} }
}
if( p_subpic->b_absolute ) 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 )
{ {
i_x = i_delta_x; p_private->fmt.p_palette = malloc( sizeof(*p_private->fmt.p_palette) );
i_y = i_delta_y; if( p_private->fmt.p_palette )
*p_private->fmt.p_palette = *p_fmt->p_palette;
} }
p_private->p_picture = NULL;
/* Margin shifts all subpictures */ return p_private;
if( i_margin_y != 0 ) }
i_y -= i_margin_y; static void SpuRegionPrivateDelete( subpicture_region_private_t *p_private )
{
/* Clamp offset to not go out of the screen (when possible) */ if( p_private->p_picture )
const int i_error_x = (i_x + p_region->fmt.i_width) - p_subpic->i_original_picture_width; picture_Release( p_private->p_picture );
if( i_error_x > 0 ) free( p_private->fmt.p_palette );
i_x -= i_error_x; free( p_private );
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; static void FilterRelease( filter_t *p_filter )
if( i_error_y > 0 ) {
i_y -= i_error_y; if( p_filter->p_module )
if( i_y < 0 ) module_unneed( p_filter, p_filter->p_module );
i_y = 0;
*pi_x = i_x; vlc_object_detach( p_filter );
*pi_y = i_y; vlc_object_release( p_filter );
} }
/** static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_aspect )
* 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 */ filter_t *p_blend;
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 ) assert( !p_spu->p->p_blend );
p_spu->p->p_blend =
p_blend = vlc_custom_create( p_spu, sizeof(filter_t),
VLC_OBJECT_GENERIC, "blend" );
if( !p_blend )
return;
es_format_Init( &p_blend->fmt_in, VIDEO_ES, 0 );
es_format_Init( &p_blend->fmt_out, VIDEO_ES, 0 );
p_blend->fmt_out.video.i_x_offset = 0;
p_blend->fmt_out.video.i_y_offset = 0;
p_blend->fmt_out.video.i_chroma = i_chroma;
p_blend->fmt_out.video.i_aspect = i_aspect;
/* The blend module will be loaded when needed with the real
* input format */
p_blend->p_module = NULL;
/* */
vlc_object_attach( p_blend, p_spu );
}
static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_height,
const video_format_t *p_in_fmt )
{
filter_t *p_blend = p_spu->p->p_blend;
assert( p_blend );
/* */
if( p_blend->p_module && p_blend->fmt_in.video.i_chroma != p_in_fmt->i_chroma )
{ {
i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) / /* The chroma is not the same, we need to reload the blend module
( p_subpic->i_stop - i_fade_start ); * 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;
} }
return i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025;
}
/** /* */
* It will render the provided region onto p_pic_dst. p_blend->fmt_in.video = *p_in_fmt;
*/
static void SpuRenderRegion( spu_t *p_spu, /* */
picture_t *p_pic_dst, spu_area_t *p_area, p_blend->fmt_out.video.i_width =
subpicture_t *p_subpic, subpicture_region_t *p_region, p_blend->fmt_out.video.i_visible_width = i_out_width;
const spu_scale_t scale_size, p_blend->fmt_out.video.i_height =
const video_format_t *p_fmt, p_blend->fmt_out.video.i_visible_height = i_out_height;
const spu_area_t *p_subtitle_area, int i_subtitle_area )
/* */
if( !p_blend->p_module )
p_blend->p_module = module_need( p_blend, "video blending", 0, 0 );
}
static void SpuRenderCreateAndLoadText( spu_t *p_spu )
{ {
spu_private_t *p_sys = p_spu->p; filter_t *p_text;
video_format_t fmt_original = p_region->fmt; assert( !p_spu->p->p_text );
bool b_rerender_text = false;
bool b_restore_format = false;
int i_x_offset;
int i_y_offset;
video_format_t region_fmt; p_spu->p->p_text =
picture_t *p_region_picture; p_text = vlc_custom_create( p_spu, sizeof(filter_t),
VLC_OBJECT_GENERIC, "spu text" );
if( !p_text )
return;
/* Invalidate area by default */ es_format_Init( &p_text->fmt_in, VIDEO_ES, 0 );
*p_area = spu_area_create( 0,0, 0,0, scale_size );
/* Render text region */ es_format_Init( &p_text->fmt_out, VIDEO_ES, 0 );
if( p_region->fmt.i_chroma == VLC_FOURCC_TEXT ) p_text->fmt_out.video.i_width =
{ p_text->fmt_out.video.i_visible_width = 32;
const int i_min_scale_ratio = SCALE_UNIT; /* FIXME what is the right value? (scale_size is not) */ p_text->fmt_out.video.i_height =
SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, i_min_scale_ratio ); p_text->fmt_out.video.i_visible_height = 32;
b_restore_format = b_rerender_text;
/* Check if the rendering has failed ... */ p_text->pf_sub_buffer_new = spu_new_buffer;
if( p_region->fmt.i_chroma == VLC_FOURCC_TEXT ) p_text->pf_sub_buffer_del = spu_del_buffer;
goto exit;
vlc_object_attach( p_text, p_spu );
/* 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 );
/* Force palette if requested if( !p_text->p_module )
* FIXME b_force_palette and b_force_crop are applied to all subpictures using palette p_text->p_module = module_need( p_text, "text renderer", NULL, false );
* instead of only the right one (being the dvd spu).
*/
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;
/* 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 );
}
/* Compute the margin which is expressed in destination pixel unit static filter_t *CreateAndLoadScale( vlc_object_t *p_obj,
* The margin is applied only to subtitle and when no forced crop is vlc_fourcc_t i_src_chroma, vlc_fourcc_t i_dst_chroma,
* requested (dvd menu) */ bool b_resize )
int i_margin_y = 0; {
if( !b_force_crop && p_subpic->b_subtitle ) filter_t *p_scale;
i_margin_y = spu_invscale_h( p_sys->i_margin, scale_size );
/* Place the picture p_scale = vlc_custom_create( p_obj, sizeof(filter_t),
* We compute the position in the rendered size */ VLC_OBJECT_GENERIC, "scale" );
SpuRegionPlace( &i_x_offset, &i_y_offset, if( !p_scale )
p_subpic, p_region, i_margin_y ); return NULL;
/* Save this position for subtitle overlap support es_format_Init( &p_scale->fmt_in, VIDEO_ES, 0 );
* it is really important that there are given without scale_size applied */ p_scale->fmt_in.video.i_chroma = i_src_chroma;
*p_area = spu_area_create( i_x_offset, i_y_offset, p_scale->fmt_in.video.i_width =
p_region->fmt.i_width, p_region->fmt.i_height, p_scale->fmt_in.video.i_height = 32;
scale_size );
/* Handle overlapping subtitles when possible */ es_format_Init( &p_scale->fmt_out, VIDEO_ES, 0 );
if( p_subpic->b_subtitle && !p_subpic->b_absolute ) p_scale->fmt_out.video.i_chroma = i_dst_chroma;
{ p_scale->fmt_out.video.i_width =
spu_area_t display = spu_area_create( 0, 0, p_fmt->i_width, p_fmt->i_height, p_scale->fmt_out.video.i_height = b_resize ? 16 : 32;
spu_scale_unit() );
SpuAreaFixOverlap( p_area, &display, p_subtitle_area, i_subtitle_area, p_scale->pf_vout_buffer_new = spu_new_video_buffer;
p_region->i_align ); p_scale->pf_vout_buffer_del = spu_del_video_buffer;
}
/* Fix the position for the current scale_size */ vlc_object_attach( p_scale, p_obj );
i_x_offset = spu_scale_w( p_area->i_x, p_area->scale ); p_scale->p_module = module_need( p_scale, "video filter2", 0, 0 );
i_y_offset = spu_scale_h( p_area->i_y, p_area->scale );
/* */ return p_scale;
if( b_force_palette ) }
{ static void SpuRenderCreateAndLoadScale( spu_t *p_spu )
video_palette_t *p_palette = p_region->fmt.p_palette; {
video_palette_t palette; 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 );
}
/* We suppose DVD palette here */ static void SpuRenderText( spu_t *p_spu, bool *pb_rerender_text,
palette.i_entries = 4; subpicture_t *p_subpic, subpicture_region_t *p_region,
for( int i = 0; i < 4; i++ ) int i_min_scale_ratio )
for( int j = 0; j < 4; j++ ) {
palette.palette[i][j] = p_sys->palette[i][j]; filter_t *p_text = p_spu->p->p_text;
if( p_palette->i_entries == palette.i_entries ) 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
* time-dependent text (and effects). The first indicates
* the total amount of time the text will be on screen,
* the second the amount of time it has already been on
* screen (can be a negative value as text is layed out
* before it is rendered) and the third is a feedback
* variable from the renderer - if the renderer sets it
* then this particular text is time-dependent, eg. the
* visual progress bar inside the text in karaoke and the
* text needs to be rendered multiple times in order for
* the effect to work - we therefore need to return the
* region to its original state at the end of the loop,
* instead of leaving it in YUVA or YUVP.
* Any renderer which is unaware of how to render
* time-dependent text can happily ignore the variables
* and render the text the same as usual - it should at
* 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 )
{ {
for( int i = 0; i < p_palette->i_entries; i++ ) p_text->pf_render_html( p_text, p_region, p_region );
for( int j = 0; j < 4; j++ )
b_changed_palette |= p_palette->palette[i][j] != palette.palette[i][j];
} }
else else if( p_text->pf_render_text )
{ {
b_changed_palette = true; p_text->pf_render_text( p_text, p_region, p_region );
}
*p_palette = palette;
} }
*pb_rerender_text = var_GetBool( p_text, "text-rerender" );
/* */ exit:
region_fmt = p_region->fmt; p_region->i_align |= SUBPICTURE_RENDERED;
p_region_picture = p_region->p_picture; }
/**
* A few scale functions helpers.
*/
static spu_scale_t spu_scale_create( int w, int h )
{
spu_scale_t s = { .w = w, .h = h };
if( s.w <= 0 )
s.w = SCALE_UNIT;
if( s.h <= 0 )
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,
hn * SCALE_UNIT / hd );
}
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 )
{
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 );
/* Scale from rendered size to destination size */ a.i_width = spu_scale_w( a.i_width, a.scale );
if( p_sys->p_scale && p_sys->p_scale->p_module && a.i_height = spu_scale_h( a.i_height, a.scale );
( !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 the cache if unusable */ a.scale = spu_scale_unit();
if( p_region->p_private ) return a;
{ }
subpicture_region_private_t *p_private = p_region->p_private; static spu_area_t spu_area_unscaled( spu_area_t a, spu_scale_t s )
bool b_changed = false; {
if( a.scale.w == s.w && a.scale.h == s.h )
return a;
/* Check resize changes */ a = spu_area_scaled( a );
if( i_dst_width != p_private->fmt.i_width ||
i_dst_height != p_private->fmt.i_height )
b_changed = true;
/* Check forced palette changes */ a.i_x = spu_invscale_w( a.i_x, s );
if( b_changed_palette ) a.i_y = spu_invscale_h( a.i_y, s );
b_changed = true;
if( b_changed ) a.i_width = spu_invscale_w( a.i_width, s );
{ a.i_height = spu_invscale_h( a.i_height, s );
SpuRegionPrivateDestroy( p_private );
p_region->p_private = NULL;
}
}
/* Scale if needed into cache */ a.scale = s;
if( !p_region->p_private ) return a;
{ }
filter_t *p_scale = p_sys->p_scale; static bool spu_area_overlap( spu_area_t a, spu_area_t b )
{
const int i_dx = 0;
const int i_dy = 0;
picture_t *p_picture = p_region->p_picture; a = spu_area_scaled( a );
picture_Hold( p_picture ); b = spu_area_scaled( b );
/* Convert YUVP to YUVA/RGBA first for better scaling quality */ 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 ) &&
if( b_using_palette ) __MAX( a.i_y-i_dy, b.i_y ) < __MIN( a.i_y+a.i_height+i_dy, b.i_y+b.i_height );
{ }
filter_t *p_scale_yuvp = p_sys->p_scale_yuvp;
p_scale_yuvp->fmt_in.video = p_region->fmt; /**
* 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;
/* TODO converting to RGBA for RGB video output is better */ assert( p_master->i_x == 0 && p_master->i_y == 0 );
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 ); /* Check for overlap
if( !p_picture ) * XXX It is not fast O(n^2) but we should not have a lot of region */
do
{ {
/* Well we will try conversion+scaling */ b_ok = true;
msg_Warn( p_spu, "%4.4s to %4.4s conversion failed", for( int i = 0; i < i_sub; i++ )
(const char*)&p_scale_yuvp->fmt_in.video.i_chroma,
(const char*)&p_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 ) )
{ {
p_scale->fmt_in.video = p_picture->format; spu_area_t sub = spu_area_scaled( p_sub[i] );
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( !spu_area_overlap( a, sub ) )
if( !p_picture ) continue;
msg_Err( p_spu, "scaling failed" );
}
/* */ if( i_align & SUBPICTURE_ALIGN_TOP )
if( p_picture )
{
p_region->p_private = SpuRegionPrivateCreate( &p_picture->format );
if( p_region->p_private )
{
p_region->p_private->p_picture = p_picture;
if( !p_region->p_private->p_picture )
{ {
SpuRegionPrivateDestroy( p_region->p_private ); /* We go down */
p_region->p_private = NULL; 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 else
{ {
picture_Release( p_picture ); /* TODO what to do in this case? */
} //fprintf( stderr, "Overlap with unsupported alignment\n" );
} break;
} }
/* And use the scaled picture */ b_ok = false;
if( p_region->p_private ) break;
{
region_fmt = p_region->p_private->fmt;
p_region_picture = p_region->p_private->p_picture;
}
} }
} while( !b_ok );
/* Force cropping if requested */ if( b_moved )
if( b_force_crop ) *p_dst = spu_area_unscaled( a, p_dst->scale );
{ }
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)region_fmt.i_visible_width < i_crop_x || * Place a region
i_crop_y + i_crop_height <= i_y_offset || */
i_y_offset + (int)region_fmt.i_visible_height < i_crop_y ) 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 )
{ {
/* No intersection */ i_y = i_delta_y;
region_fmt.i_visible_width =
region_fmt.i_visible_height = 0;
} }
else else if( p_region->i_align & SUBPICTURE_ALIGN_BOTTOM )
{ {
int i_x, i_y, i_x_end, i_y_end; i_y = p_subpic->i_original_picture_height - p_region->fmt.i_height - i_delta_y;
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
{
i_y = p_subpic->i_original_picture_height / 2 - p_region->fmt.i_height / 2;
} }
/* Update the blender */ if( p_region->i_align & SUBPICTURE_ALIGN_LEFT )
SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, &region_fmt );
if( p_sys->p_blend->p_module )
{ {
const int i_alpha = SpuRegionAlpha( p_subpic, p_region ); i_x = i_delta_x;
}
p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_pic_dst, else if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT )
p_region_picture, i_x_offset, i_y_offset, i_alpha ); {
i_x = p_subpic->i_original_picture_width - p_region->fmt.i_width - i_delta_x;
} }
else else
{ {
msg_Err( p_spu, "blending %4.4s to %4.4s failed", i_x = p_subpic->i_original_picture_width / 2 - p_region->fmt.i_width / 2;
(char *)&p_sys->p_blend->fmt_out.video.i_chroma,
(char *)&p_sys->p_blend->fmt_out.video.i_chroma );
} }
exit: if( p_subpic->b_absolute )
if( b_rerender_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.
*/
picture_Release( p_region->p_picture );
p_region->p_picture = NULL;
if( p_region->p_private )
{ {
SpuRegionPrivateDestroy( p_region->p_private ); i_x = i_delta_x;
p_region->p_private = NULL; i_y = i_delta_y;
}
p_region->i_align &= ~SUBPICTURE_RENDERED;
} }
if( b_restore_format )
p_region->fmt = fmt_original;
}
/** /* Margin shifts all subpictures */
* This function compares two 64 bits integers. if( i_margin_y != 0 )
* It can be used by qsort. i_y -= i_margin_y;
*/
static int IntegerCmp( int64_t i0, int64_t i1 ) /* 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;
return i0 < i1 ? -1 : i0 > i1 ? 1 : 0; 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;
} }
/** /**
* This function compares 2 subpictures using the following properties * This function computes the current alpha value for a given region.
* (ordered by priority)
* 1. absolute positionning
* 2. start time
* 3. creation order
*
* It can be used by qsort.
*
* XXX spu_RenderSubpictures depends heavily on this order.
*/ */
static int SubpictureCmp( const void *s0, const void *s1 ) static int SpuRegionAlpha( subpicture_t *p_subpic, subpicture_region_t *p_region )
{ {
subpicture_t *p_subpic0 = *(subpicture_t**)s0; /* Compute alpha blend value */
subpicture_t *p_subpic1 = *(subpicture_t**)s1; int i_fade_alpha = 255;
int r; if( p_subpic->b_fade )
{
mtime_t i_fade_start = ( p_subpic->i_stop +
p_subpic->i_start ) / 2;
mtime_t i_now = mdate();
r = IntegerCmp( !p_subpic0->b_absolute, !p_subpic1->b_absolute ); if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start )
if( !r ) {
r = IntegerCmp( p_subpic0->i_start, p_subpic1->i_start ); i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
if( !r ) ( p_subpic->i_stop - i_fade_start );
r = IntegerCmp( p_subpic0->i_order, p_subpic1->i_order ); }
return r; }
return i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025;
} }
/** /**
* This function renders all sub picture units in the list. * It will render the provided region onto p_pic_dst.
*/ */
void spu_RenderSubpictures( spu_t *p_spu,
picture_t *p_pic_dst, const video_format_t *p_fmt_dst, static void SpuRenderRegion( spu_t *p_spu,
subpicture_t *p_subpic_list, picture_t *p_pic_dst, spu_area_t *p_area,
const video_format_t *p_fmt_src ) 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; spu_private_t *p_sys = p_spu->p;
const int i_source_video_width = p_fmt_src->i_width; video_format_t fmt_original = p_region->fmt;
const int i_source_video_height = p_fmt_src->i_height; bool b_rerender_text = false;
const mtime_t i_current_date = mdate(); bool b_restore_format = false;
int i_x_offset;
unsigned int i_subpicture; int i_y_offset;
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 ); video_format_t region_fmt;
picture_t *p_region_picture;
/* Preprocess subpictures */ /* Invalidate area by default */
i_subpicture = 0; *p_area = spu_area_create( 0,0, 0,0, scale_size );
i_subtitle_region_count = 0;
for( subpicture_t * p_subpic = p_subpic_list;
p_subpic != NULL;
p_subpic = p_subpic->p_next )
{
/* */
if( p_subpic->pf_pre_render )
p_subpic->pf_pre_render( p_spu, p_subpic, p_fmt_dst );
if( p_subpic->pf_update_regions ) /* Render text region */
if( p_region->fmt.i_chroma == VLC_FOURCC_TEXT )
{ {
video_format_t fmt_org = *p_fmt_dst; const int i_min_scale_ratio = SCALE_UNIT; /* FIXME what is the right value? (scale_size is not) */
fmt_org.i_width = SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, i_min_scale_ratio );
fmt_org.i_visible_width = i_source_video_width; b_restore_format = b_rerender_text;
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 );
}
/* */ /* Check if the rendering has failed ... */
if( p_subpic->b_subtitle ) if( p_region->fmt.i_chroma == VLC_FOURCC_TEXT )
{ goto exit;
for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next )
i_subtitle_region_count++;
} }
/* */ /* Force palette if requested
pp_subpicture[i_subpicture++] = p_subpic; * 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_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;
/* 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 /* Compute the margin which is expressed in destination pixel unit
* XXX The order is *really* important for overlap subtitles positionning */ * The margin is applied only to subtitle and when no forced crop is
qsort( pp_subpicture, i_subpicture, sizeof(*pp_subpicture), SubpictureCmp ); * 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 );
/* Allocate area array for subtitle overlap */ /* Place the picture
i_subtitle_area = 0; * We compute the position in the rendered size */
p_subtitle_area = p_subtitle_area_buffer; SpuRegionPlace( &i_x_offset, &i_y_offset,
if( i_subtitle_region_count > sizeof(p_subtitle_area_buffer)/sizeof(*p_subtitle_area_buffer) ) p_subpic, p_region, i_margin_y );
p_subtitle_area = calloc( i_subtitle_region_count, sizeof(*p_subtitle_area) );
/* Create the blending module */ /* Save this position for subtitle overlap support
if( !p_sys->p_blend ) * it is really important that there are given without scale_size applied */
SpuRenderCreateBlend( p_spu, p_fmt_dst->i_chroma, p_fmt_dst->i_aspect ); *p_area = spu_area_create( i_x_offset, i_y_offset,
p_region->fmt.i_width, p_region->fmt.i_height,
scale_size );
/* Process all subpictures and regions (in the right order) */ /* Handle overlapping subtitles when possible */
for( unsigned int i_index = 0; i_index < i_subpicture; i_index++ ) if( p_subpic->b_subtitle && !p_subpic->b_absolute )
{ {
subpicture_t *p_subpic = pp_subpicture[i_index]; spu_area_t display = spu_area_create( 0, 0, p_fmt->i_width, p_fmt->i_height,
subpicture_region_t *p_region; spu_scale_unit() );
if( !p_subpic->p_region ) SpuAreaFixOverlap( p_area, &display, p_subtitle_area, i_subtitle_area,
continue; p_region->i_align );
}
/* FIXME when possible use a better rendering size than source size /* Fix the position for the current scale_size */
* (max of display size and source size for example) FIXME */ i_x_offset = spu_scale_w( p_area->i_x, p_area->scale );
int i_render_width = p_subpic->i_original_picture_width; i_y_offset = spu_scale_h( p_area->i_y, p_area->scale );
int i_render_height = p_subpic->i_original_picture_height;
if( !i_render_width || !i_render_height ) /* */
if( b_force_palette )
{ {
if( i_render_width != 0 || i_render_height != 0 ) video_palette_t *p_palette = p_region->fmt.p_palette;
msg_Err( p_spu, "unsupported original picture size %dx%d", video_palette_t palette;
i_render_width, i_render_height );
p_subpic->i_original_picture_width = i_render_width = i_source_video_width; /* We suppose DVD palette here */
p_subpic->i_original_picture_height = i_render_height = i_source_video_height; 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_sys->p_text ) if( p_palette->i_entries == palette.i_entries )
{ {
p_sys->p_text->fmt_out.video.i_width = for( int i = 0; i < p_palette->i_entries; i++ )
p_sys->p_text->fmt_out.video.i_visible_width = i_render_width; for( int j = 0; j < 4; j++ )
b_changed_palette |= p_palette->palette[i][j] != palette.palette[i][j];
p_sys->p_text->fmt_out.video.i_height = }
p_sys->p_text->fmt_out.video.i_visible_height = i_render_height; else
{
b_changed_palette = true;
}
*p_palette = palette;
} }
/* Compute scaling from picture to source size */ /* */
spu_scale_t scale = spu_scale_createq( i_source_video_width, i_render_width, region_fmt = p_region->fmt;
i_source_video_height, i_render_height ); p_region_picture = p_region->p_picture;
/* 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 /* Scale from rendered size to destination size */
* FIXME if we only handle 1 aspect ratio per picture, why is it set per if( p_sys->p_scale && p_sys->p_scale->p_module &&
* region ? */ ( !b_using_palette || ( p_sys->p_scale_yuvp && p_sys->p_scale_yuvp->p_module ) ) &&
p_region = p_subpic->p_region; ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_using_palette ) )
if( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den )
{ {
if( p_region->fmt.i_aspect != 0 ) 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 the cache if unusable */
if( p_region->p_private )
{ {
p_region->fmt.i_sar_den = p_region->fmt.i_aspect; subpicture_region_private_t *p_private = p_region->p_private;
p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR; bool b_changed = false;
}
else /* 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_region->fmt.i_sar_den = p_fmt_dst->i_sar_den; SpuRegionPrivateDelete( p_private );
p_region->fmt.i_sar_num = p_fmt_dst->i_sar_num; p_region->p_private = NULL;
} }
} }
/* Take care of the aspect ratio */ /* Scale if needed into cache */
if( p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den != if( !p_region->p_private )
p_region->fmt.i_sar_den * p_fmt_dst->i_sar_num )
{ {
/* FIXME FIXME what about region->i_x/i_y ? */ filter_t *p_scale = p_sys->p_scale;
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 picture_t *p_picture = p_region->p_picture;
* We always transform non absolute subtitle into absolute one on the picture_Hold( p_picture );
* first rendering to allow good subtitle overlap support.
*/ /* Convert YUVP to YUVA/RGBA first for better scaling quality */
for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next ) if( b_using_palette )
{ {
spu_area_t area; filter_t *p_scale_yuvp = p_sys->p_scale_yuvp;
/* Check scale validity */ p_scale_yuvp->fmt_in.video = p_region->fmt;
if( scale.w <= 0 || scale.h <= 0 )
continue;
/* */ /* TODO converting to RGBA for RGB video output is better */
SpuRenderRegion( p_spu, p_pic_dst, &area, p_scale_yuvp->fmt_out.video = p_region->fmt;
p_subpic, p_region, scale, p_fmt_dst, p_scale_yuvp->fmt_out.video.i_chroma = VLC_FOURCC_YUVA;
p_subtitle_area, i_subtitle_area );
if( p_subpic->b_subtitle ) p_picture = p_scale_yuvp->pf_video_filter( p_scale_yuvp, p_picture );
{ if( !p_picture )
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; /* Well we will try conversion+scaling */
p_region->i_y = area.i_y; msg_Warn( p_spu, "%4.4s to %4.4s conversion failed",
} (const char*)&p_scale_yuvp->fmt_in.video.i_chroma,
if( p_subtitle_area ) (const char*)&p_scale_yuvp->fmt_out.video.i_chroma );
p_subtitle_area[i_subtitle_area++] = area;
}
} }
if( p_subpic->b_subtitle )
p_subpic->b_absolute = true;
} }
/* */ /* Conversion(except from YUVP)/Scaling */
if( p_subtitle_area != p_subtitle_area_buffer ) if( p_picture &&
free( p_subtitle_area ); ( p_picture->format.i_width != i_dst_width ||
p_picture->format.i_height != i_dst_height ) )
vlc_mutex_unlock( &p_sys->lock ); {
} p_scale->fmt_in.video = p_picture->format;
p_scale->fmt_out.video = p_picture->format;
/*****************************************************************************
* 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.
*****************************************************************************/
static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic )
{
p_subpic->p_next = *pp_head;
*pp_head = p_subpic;
}
subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, p_scale->fmt_out.video.i_width = i_dst_width;
bool b_paused, bool b_subtitle_only ) p_scale->fmt_out.video.i_height = i_dst_height;
{
spu_private_t *p_sys = p_spu->p;
int i_channel;
subpicture_t *p_subpic = NULL;
/* Run subpicture filters */ p_scale->fmt_out.video.i_visible_width =
filter_chain_SubFilter( p_sys->p_chain, display_date ); 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 );
vlc_mutex_lock( &p_sys->lock ); p_picture = p_scale->pf_video_filter( p_scale, p_picture );
if( !p_picture )
msg_Err( p_spu, "scaling failed" );
}
/* We get an easily parsable chained list of subpictures which /* */
* ends with NULL since p_subpic was initialized to NULL. */ if( p_picture )
for( i_channel = 0; i_channel < p_sys->i_channel; i_channel++ )
{ {
subpicture_t *p_ephemer = NULL; p_region->p_private = SpuRegionPrivateNew( &p_picture->format );
mtime_t ephemer_date = 0; if( p_region->p_private )
int i_index;
for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
{ {
spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_index]; p_region->p_private->p_picture = p_picture;
subpicture_t *p_current = p_entry->p_subpicture; if( !p_region->p_private->p_picture )
if( !p_current || p_entry->b_reject )
{ {
if( p_entry->b_reject ) SpuRegionPrivateDelete( p_region->p_private );
SpuHeapDeleteAt( &p_sys->heap, i_index ); p_region->p_private = NULL;
continue;
} }
if( p_current->i_channel != i_channel ||
( b_subtitle_only && !p_current->b_subtitle ) )
{
continue;
} }
if( display_date && else
display_date < p_current->i_start )
{ {
/* Too early, come back next monday */ picture_Release( p_picture );
continue; }
}
} }
if( p_current->i_start > ephemer_date ) /* And use the scaled picture */
ephemer_date = p_current->i_start; if( p_region->p_private )
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 */
{ {
SpuHeapDeleteAt( &p_sys->heap, i_index ); region_fmt = p_region->p_private->fmt;
p_region_picture = p_region->p_private->p_picture;
} }
else if( p_current->b_ephemer ) }
/* Force cropping if requested */
if( b_force_crop )
{ {
SubpictureChain( &p_ephemer, p_current ); 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)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 )
{
/* No intersection */
region_fmt.i_visible_width =
region_fmt.i_visible_height = 0;
} }
else else
{ {
SubpictureChain( &p_subpic, p_current ); 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 );
} }
} }
/* If we found ephemer subpictures, check if they have to be /* Update the blender */
* displayed or destroyed */ SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, &region_fmt );
while( p_ephemer != NULL )
{
subpicture_t *p_tmp = p_ephemer;
p_ephemer = p_ephemer->p_next;
if( p_tmp->i_start < ephemer_date ) if( p_sys->p_blend->p_module )
{ {
SpuHeapDeleteSubpicture( &p_sys->heap, p_tmp ); 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 else
{ {
SubpictureChain( &p_subpic, p_tmp ); 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 );
} }
exit:
if( b_rerender_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.
*/
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;
} }
vlc_mutex_unlock( &p_sys->lock ); if( b_restore_format )
p_region->fmt = fmt_original;
}
return p_subpic; /**
* 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 *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;
} }
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment