static int SubFilterCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
-static int sub_filter_allocation_init( filter_t *, void * );
-static void sub_filter_allocation_clear( filter_t * );
+static int SubFilterAllocationInit( filter_t *, void * );
+static void SubFilterAllocationClean( filter_t * );
struct filter_owner_sys_t
{
spu_t *p_spu;
int i_channel;
};
-enum {
- SCALE_DEFAULT,
- SCALE_TEXT,
- SCALE_SIZE
-};
-
#define SCALE_UNIT (1000)
-static void FilterRelease( filter_t *p_filter )
-{
- if( p_filter->p_module )
- module_Unneed( p_filter, p_filter->p_module );
-
- vlc_object_detach( p_filter );
- vlc_object_release( p_filter );
-}
+/* */
+static void SpuRenderCreateAndLoadText( spu_t *p_spu );
+static void SpuRenderCreateAndLoadScale( spu_t *p_spu );
+static void FilterRelease( filter_t *p_filter );
/**
* Creates the subpicture unit
vlc_object_attach( p_spu, p_this );
p_spu->p_chain = filter_chain_New( p_spu, "sub filter", false,
- sub_filter_allocation_init,
- sub_filter_allocation_clear,
+ SubFilterAllocationInit,
+ SubFilterAllocationClean,
p_spu );
+
+ /* Load text and scale module */
+ SpuRenderCreateAndLoadText( p_spu );
+ SpuRenderCreateAndLoadScale( p_spu );
+
return p_spu;
}
}
}
-/**
- * Create a subpicture region
- *
- * \param p_this vlc_object_t
- * \param p_fmt the format that this subpicture region should have
- */
+
+/* */
static void RegionPictureRelease( picture_t *p_pic )
{
free( p_pic->p_data_orig );
/* We use pf_release nullity to know if the picture has already been released. */
p_pic->pf_release = NULL;
}
+
+/**
+ * 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 *p_region = malloc( sizeof(subpicture_region_t) );
- if( !p_region ) return NULL;
+ subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) );
+ if( !p_region )
+ return NULL;
+
+ /* 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? */
- memset( p_region, 0, sizeof(subpicture_region_t) );
+ p_region->fmt = *p_fmt;
p_region->i_alpha = 0xff;
p_region->p_next = NULL;
p_region->p_cache = NULL;
- p_region->fmt = *p_fmt;
p_region->psz_text = NULL;
p_region->p_style = NULL;
- if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') )
- p_fmt->p_palette = p_region->fmt.p_palette =
- malloc( sizeof(video_palette_t) );
- else p_fmt->p_palette = p_region->fmt.p_palette = NULL;
-
- p_region->picture.p_data_orig = NULL;
-
- if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') ) return p_region;
+ if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') )
+ return p_region;
vout_AllocatePicture( p_this, &p_region->picture, p_fmt->i_chroma,
p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect );
if( !p_region->picture.i_planes )
{
- free( p_region );
free( p_fmt->p_palette );
+ free( p_region );
return NULL;
}
return p_region;
}
-/**
- * Make a subpicture region from an existing picture_t
- *
- * \param p_this vlc_object_t
- * \param p_fmt the format that this subpicture region should have
- * \param p_pic a pointer to the picture creating the region (not freed)
- */
-subpicture_region_t *__spu_MakeRegion( vlc_object_t *p_this,
- video_format_t *p_fmt,
- picture_t *p_pic )
-{
- subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) );
- (void)p_this;
- if( !p_region ) return NULL;
- memset( p_region, 0, sizeof(subpicture_region_t) );
- p_region->i_alpha = 0xff;
- p_region->p_next = 0;
- p_region->p_cache = 0;
- p_region->fmt = *p_fmt;
- p_region->psz_text = 0;
- p_region->p_style = NULL;
-
- if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') )
- p_fmt->p_palette = p_region->fmt.p_palette =
- malloc( sizeof(video_palette_t) );
- else p_fmt->p_palette = p_region->fmt.p_palette = NULL;
-
- memcpy( &p_region->picture, p_pic, sizeof(picture_t) );
- p_region->picture.pf_release = RegionPictureRelease;
-
- return p_region;
-}
-
/**
* Destroy a subpicture region
*
*/
void __spu_DestroyRegion( vlc_object_t *p_this, subpicture_region_t *p_region )
{
- if( !p_region ) return;
- if( p_region->picture.pf_release )
- p_region->picture.pf_release( &p_region->picture );
+ if( !p_region )
+ return;
+
+ picture_Release( &p_region->picture );
+
free( p_region->fmt.p_palette );
- if( p_region->p_cache ) __spu_DestroyRegion( p_this, p_region->p_cache );
+ if( p_region->p_cache )
+ __spu_DestroyRegion( p_this, p_region->p_cache );
free( p_region->psz_text );
free( p_region->psz_html );
vlc_mutex_unlock( &p_spu->subpicture_lock );
p_subpic->pf_create_region = __spu_CreateRegion;
- p_subpic->pf_make_region = __spu_MakeRegion;
p_subpic->pf_destroy_region = __spu_DestroyRegion;
return p_subpic;
*****************************************************************************
* This function renders all sub picture units in the list.
*****************************************************************************/
+static void FilterRelease( filter_t *p_filter )
+{
+ if( p_filter->p_module )
+ module_Unneed( p_filter, p_filter->p_module );
+
+ vlc_object_detach( p_filter );
+ vlc_object_release( p_filter );
+}
+
static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_aspect )
{
filter_t *p_blend;
if( !p_blend->p_module )
p_blend->p_module = module_Need( p_blend, "video blending", 0, 0 );
}
-static void SpuRenderCreateAndLoadText( spu_t *p_spu, int i_width, int i_height )
+static void SpuRenderCreateAndLoadText( spu_t *p_spu )
{
filter_t *p_text;
es_format_Init( &p_text->fmt_out, VIDEO_ES, 0 );
p_text->fmt_out.video.i_width =
- p_text->fmt_out.video.i_visible_width = i_width;
+ p_text->fmt_out.video.i_visible_width = 32;
p_text->fmt_out.video.i_height =
- p_text->fmt_out.video.i_visible_height = i_height;
+ p_text->fmt_out.video.i_visible_height = 32;
p_text->pf_sub_buffer_new = spu_new_buffer;
p_text->pf_sub_buffer_del = spu_del_buffer;
return p_scale;
}
-
static void SpuRenderCreateAndLoadScale( spu_t *p_spu )
{
/* FIXME: We'll also be using it for YUVA and RGBA blending ... */
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,
p_scale = p_spu->p_scale;
if( p_scale &&
- ( ( scale_size.w > 0 && scale_size.w != SCALE_UNIT ) ||
- ( scale_size.h > 0 && scale_size.h != SCALE_UNIT ) ||
- ( b_force_palette ) ) )
+ ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_force_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 );
p_region->fmt = fmt_original;
}
-void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt_a,
- picture_t *p_pic_dst,
+void spu_RenderSubpictures( spu_t *p_spu,
+ picture_t *p_pic_dst, video_format_t *p_fmt_dst,
subpicture_t *p_subpic_list,
- int i_scale_width_orig, int i_scale_height_orig )
+ const video_format_t *p_fmt_src )
{
- video_format_t fmt = *p_fmt_a, *p_fmt = &fmt;
+ video_format_t *p_fmt = p_fmt_dst;
const mtime_t i_current_date = mdate();
int i_source_video_width;
int i_source_video_height;
subpicture_t *p_subpic;
- spu_scale_t scale_size_org;
/* Get lock */
vlc_mutex_lock( &p_spu->subpicture_lock );
return;
}
- scale_size_org = spu_scale_create( i_scale_width_orig, i_scale_height_orig );
-
- i_source_video_width = p_fmt->i_width * SCALE_UNIT / scale_size_org.w;
- i_source_video_height = p_fmt->i_height * SCALE_UNIT / scale_size_org.h;
+ i_source_video_width = p_fmt_src->i_width;
+ i_source_video_height = p_fmt_src->i_height;
/* */
for( p_subpic = p_subpic_list;
if( !p_spu->p_blend )
SpuRenderCreateBlend( p_spu, p_fmt->i_chroma, p_fmt->i_aspect );
- /* Load the scaling module */
- if( !p_spu->p_scale && !p_spu->p_scale_yuvp )
- SpuRenderCreateAndLoadScale( p_spu );
-
- /* Load the text rendering module; it is possible there is a
- * text region somewhere in the subpicture other than the first
- * element in the region list, so just load it anyway as we'll
- * probably want it sooner or later. */
- if( !p_spu->p_text )
- SpuRenderCreateAndLoadText( p_spu, p_fmt->i_width, p_fmt->i_height );
-
/* */
for( p_subpic = p_subpic_list; ; p_subpic = p_subpic->p_next )
{
/* Render all regions */
for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next )
{
+ /* Check scale validity */
+ if( scale.w <= 0 || scale.h <= 0 )
+ continue;
+
+ /* */
SpuRenderRegion( p_spu, p_pic_dst, p_subpic, p_region,
scale, p_fmt );
}
static subpicture_t *spu_new_buffer( filter_t *p_filter )
{
- (void)p_filter;
- subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t));
- if( !p_subpic ) return NULL;
- memset( p_subpic, 0, sizeof(subpicture_t) );
+ subpicture_t *p_subpic = calloc( 1, sizeof(subpicture_t) );
+ if( !p_subpic )
+ return NULL;
+
p_subpic->b_absolute = true;
+ p_subpic->i_alpha = 0xFF;
p_subpic->pf_create_region = __spu_CreateRegion;
- p_subpic->pf_make_region = __spu_MakeRegion;
p_subpic->pf_destroy_region = __spu_DestroyRegion;
+ VLC_UNUSED(p_filter);
return p_subpic;
}
static picture_t *spu_new_video_buffer( filter_t *p_filter )
{
- picture_t *p_picture = malloc( sizeof(picture_t) );
- if( !p_picture ) return NULL;
- if( vout_AllocatePicture( p_filter, p_picture,
- p_filter->fmt_out.video.i_chroma,
- p_filter->fmt_out.video.i_width,
- p_filter->fmt_out.video.i_height,
- p_filter->fmt_out.video.i_aspect )
- != VLC_SUCCESS )
- {
- free( p_picture );
- return NULL;
- }
+ const video_format_t *p_fmt = &p_filter->fmt_out.video;
- p_picture->pf_release = RegionPictureRelease;
-
- return p_picture;
+ VLC_UNUSED(p_filter);
+ return picture_New( p_fmt->i_chroma,
+ p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect );
}
-static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_pic )
+static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_picture )
{
- (void)p_filter;
- if( p_pic )
- {
- free( p_pic->p_data_orig );
- free( p_pic );
- }
+ VLC_UNUSED(p_filter);
+ picture_Release( p_picture );
}
static int SubFilterCallback( vlc_object_t *p_object, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ spu_t *p_spu = p_data;
+
VLC_UNUSED(p_object); VLC_UNUSED(oldval);
VLC_UNUSED(newval); VLC_UNUSED(psz_var);
- spu_t *p_spu = (spu_t *)p_data;
vlc_mutex_lock( &p_spu->subpicture_lock );
filter_chain_Reset( p_spu->p_chain, NULL, NULL );
spu_ParseChain( p_spu );
return VLC_SUCCESS;
}
-static int sub_filter_allocation_init( filter_t *p_filter, void *p_data )
+static int SubFilterAllocationInit( filter_t *p_filter, void *p_data )
{
- spu_t *p_spu = (spu_t *)p_data;
+ spu_t *p_spu = p_data;
+
+ filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) );
+ if( !p_sys )
+ return VLC_EGENERIC;
p_filter->pf_sub_buffer_new = sub_new_buffer;
p_filter->pf_sub_buffer_del = sub_del_buffer;
- filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) );
- if( !p_sys ) return VLC_EGENERIC;
-
p_filter->p_owner = p_sys;
spu_Control( p_spu, SPU_CHANNEL_REGISTER, &p_sys->i_channel );
p_sys->p_spu = p_spu;
return VLC_SUCCESS;
}
-static void sub_filter_allocation_clear( filter_t *p_filter )
+static void SubFilterAllocationClean( filter_t *p_filter )
{
filter_owner_sys_t *p_sys = p_filter->p_owner;
+
SpuClearChannel( p_sys->p_spu, p_sys->i_channel, true );
free( p_filter->p_owner );
}
+
projects / vlc / blobdiff