/*****************************************************************************
* Local prototypes
*****************************************************************************/
+struct spu_private_t
+{
+ vlc_mutex_t subpicture_lock; /**< subpicture heap lock */
+ subpicture_t p_subpicture[VOUT_MAX_SUBPICTURES]; /**< subpictures */
+ 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_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 */
+
+ /* Supciture filters */
+ filter_chain_t *p_chain;
+};
+
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 subpicture_t *sub_new_buffer( filter_t * );
static void sub_del_buffer( filter_t *, subpicture_t * );
#define SCALE_UNIT (1000)
+#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')
+
/* */
struct subpicture_region_private_t
{
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" );
- /* */
- p_spu->i_subpicture_order = 1;
+
+ spu_t *p_spu;
+ spu_private_t *p_sys;
+
+ p_spu = vlc_custom_create( p_this, sizeof(spu_t) + sizeof(spu_private_t),
+ VLC_OBJECT_GENERIC, "subpicture" );
+
+ if( !p_spu )
+ return NULL;
+
+ /* Initialize spu fields */
+ p_spu->pf_control = SpuControl;
+ p_spu->p = p_sys = (spu_private_t*)&p_spu[1];
+
+ /* Initialize private fields */
+ p_sys->i_subpicture_order = 1;
for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++)
{
- p_spu->p_subpicture[i_index].i_status = FREE_SUBPICTURE;
+ p_sys->p_subpicture[i_index].i_status = FREE_SUBPICTURE;
}
- 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;
+ 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_spu->i_channel = 2;
+ p_sys->i_channel = 2;
- vlc_mutex_init( &p_spu->subpicture_lock );
+ vlc_mutex_init( &p_sys->subpicture_lock );
vlc_object_attach( p_spu, p_this );
- p_spu->p_chain = filter_chain_New( p_spu, "sub filter", false,
+ p_sys->p_chain = filter_chain_New( p_spu, "sub filter", false,
SubFilterAllocationInit,
SubFilterAllocationClean,
p_spu );
*/
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 );
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;
}
/**
*/
void spu_Destroy( spu_t *p_spu )
{
+ spu_private_t *p_sys = p_spu->p;
int i_index;
/* Destroy all remaining subpictures */
for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
{
- if( p_spu->p_subpicture[i_index].i_status != FREE_SUBPICTURE )
+ if( p_sys->p_subpicture[i_index].i_status != FREE_SUBPICTURE )
{
- spu_DestroySubpicture( p_spu, &p_spu->p_subpicture[i_index] );
+ spu_DestroySubpicture( p_spu, &p_sys->p_subpicture[i_index] );
}
}
- if( p_spu->p_blend )
- FilterRelease( p_spu->p_blend );
+ if( p_sys->p_blend )
+ FilterRelease( p_sys->p_blend );
+
+ if( p_sys->p_text )
+ FilterRelease( p_sys->p_text );
- if( p_spu->p_text )
- FilterRelease( p_spu->p_text );
+ if( p_sys->p_scale_yuvp )
+ FilterRelease( p_sys->p_scale_yuvp );
- if( p_spu->p_scale_yuvp )
- FilterRelease( p_spu->p_scale_yuvp );
+ if( p_sys->p_scale )
+ FilterRelease( p_sys->p_scale );
- if( p_spu->p_scale )
- FilterRelease( p_spu->p_scale );
+ filter_chain_Delete( p_sys->p_chain );
- filter_chain_Delete( p_spu->p_chain );
+ vlc_mutex_destroy( &p_sys->subpicture_lock );
- vlc_mutex_destroy( &p_spu->subpicture_lock );
vlc_object_release( p_spu );
}
}
}
-/**
- * Create a subpicture region
- *
- * \param p_this vlc_object_t
- * \param p_fmt the format that this subpicture region should have
- */
-subpicture_region_t *__spu_CreateRegion( vlc_object_t *p_this,
- video_format_t *p_fmt )
+/* */
+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;
- /* FIXME is that *really* wanted? */
- if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') )
- p_fmt->p_palette = calloc( 1, sizeof(video_palette_t) );
- else
- p_fmt->p_palette = NULL; /* XXX and that above all? */
-
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->p_style = NULL;
p_region->p_picture = NULL;
- if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') )
+ 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,
return p_region;
}
-/**
- * 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 )
+/* */
+void subpicture_region_Delete( subpicture_region_t *p_region )
{
if( !p_region )
return;
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;
+ }
+}
+
/**
* Display a subpicture
*
*/
subpicture_t *spu_CreateSubpicture( spu_t *p_spu )
{
+ spu_private_t *p_sys = p_spu->p;
int i_subpic; /* subpicture index */
subpicture_t * p_subpic = NULL; /* first free subpicture */
/* Get lock */
- vlc_mutex_lock( &p_spu->subpicture_lock );
+ vlc_mutex_lock( &p_sys->subpicture_lock );
/*
* Look for an empty place
p_subpic = NULL;
for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
{
- if( p_spu->p_subpicture[i_subpic].i_status == FREE_SUBPICTURE )
+ if( p_sys->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;
+ p_subpic = &p_sys->p_subpicture[i_subpic];
+ p_sys->p_subpicture[i_subpic].i_status = RESERVED_SUBPICTURE;
break;
}
}
if( p_subpic == NULL )
{
msg_Err( p_spu, "subpicture heap is full" );
- vlc_mutex_unlock( &p_spu->subpicture_lock );
+ vlc_mutex_unlock( &p_sys->subpicture_lock );
return NULL;
}
/* Copy subpicture information, set some default values */
memset( p_subpic, 0, sizeof(subpicture_t) );
- p_subpic->i_order = p_spu->i_subpicture_order++;
+ p_subpic->i_order = p_sys->i_subpicture_order++;
p_subpic->i_status = RESERVED_SUBPICTURE;
p_subpic->b_absolute = true;
p_subpic->b_fade = false;
p_subpic->pf_render = NULL;
p_subpic->pf_destroy = NULL;
p_subpic->p_sys = NULL;
- vlc_mutex_unlock( &p_spu->subpicture_lock );
-
- p_subpic->pf_create_region = __spu_CreateRegion;
- p_subpic->pf_destroy_region = __spu_DestroyRegion;
+ vlc_mutex_unlock( &p_sys->subpicture_lock );
return p_subpic;
}
*/
void spu_DestroySubpicture( spu_t *p_spu, subpicture_t *p_subpic )
{
+ spu_private_t *p_sys = p_spu->p;
+
/* Get lock */
- vlc_mutex_lock( &p_spu->subpicture_lock );
+ vlc_mutex_lock( &p_sys->subpicture_lock );
/* There can be race conditions so we need to check the status */
if( p_subpic->i_status == FREE_SUBPICTURE )
{
- vlc_mutex_unlock( &p_spu->subpicture_lock );
+ vlc_mutex_unlock( &p_sys->subpicture_lock );
return;
}
p_subpic, p_subpic->i_status );
}
- 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 );
- }
+ subpicture_region_ChainDelete( p_subpic->p_region );
+ p_subpic->p_region = NULL;
if( p_subpic->pf_destroy )
{
p_subpic->i_status = FREE_SUBPICTURE;
- vlc_mutex_unlock( &p_spu->subpicture_lock );
+ vlc_mutex_unlock( &p_sys->subpicture_lock );
}
static void FilterRelease( filter_t *p_filter )
{
if( p_filter->p_module )
- module_Unneed( p_filter, p_filter->p_module );
+ module_unneed( p_filter, p_filter->p_module );
vlc_object_detach( p_filter );
vlc_object_release( p_filter );
{
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 )
/* */
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 );
{
/* 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;
}
/* */
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 )
{
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 )
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 );
}
-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;
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
/* 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_Create( p_text, "spu-duration", VLC_VAR_TIME );
+ var_Create( p_text, "spu-elapsed", VLC_VAR_TIME );
+ var_Create( p_text, "text-rerender", VLC_VAR_BOOL );
+ var_Create( p_text, "scale", VLC_VAR_INTEGER );
- var_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 );
+ 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_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" );
+ *pb_rerender_text = var_GetBool( 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" );
+ var_Destroy( p_text, "spu-duration" );
+ var_Destroy( p_text, "spu-elapsed" );
+ var_Destroy( p_text, "text-rerender" );
+ var_Destroy( p_text, "scale" );
exit:
p_region->i_align |= SUBPICTURE_RENDERED;
const video_format_t *p_fmt,
const spu_area_t *p_subtitle_area, int i_subtitle_area )
{
+ spu_private_t *p_sys = p_spu->p;
+
video_format_t fmt_original = p_region->fmt;
bool b_rerender_text = false;
bool b_restore_format = false;
int i_x_offset;
int i_y_offset;
- filter_t *p_scale;
- video_format_t *p_region_fmt;
+ video_format_t region_fmt;
picture_t *p_region_picture;
- vlc_assert_locked( &p_spu->subpicture_lock );
+ vlc_assert_locked( &p_sys->subpicture_lock );
/* 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('T','E','X','T') )
+ if( p_region->fmt.i_chroma == VLC_FOURCC_TEXT )
{
const int i_min_scale_ratio = SCALE_UNIT; /* FIXME what is the right value? (scale_size is not) */
SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, i_min_scale_ratio );
b_restore_format = b_rerender_text;
/* 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;
}
* 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
* requested (dvd menu) */
int i_margin_y = 0;
if( !b_force_crop && p_subpic->b_subtitle )
- i_margin_y = spu_invscale_h( p_spu->i_margin, scale_size );
+ i_margin_y = spu_invscale_h( p_sys->i_margin, scale_size );
/* Place the picture
* We compute the position in the rendered 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() );
+ 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 );
+ SpuAreaFixOverlap( p_area, &display, p_subtitle_area, i_subtitle_area,
+ p_region->i_align );
}
/* Fix the position for the current scale_size */
/* */
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;
}
/* */
- p_region_fmt = &p_region->fmt;
+ region_fmt = p_region->fmt;
p_region_picture = p_region->p_picture;
/* Scale from rendered size to destination size */
- p_scale = b_using_palette ? p_spu->p_scale_yuvp : p_spu->p_scale;
-
- if( p_scale &&
- ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_force_palette ) )
+ 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 );
- /* TODO when b_using_palette is true, we should first convert it to YUVA to allow
- * a proper rescaling */
-
- /* Destroy if cache is unusable
- * FIXME do not always destroy the region it can sometimes be reused
- * if same size and same palette if present */
+ /* Destroy the cache if unusable */
if( p_region->p_private )
{
- SpuRegionPrivateDestroy( p_region->p_private );
- p_region->p_private = NULL;
+ 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 )
+ {
+ SpuRegionPrivateDestroy( p_private );
+ p_region->p_private = NULL;
+ }
}
/* Scale if needed into cache */
if( !p_region->p_private )
{
- picture_t *p_pic;
+ filter_t *p_scale = p_sys->p_scale;
- p_scale->fmt_in.video = p_region->fmt;
- p_scale->fmt_out.video = p_region->fmt;
+ 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->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_scale_yuvp->fmt_in.video = p_region->fmt;
- p_region->p_private = SpuRegionPrivateCreate( &p_scale->fmt_out.video );
+ /* 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;
- if( p_scale->p_module )
+ 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 );
+ }
+ }
+
+ /* Conversion(except from YUVP)/Scaling */
+ if( p_picture &&
+ ( p_picture->format.i_width != i_dst_width ||
+ p_picture->format.i_height != i_dst_height ) )
{
- picture_Yield( p_region->p_picture );
- p_region->p_private->p_picture = p_scale->pf_video_filter( p_scale, p_region->p_picture );
+ p_scale->fmt_in.video = p_picture->format;
+ p_scale->fmt_out.video = p_picture->format;
+
+ p_scale->fmt_out.video.i_width = i_dst_width;
+ p_scale->fmt_out.video.i_height = i_dst_height;
+
+ p_scale->fmt_out.video.i_visible_width =
+ spu_scale_w( p_region->fmt.i_visible_width, scale_size );
+ p_scale->fmt_out.video.i_visible_height =
+ spu_scale_h( p_region->fmt.i_visible_height, scale_size );
+
+ p_picture = p_scale->pf_video_filter( p_scale, p_picture );
+ if( !p_picture )
+ msg_Err( p_spu, "scaling failed" );
}
- if( !p_region->p_private->p_picture )
+
+ /* */
+ p_region->p_private = SpuRegionPrivateCreate( &p_picture->format );
+ if( p_region->p_private )
{
- msg_Err( p_spu, "scaling failed (module not loaded)" );
- SpuRegionPrivateDestroy( p_region->p_private );
- p_region->p_private = NULL;
+ p_region->p_private->p_picture = p_picture;
+ if( !p_region->p_private->p_picture )
+ {
+ SpuRegionPrivateDestroy( p_region->p_private );
+ p_region->p_private = NULL;
+ }
+ }
+ else
+ {
+ picture_Release( p_picture );
}
}
/* And use the scaled picture */
if( p_region->p_private )
{
- p_region_fmt = &p_region->p_private->fmt;
+ region_fmt = p_region->p_private->fmt;
p_region_picture = p_region->p_private->p_picture;
}
}
/* 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
{
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 );
+ i_y_offset + (int)region_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;
+ 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 );
}
- b_restore_format = true;
}
/* 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 )
{
const int i_alpha = SpuRegionAlpha( p_subpic, p_region );
- p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
+ 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:
subpicture_t *p_subpic_list,
const video_format_t *p_fmt_src )
{
+ 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();
int i_subtitle_area;
/* Get lock */
- vlc_mutex_lock( &p_spu->subpicture_lock );
+ vlc_mutex_lock( &p_sys->subpicture_lock );
/* Preprocess subpictures */
i_subpicture = 0;
/* Be sure we have at least 1 picture to process */
if( i_subpicture <= 0 )
{
- vlc_mutex_unlock( &p_spu->subpicture_lock );
+ vlc_mutex_unlock( &p_sys->subpicture_lock );
return;
}
p_subtitle_area = calloc( i_subtitle_region_count, sizeof(*p_subtitle_area) );
/* Create the blending module */
- if( !p_spu->p_blend )
+ 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) */
p_subpic->i_original_picture_height = i_render_height = i_source_video_height;
}
- if( p_spu->p_text )
+ if( p_sys->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_sys->p_text->fmt_out.video.i_width =
+ p_sys->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;
+ 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 */
if( p_subtitle_area != p_subtitle_area_buffer )
free( p_subtitle_area );
- vlc_mutex_unlock( &p_spu->subpicture_lock );
+ vlc_mutex_unlock( &p_sys->subpicture_lock );
}
/*****************************************************************************
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_spu->p_chain, display_date );
+ filter_chain_SubFilter( p_sys->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++ )
+ for( i_channel = 0; i_channel < p_sys->i_channel; i_channel++ )
{
subpicture_t *p_ephemer = NULL;
mtime_t ephemer_date = 0;
for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
{
- subpicture_t *p_current = &p_spu->p_subpicture[i_index];
+ subpicture_t *p_current = &p_sys->p_subpicture[i_index];
if( p_current->i_channel != i_channel ||
p_current->i_status != READY_SUBPICTURE ||
!( 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] );
+ spu_DestroySubpicture( p_spu, &p_sys->p_subpicture[i_index] );
continue;
}
*****************************************************************************/
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->subpicture_lock );
for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
{
- p_subpic = &p_spu->p_subpicture[i_subpic];
+ p_subpic = &p_sys->p_subpicture[i_subpic];
if( p_subpic->i_status == FREE_SUBPICTURE
|| ( p_subpic->i_status != RESERVED_SUBPICTURE
&& p_subpic->i_status != READY_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 );
- }
+ subpicture_region_ChainDelete( p_subpic->p_region );
+ p_subpic->p_region = NULL;
if( p_subpic->pf_destroy ) p_subpic->pf_destroy( p_subpic );
p_subpic->i_status = FREE_SUBPICTURE;
}
if( !b_locked )
- vlc_mutex_unlock( &p_spu->subpicture_lock );
+ vlc_mutex_unlock( &p_sys->subpicture_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->subpicture_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->subpicture_lock );
break;
case SPU_CHANNEL_CLEAR:
*****************************************************************************/
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->subpicture_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->subpicture_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->subpicture_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 );
}
/*****************************************************************************
p_subpic->b_absolute = true;
p_subpic->i_alpha = 0xFF;
- p_subpic->pf_create_region = __spu_CreateRegion;
- p_subpic->pf_destroy_region = __spu_DestroyRegion;
-
VLC_UNUSED(p_filter);
return p_subpic;
}
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 );
- }
+ subpicture_region_ChainDelete( p_subpic->p_region );
+ VLC_UNUSED(p_filter);
free( p_subpic );
}
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_spu->subpicture_lock );
- filter_chain_Reset( p_spu->p_chain, NULL, NULL );
+ vlc_mutex_lock( &p_sys->subpicture_lock );
+ filter_chain_Reset( p_sys->p_chain, NULL, NULL );
spu_ParseChain( p_spu );
- vlc_mutex_unlock( &p_spu->subpicture_lock );
+ vlc_mutex_unlock( &p_sys->subpicture_lock );
return VLC_SUCCESS;
}
projects / vlc / blobdiff