/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_vout.h>
#include <vlc_block.h>
#include <vlc_filter.h>
#include <vlc_osd.h>
+#include "../libvlc.h"
+
+#include <assert.h>
+#include <limits.h>
/*****************************************************************************
* Local prototypes
static void spu_del_video_buffer( filter_t *, picture_t * );
static int spu_ParseChain( spu_t * );
-static void spu_DeleteChain( spu_t * );
static int SubFilterCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+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)
+
+#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
+{
+ video_format_t fmt;
+ picture_t *p_picture;
};
+
+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 SpuRenderCreateAndLoadScale( spu_t *p_spu );
+static void FilterRelease( filter_t *p_filter );
+
/**
* Creates the subpicture unit
*
spu_t *__spu_Create( vlc_object_t *p_this )
{
int i_index;
- spu_t *p_spu = vlc_object_create( p_this, VLC_OBJECT_SPU );
-
+ spu_t *p_spu = vlc_custom_create( p_this, sizeof( spu_t ),
+ VLC_OBJECT_GENERIC, "subpicture" );
+ /* */
+ p_spu->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_spu->p_blend = NULL;
p_spu->p_text = NULL;
p_spu->p_scale = NULL;
- p_spu->i_filter = 0;
+ p_spu->p_scale_yuvp = NULL;
p_spu->pf_control = spu_vaControlDefault;
/* Register the default subpicture channel */
p_spu->i_channel = 2;
- vlc_mutex_init( p_this, &p_spu->subpicture_lock );
+ vlc_mutex_init( &p_spu->subpicture_lock );
vlc_object_attach( p_spu, p_this );
+ p_spu->p_chain = filter_chain_New( p_spu, "sub filter", false,
+ SubFilterAllocationInit,
+ SubFilterAllocationClean,
+ p_spu );
+
+ /* Load text and scale module */
+ SpuRenderCreateAndLoadText( p_spu );
+ SpuRenderCreateAndLoadScale( p_spu );
+
return p_spu;
}
int spu_ParseChain( spu_t *p_spu )
{
- char *psz_parser;
- vlc_value_t val;
- var_Get( p_spu, "sub-filter", &val );
- psz_parser = val.psz_string;
-
- while( psz_parser && *psz_parser )
+ char *psz_parser = var_GetString( p_spu, "sub-filter" );
+ if( filter_chain_AppendFromString( p_spu->p_chain, psz_parser ) < 0 )
{
- config_chain_t *p_cfg;
- char *psz_name;
-
- psz_parser = config_ChainCreate( &psz_name, &p_cfg, psz_parser );
-
- msg_Dbg( p_spu, "adding sub-filter: %s", psz_name );
-
- p_spu->pp_filter[p_spu->i_filter] =
- vlc_object_create( p_spu, VLC_OBJECT_FILTER );
- vlc_object_attach( p_spu->pp_filter[p_spu->i_filter], p_spu );
- p_spu->pp_filter[p_spu->i_filter]->pf_sub_buffer_new = sub_new_buffer;
- p_spu->pp_filter[p_spu->i_filter]->pf_sub_buffer_del = sub_del_buffer;
- p_spu->pp_filter[p_spu->i_filter]->p_cfg = p_cfg;
- p_spu->pp_filter[p_spu->i_filter]->p_module =
- module_Need( p_spu->pp_filter[p_spu->i_filter],
- "sub filter", psz_name, VLC_TRUE );
- if( p_spu->pp_filter[p_spu->i_filter]->p_module )
- {
- filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) );
- p_spu->pp_filter[p_spu->i_filter]->p_owner = p_sys;
- spu_Control( p_spu, SPU_CHANNEL_REGISTER, &p_sys->i_channel );
- p_sys->p_spu = p_spu;
- p_spu->i_filter++;
- }
- else
- {
- msg_Dbg( p_spu, "no sub filter found" );
- config_ChainDestroy( p_spu->pp_filter[p_spu->i_filter]->p_cfg );
- vlc_object_detach( p_spu->pp_filter[p_spu->i_filter] );
- vlc_object_destroy( p_spu->pp_filter[p_spu->i_filter] );
- }
-
- if( p_spu->i_filter >= 10 )
- {
- msg_Dbg( p_spu, "can't add anymore filters" );
- }
-
- free( psz_name );
+ free( psz_parser );
+ return VLC_EGENERIC;
}
- if( val.psz_string ) free( val.psz_string );
+ free( psz_parser );
return VLC_SUCCESS;
}
{
int i_index;
- vlc_object_detach( p_spu );
-
/* Destroy all remaining subpictures */
for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
{
}
if( p_spu->p_blend )
- {
- if( p_spu->p_blend->p_module )
- module_Unneed( p_spu->p_blend, p_spu->p_blend->p_module );
-
- vlc_object_detach( p_spu->p_blend );
- vlc_object_destroy( p_spu->p_blend );
- }
+ FilterRelease( p_spu->p_blend );
if( p_spu->p_text )
- {
- if( p_spu->p_text->p_module )
- module_Unneed( p_spu->p_text, p_spu->p_text->p_module );
+ FilterRelease( p_spu->p_text );
- vlc_object_detach( p_spu->p_text );
- vlc_object_destroy( p_spu->p_text );
- }
+ if( p_spu->p_scale_yuvp )
+ FilterRelease( p_spu->p_scale_yuvp );
if( p_spu->p_scale )
- {
- if( p_spu->p_scale->p_module )
- module_Unneed( p_spu->p_scale, p_spu->p_scale->p_module );
-
- vlc_object_detach( p_spu->p_scale );
- vlc_object_destroy( p_spu->p_scale );
- }
+ FilterRelease( p_spu->p_scale );
- spu_DeleteChain( p_spu );
+ filter_chain_Delete( p_spu->p_chain );
vlc_mutex_destroy( &p_spu->subpicture_lock );
- vlc_object_destroy( p_spu );
-}
-
-static void spu_DeleteChain( spu_t *p_spu )
-{
- if( p_spu->i_filter )
- while( p_spu->i_filter )
- {
- p_spu->i_filter--;
- module_Unneed( p_spu->pp_filter[p_spu->i_filter],
- p_spu->pp_filter[p_spu->i_filter]->p_module );
- free( p_spu->pp_filter[p_spu->i_filter]->p_owner );
- config_ChainDestroy( p_spu->pp_filter[p_spu->i_filter]->p_cfg );
- vlc_object_detach( p_spu->pp_filter[p_spu->i_filter] );
- vlc_object_destroy( p_spu->pp_filter[p_spu->i_filter] );
- }
+ vlc_object_release( p_spu );
}
/**
* \param p_this the object in which to destroy the subpicture unit
* \param b_attach to select attach or detach
*/
-void spu_Attach( spu_t *p_spu, vlc_object_t *p_this, vlc_bool_t b_attach )
+void spu_Attach( spu_t *p_spu, vlc_object_t *p_this, bool b_attach )
{
vlc_object_t *p_input;
* \param p_this vlc_object_t
* \param p_fmt the format that this subpicture region should have
*/
-static void RegionPictureRelease( picture_t *p_pic )
-{
- if( p_pic->p_data_orig ) free( p_pic->p_data_orig );
-}
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_YUVP )
+ 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->p_next = NULL;
- p_region->p_cache = NULL;
p_region->fmt = *p_fmt;
+ 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('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_TEXT )
+ return p_region;
- vout_AllocatePicture( p_this, &p_region->picture, p_fmt->i_chroma,
- p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect );
-
- if( !p_region->picture.i_planes )
+ p_region->p_picture = picture_New( p_fmt->i_chroma, p_fmt->i_width, p_fmt->i_height,
+ p_fmt->i_aspect );
+ if( !p_region->p_picture )
{
+ free( p_fmt->p_palette );
free( p_region );
- if( p_fmt->p_palette ) free( p_fmt->p_palette );
return NULL;
}
- p_region->picture.pf_release = RegionPictureRelease;
-
return p_region;
}
/**
- * Make a subpicture region from an existing picture_t
+ * Destroy a subpicture region
*
* \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)
+ * \param p_region the subpicture region to destroy
*/
-subpicture_region_t *__spu_MakeRegion( vlc_object_t *p_this,
- video_format_t *p_fmt,
- picture_t *p_pic )
+void __spu_DestroyRegion( vlc_object_t *p_this, subpicture_region_t *p_region )
{
- subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) );
- (void)p_this;
- memset( p_region, 0, sizeof(subpicture_region_t) );
- 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_region )
+ return;
- 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;
+ if( p_region->p_private )
+ SpuRegionPrivateDestroy( p_region->p_private );
- memcpy( &p_region->picture, p_pic, sizeof(picture_t) );
- p_region->picture.pf_release = RegionPictureRelease;
+ if( p_region->p_picture )
+ picture_Release( p_region->p_picture );
- return p_region;
-}
+ free( p_region->fmt.p_palette );
-/**
- * Destroy a subpicture region
- *
- * \param p_this vlc_object_t
- * \param p_region the subpicture region to destroy
- */
-void __spu_DestroyRegion( vlc_object_t *p_this, subpicture_region_t *p_region )
-{
- if( !p_region ) return;
- if( p_region->picture.pf_release )
- p_region->picture.pf_release( &p_region->picture );
- if( p_region->fmt.p_palette ) free( p_region->fmt.p_palette );
- if( p_region->p_cache ) __spu_DestroyRegion( p_this, p_region->p_cache );
-
- if( p_region->psz_text )
- free( p_region->psz_text );
- if( p_region->psz_html )
- free( p_region->psz_html );
+ 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 );
}
p_subpic, p_subpic->i_status );
}
- /* Remove reservation flag */
- p_subpic->i_status = READY_SUBPICTURE;
-
if( p_subpic->i_channel == DEFAULT_CHAN )
{
p_subpic->i_channel = 0xFFFF;
spu_Control( p_spu, SPU_CHANNEL_CLEAR, DEFAULT_CHAN );
p_subpic->i_channel = DEFAULT_CHAN;
}
+
+ /* Remove reservation flag */
+ p_subpic->i_status = READY_SUBPICTURE;
}
/**
/* 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_status = RESERVED_SUBPICTURE;
- p_subpic->b_absolute = VLC_TRUE;
- p_subpic->b_pausable = VLC_FALSE;
- p_subpic->b_fade = VLC_FALSE;
+ 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;
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;
vlc_mutex_unlock( &p_spu->subpicture_lock );
}
-/*****************************************************************************
- * spu_RenderSubpictures: render a subpicture list
- *****************************************************************************
- * This function renders all sub picture units in the list.
- *****************************************************************************/
-void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
- picture_t *p_pic_dst, picture_t *p_pic_src,
- subpicture_t *p_subpic,
- int i_scale_width_orig, int i_scale_height_orig )
+static void FilterRelease( filter_t *p_filter )
{
- int i_source_video_width = p_fmt->i_width * 1000 / i_scale_width_orig;
- int i_source_video_height = p_fmt->i_height * 1000 / i_scale_height_orig;
+ if( p_filter->p_module )
+ module_Unneed( p_filter, p_filter->p_module );
- /* Get lock */
- vlc_mutex_lock( &p_spu->subpicture_lock );
+ 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;
+
+ assert( !p_spu->p_blend );
+
+ p_spu->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_blend;
+
+ assert( p_blend );
- /* Check i_status again to make sure spudec hasn't destroyed the subpic */
- while( ( p_subpic != NULL ) && ( p_subpic->i_status != FREE_SUBPICTURE ) )
+ /* */
+ if( p_blend->p_module && p_blend->fmt_in.video.i_chroma != p_in_fmt->i_chroma )
{
- subpicture_region_t *p_region = p_subpic->p_region;
- int pi_scale_width[ SCALE_SIZE ];
- int pi_scale_height[ SCALE_SIZE ];
- int pi_subpic_x[ SCALE_SIZE ];
- int k;
+ /* 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 );
+ p_blend->p_module = NULL;
+ }
- for( k = 0; k < SCALE_SIZE ; k++ )
- pi_subpic_x[ k ] = p_subpic->i_x;
+ /* */
+ p_blend->fmt_in.video = *p_in_fmt;
- /* Load the blending module */
- if( !p_spu->p_blend && p_region )
- {
- p_spu->p_blend = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
- vlc_object_attach( p_spu->p_blend, p_spu );
- p_spu->p_blend->fmt_out.video.i_x_offset =
- p_spu->p_blend->fmt_out.video.i_y_offset = 0;
- p_spu->p_blend->fmt_out.video.i_aspect = p_fmt->i_aspect;
- p_spu->p_blend->fmt_out.video.i_chroma = p_fmt->i_chroma;
- p_spu->p_blend->fmt_in.video.i_chroma = VLC_FOURCC('Y','U','V','P');
- /* FIXME: We'll also be using it for YUVA and RGBA blending ... */
-
- p_spu->p_blend->p_module =
- module_Need( p_spu->p_blend, "video blending", 0, 0 );
- }
+ /* */
+ p_blend->fmt_out.video.i_width =
+ p_blend->fmt_out.video.i_visible_width = i_out_width;
+ p_blend->fmt_out.video.i_height =
+ p_blend->fmt_out.video.i_visible_height = i_out_height;
- /* 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 && p_region )
- {
- char *psz_modulename = NULL;
+ /* */
+ if( !p_blend->p_module )
+ p_blend->p_module = module_Need( p_blend, "video blending", 0, 0 );
+}
+static void SpuRenderCreateAndLoadText( spu_t *p_spu )
+{
+ filter_t *p_text;
- p_spu->p_text = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
- vlc_object_attach( p_spu->p_text, p_spu );
+ assert( !p_spu->p_text );
+
+ p_spu->p_text =
+ p_text = vlc_custom_create( p_spu, sizeof(filter_t),
+ VLC_OBJECT_GENERIC, "spu text" );
+ if( !p_text )
+ return;
- p_spu->p_text->fmt_out.video.i_width =
- p_spu->p_text->fmt_out.video.i_visible_width =
- p_fmt->i_width;
- p_spu->p_text->fmt_out.video.i_height =
- p_spu->p_text->fmt_out.video.i_visible_height =
- p_fmt->i_height;
+ es_format_Init( &p_text->fmt_in, VIDEO_ES, 0 );
- p_spu->p_text->pf_sub_buffer_new = spu_new_buffer;
- p_spu->p_text->pf_sub_buffer_del = spu_del_buffer;
+ 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 = 32;
+ p_text->fmt_out.video.i_height =
+ p_text->fmt_out.video.i_visible_height = 32;
- psz_modulename = var_CreateGetString( p_spu, "text-renderer" );
- if( psz_modulename && *psz_modulename )
+ p_text->pf_sub_buffer_new = spu_new_buffer;
+ p_text->pf_sub_buffer_del = spu_del_buffer;
+
+ vlc_object_attach( p_text, p_spu );
+
+ /* FIXME TOCHECK shouldn't module_Need( , , psz_modulename, false ) do the
+ * 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 );
+
+ if( !p_text->p_module )
+ 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_src_chroma, vlc_fourcc_t i_dst_chroma,
+ bool b_resize )
+{
+ filter_t *p_scale;
+
+ p_scale = vlc_custom_create( p_obj, sizeof(filter_t),
+ VLC_OBJECT_GENERIC, "scale" );
+ if( !p_scale )
+ return NULL;
+
+ es_format_Init( &p_scale->fmt_in, VIDEO_ES, 0 );
+ 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_dst_chroma;
+ p_scale->fmt_out.video.i_width =
+ 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 );
+
+ return p_scale;
+}
+static void SpuRenderCreateAndLoadScale( spu_t *p_spu )
+{
+ assert( !p_spu->p_scale );
+ assert( !p_spu->p_scale_yuvp );
+ /* XXX p_spu->p_scale is used for all conversion/scaling except yuvp to
+ * yuva/rgba */
+ p_spu->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_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 )
+{
+ assert( p_region->fmt.i_chroma == VLC_FOURCC_TEXT );
+
+ if( !p_spu->p_text || !p_spu->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.
+ */
+
+ /* FIXME why these variables are recreated every time and not
+ * when text renderer module was created ? */
+ var_Create( p_spu->p_text, "spu-duration", VLC_VAR_TIME );
+ var_Create( p_spu->p_text, "spu-elapsed", VLC_VAR_TIME );
+ var_Create( p_spu->p_text, "text-rerender", VLC_VAR_BOOL );
+ var_Create( p_spu->p_text, "scale", VLC_VAR_INTEGER );
+
+ var_SetTime( p_spu->p_text, "spu-duration", p_subpic->i_stop - p_subpic->i_start );
+ var_SetTime( p_spu->p_text, "spu-elapsed", mdate() - p_subpic->i_start );
+ var_SetBool( p_spu->p_text, "text-rerender", false );
+ var_SetInteger( p_spu->p_text, "scale", i_min_scale_ratio );
+
+ if( p_spu->p_text->pf_render_html && p_region->psz_html )
+ {
+ p_spu->p_text->pf_render_html( p_spu->p_text,
+ p_region, p_region );
+ }
+ else if( p_spu->p_text->pf_render_text )
+ {
+ p_spu->p_text->pf_render_text( p_spu->p_text,
+ p_region, p_region );
+ }
+ *pb_rerender_text = var_GetBool( p_spu->p_text, "text-rerender" );
+
+ var_Destroy( p_spu->p_text, "spu-duration" );
+ var_Destroy( p_spu->p_text, "spu-elapsed" );
+ var_Destroy( p_spu->p_text, "text-rerender" );
+ var_Destroy( p_spu->p_text, "scale" );
+
+exit:
+ p_region->i_align |= SUBPICTURE_RENDERED;
+}
+
+/**
+ * A few scale functions helpers.
+ */
+typedef struct
+{
+ int w;
+ int h;
+} spu_scale_t;
+
+static spu_scale_t spu_scale_create( int w, int h )
+{
+ spu_scale_t s = { .w = w, .h = h };
+ 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
+ */
+
+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 s )
+{
+ spu_area_t a = { .i_x = x, .i_y = y, .i_width = w, .i_height = h, .scale = s };
+ return a;
+}
+static spu_area_t spu_area_scaled( spu_area_t a )
+{
+ if( a.scale.w == SCALE_UNIT && a.scale.h == SCALE_UNIT )
+ return a;
+
+ a.i_x = spu_scale_w( a.i_x, a.scale );
+ a.i_y = spu_scale_h( a.i_y, a.scale );
+
+ a.i_width = spu_scale_w( a.i_width, a.scale );
+ a.i_height = spu_scale_h( a.i_height, a.scale );
+
+ a.scale = spu_scale_unit();
+ return a;
+}
+static spu_area_t spu_area_unscaled( spu_area_t a, spu_scale_t s )
+{
+ if( a.scale.w == s.w && a.scale.h == s.h )
+ return a;
+
+ a = spu_area_scaled( a );
+
+ a.i_x = spu_invscale_w( a.i_x, s );
+ a.i_y = spu_invscale_h( a.i_y, s );
+
+ a.i_width = spu_invscale_w( a.i_width, s );
+ a.i_height = spu_invscale_h( a.i_height, s );
+
+ a.scale = s;
+ return a;
+}
+static bool spu_area_overlap( spu_area_t a, spu_area_t b )
+{
+ const int i_dx = 0;
+ const int i_dy = 0;
+
+ a = spu_area_scaled( a );
+ b = spu_area_scaled( b );
+
+ return __MAX( a.i_x-i_dx, b.i_x ) < __MIN( a.i_x+a.i_width +i_dx, b.i_x+b.i_width ) &&
+ __MAX( a.i_y-i_dy, b.i_y ) < __MIN( a.i_y+a.i_height+i_dy, b.i_y+b.i_height );
+}
+
+/**
+ * Avoid area overlapping
+ */
+static void SpuAreaFixOverlap( spu_area_t *p_dst,
+ const spu_area_t *p_master,
+ const spu_area_t *p_sub, int i_sub, int i_align )
+{
+ spu_area_t a = spu_area_scaled( *p_dst );
+ bool b_moved = false;
+ bool b_ok;
+
+ assert( p_master->i_x == 0 && p_master->i_y == 0 );
+
+ /* Check for overlap
+ * XXX It is not fast O(n^2) but we should not have a lot of region */
+ do
+ {
+ b_ok = true;
+ for( int i = 0; i < i_sub; i++ )
+ {
+ spu_area_t sub = spu_area_scaled( p_sub[i] );
+
+ if( !spu_area_overlap( a, sub ) )
+ continue;
+
+ if( i_align & SUBPICTURE_ALIGN_TOP )
{
- p_spu->p_text->p_module =
- module_Need( p_spu->p_text, "text renderer",
- psz_modulename, VLC_TRUE );
+ /* We go down */
+ int i_y = sub.i_y + sub.i_height;
+ if( i_y + a.i_height > p_master->i_height )
+ break;
+ a.i_y = i_y;
+ b_moved = true;
}
- if( !p_spu->p_text->p_module )
+ else if( i_align & SUBPICTURE_ALIGN_BOTTOM )
{
- p_spu->p_text->p_module =
- module_Need( p_spu->p_text, "text renderer", 0, 0 );
+ /* 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;
}
- if( psz_modulename ) free( psz_modulename );
- }
-
- if( p_spu->p_text )
- {
- subpicture_region_t *p_text_region = p_subpic->p_region;
-
- /* Only overwrite the size fields if the region is still in pre-rendered
- * TEXT format. We have to traverse the subregion list because if more
- * than one subregion is present, the text region isn't guarentteed to
- * be the first in the list, and only text regions use this flag.
- * All of this effort assists with the rescaling of text that has been
- * rendered at native resolution, rather than video resolution.
- */
- while( p_text_region &&
- ( p_text_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') ) )
+ else
{
- p_text_region = p_text_region->p_next;
+ /* TODO what to do in this case? */
+ //fprintf( stderr, "Overlap with unsupported alignment\n" );
+ break;
}
- if( p_text_region &&
- ( ( p_text_region->i_align & SUBPICTURE_RENDERED ) == 0 ) )
- {
- p_spu->p_text->fmt_out.video.i_width =
- p_spu->p_text->fmt_out.video.i_visible_width =
- p_fmt->i_width;
- p_spu->p_text->fmt_out.video.i_height =
- p_spu->p_text->fmt_out.video.i_visible_height =
- p_fmt->i_height;
- }
+ b_ok = false;
+ break;
}
+ } while( !b_ok );
+
+ if( b_moved )
+ *p_dst = spu_area_unscaled( a, p_dst->scale );
+}
- pi_scale_width[ SCALE_DEFAULT ] = i_scale_width_orig;
- pi_scale_height[ SCALE_DEFAULT ] = i_scale_height_orig;
- if( p_spu->p_text )
- {
- pi_scale_width[ SCALE_TEXT ] = ( p_fmt->i_width * 1000 ) /
- p_spu->p_text->fmt_out.video.i_width;
- pi_scale_height[ SCALE_TEXT ] = ( p_fmt->i_height * 1000 ) /
- p_spu->p_text->fmt_out.video.i_height;
- }
+/**
+ * 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;
+ 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;
+ }
+
+ if( p_region->i_align & SUBPICTURE_ALIGN_LEFT )
+ {
+ i_x = i_delta_x;
+ }
+ else if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT )
+ {
+ i_x = p_subpic->i_original_picture_width - p_region->fmt.i_width - i_delta_x;
+ }
+ else
+ {
+ i_x = p_subpic->i_original_picture_width / 2 - p_region->fmt.i_width / 2;
+ }
+
+ if( p_subpic->b_absolute )
+ {
+ i_x = i_delta_x;
+ i_y = i_delta_y;
+ }
+
+ /* Margin shifts all subpictures */
+ if( i_margin_y != 0 )
+ i_y -= i_margin_y;
+
+ /* Clamp offset to not go out of the screen (when possible) */
+ const int i_error_x = (i_x + p_region->fmt.i_width) - p_subpic->i_original_picture_width;
+ if( i_error_x > 0 )
+ i_x -= i_error_x;
+ if( i_x < 0 )
+ i_x = 0;
+
+ const int i_error_y = (i_y + p_region->fmt.i_height) - p_subpic->i_original_picture_height;
+ if( i_error_y > 0 )
+ i_y -= i_error_y;
+ if( i_y < 0 )
+ i_y = 0;
+
+ *pi_x = i_x;
+ *pi_y = i_y;
+}
- for( k = 0; k < SCALE_SIZE ; k++ )
+/**
+ * This function computes the current alpha value for a given region.
+ */
+static int SpuRegionAlpha( subpicture_t *p_subpic, subpicture_region_t *p_region )
+{
+ /* Compute alpha blend value */
+ int i_fade_alpha = 255;
+ if( p_subpic->b_fade )
+ {
+ mtime_t i_fade_start = ( p_subpic->i_stop +
+ p_subpic->i_start ) / 2;
+ mtime_t i_now = mdate();
+
+ if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start )
{
- if( (p_subpic->i_original_picture_height > 0) &&
- (p_subpic->i_original_picture_width > 0) )
- {
- pi_scale_width[ k ] = pi_scale_width[ k ] * i_source_video_width /
- p_subpic->i_original_picture_width;
- pi_scale_height[ k ] = pi_scale_height[ k ] * i_source_video_height /
- p_subpic->i_original_picture_height;
- }
- else if( p_subpic->i_original_picture_height > 0 )
- {
- pi_scale_height[ k ] = pi_scale_height[ k ] * i_source_video_height /
- p_subpic->i_original_picture_height;
- pi_scale_width[ k ] = pi_scale_width[ k ] * i_source_video_height /
- p_subpic->i_original_picture_height;
- }
+ i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
+ ( p_subpic->i_stop - i_fade_start );
}
+ }
+ return i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025;
+}
+
+/**
+ * It will render the provided region onto p_pic_dst.
+ */
+
+static void SpuRenderRegion( spu_t *p_spu,
+ picture_t *p_pic_dst, spu_area_t *p_area,
+ subpicture_t *p_subpic, subpicture_region_t *p_region,
+ const spu_scale_t scale_size,
+ const video_format_t *p_fmt,
+ const spu_area_t *p_subtitle_area, int i_subtitle_area )
+{
+ 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;
+
+ video_format_t region_fmt;
+ picture_t *p_region_picture;
+
+ vlc_assert_locked( &p_spu->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_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_TEXT )
+ goto exit;
+ }
+
+ /* Force palette if requested
+ * 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_spu->b_force_palette;
+ const bool b_force_crop = b_force_palette && p_spu->b_force_crop;
+ bool b_changed_palette = false;
+
+
+ /* Compute the margin which is expressed in destination pixel unit
+ * The margin is applied only to subtitle and when no forced crop is
+ * requested (dvd menu) */
+ int i_margin_y = 0;
+ if( !b_force_crop && p_subpic->b_subtitle )
+ i_margin_y = spu_invscale_h( p_spu->i_margin, scale_size );
+
+ /* Place the picture
+ * We compute the position in the rendered size */
+ SpuRegionPlace( &i_x_offset, &i_y_offset,
+ p_subpic, p_region, i_margin_y );
+
+ /* Save this position for subtitle overlap support
+ * it is really important that there are given without scale_size applied */
+ *p_area = spu_area_create( i_x_offset, i_y_offset,
+ p_region->fmt.i_width, p_region->fmt.i_height,
+ scale_size );
+
+ /* Handle overlapping subtitles when possible */
+ if( p_subpic->b_subtitle && !p_subpic->b_absolute )
+ {
+ spu_area_t display = spu_area_create( 0, 0, p_fmt->i_width, p_fmt->i_height,
+ spu_scale_unit() );
+
+ SpuAreaFixOverlap( p_area, &display, p_subtitle_area, i_subtitle_area,
+ p_region->i_align );
+ }
+
+ /* Fix the position for the current scale_size */
+ i_x_offset = spu_scale_w( p_area->i_x, p_area->scale );
+ i_y_offset = spu_scale_h( p_area->i_y, p_area->scale );
+
+ /* */
+ if( b_force_palette )
+ {
+ video_palette_t *p_palette = p_region->fmt.p_palette;
+ video_palette_t palette;
- /* Set default subpicture aspect ratio */
- if( p_region && p_region->fmt.i_aspect &&
- ( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den ) )
+ /* 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_spu->palette[i][j];
+
+ if( p_palette->i_entries == palette.i_entries )
{
- p_region->fmt.i_sar_den = p_region->fmt.i_aspect;
- p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR;
+ 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];
}
- if( p_region &&
- ( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den ) )
+ else
{
- p_region->fmt.i_sar_den = p_fmt->i_sar_den;
- p_region->fmt.i_sar_num = p_fmt->i_sar_num;
+ b_changed_palette = true;
}
+ *p_palette = palette;
+ }
- /* Take care of the aspect ratio */
- if( p_region &&
- ( ( p_region->fmt.i_sar_num * p_fmt->i_sar_den ) !=
- ( p_region->fmt.i_sar_den * p_fmt->i_sar_num ) ) )
+ /* */
+ region_fmt = p_region->fmt;
+ p_region_picture = p_region->p_picture;
+
+
+ /* Scale from rendered size to destination size */
+ if( p_spu->p_scale && p_spu->p_scale->p_module &&
+ ( !b_using_palette || ( p_spu->p_scale_yuvp && p_spu->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 */
+ if( p_region->p_private )
{
- for( k = 0; k < SCALE_SIZE ; k++ )
+ 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 )
{
- pi_scale_width[ k ] = pi_scale_width[ k ] *
- (int64_t)p_region->fmt.i_sar_num * p_fmt->i_sar_den /
- p_region->fmt.i_sar_den / p_fmt->i_sar_num;
- pi_subpic_x[ k ] = p_subpic->i_x * pi_scale_width[ k ] / 1000;
+ SpuRegionPrivateDestroy( p_private );
+ p_region->p_private = NULL;
}
}
- /* Load the scaling module */
- if( !p_spu->p_scale &&
- ((((pi_scale_width[ SCALE_TEXT ] > 0) || (pi_scale_height[ SCALE_TEXT ] > 0)) &&
- ((pi_scale_width[ SCALE_TEXT ] != 1000) || (pi_scale_height[ SCALE_TEXT ] != 1000))) ||
- (((pi_scale_width[ SCALE_DEFAULT ] > 0) || (pi_scale_height[ SCALE_DEFAULT ] > 0)) &&
- ((pi_scale_width[ SCALE_DEFAULT ] != 1000) || (pi_scale_height[ SCALE_DEFAULT ] != 1000)))) )
+ /* Scale if needed into cache */
+ if( !p_region->p_private )
{
- p_spu->p_scale = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
- vlc_object_attach( p_spu->p_scale, p_spu );
- p_spu->p_scale->fmt_out.video.i_chroma =
- p_spu->p_scale->fmt_in.video.i_chroma =
- VLC_FOURCC('Y','U','V','P');
- /* FIXME: We'll also be using it for YUVA and RGBA blending ... */
-
- p_spu->p_scale->fmt_in.video.i_width =
- p_spu->p_scale->fmt_in.video.i_height = 32;
- p_spu->p_scale->fmt_out.video.i_width =
- p_spu->p_scale->fmt_out.video.i_height = 16;
-
- p_spu->p_scale->pf_vout_buffer_new = spu_new_video_buffer;
- p_spu->p_scale->pf_vout_buffer_del = spu_del_video_buffer;
- p_spu->p_scale->p_module =
- module_Need( p_spu->p_scale, "video filter2", 0, 0 );
- }
+ filter_t *p_scale = p_spu->p_scale;
- while( p_region && p_spu->p_blend && p_spu->p_blend->pf_video_blend )
- {
- video_format_t orig_fmt = p_region->fmt;
- vlc_bool_t b_rerender_text = VLC_FALSE;
- int i_fade_alpha = 255;
- int i_x_offset;
- int i_y_offset;
- int i_scale_idx = SCALE_DEFAULT;
- int i_inv_scale_x = 1000;
- int i_inv_scale_y = 1000;
-
- if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
+ picture_t *p_picture = p_region->p_picture;
+ picture_Hold( p_picture );
+
+ /* Convert YUVP to YUVA/RGBA first for better scaling quality */
+ if( b_using_palette )
{
- if( p_spu->p_text && p_spu->p_text->p_module )
+ filter_t *p_scale_yuvp = p_spu->p_scale_yuvp;
+
+ p_scale_yuvp->fmt_in.video = p_region->fmt;
+
+ /* TODO converting to RGBA for RGB video output is better */
+ p_scale_yuvp->fmt_out.video = p_region->fmt;
+ p_scale_yuvp->fmt_out.video.i_chroma = VLC_FOURCC_YUVA;
+
+ p_picture = p_scale_yuvp->pf_video_filter( p_scale_yuvp, p_picture );
+ if( !p_picture )
{
- vlc_value_t val;
-
- /* 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_Create( p_spu->p_text, "spu-duration", VLC_VAR_TIME );
- val.i_time = p_subpic->i_stop - p_subpic->i_start;
- var_Set( p_spu->p_text, "spu-duration", val );
-
- var_Create( p_spu->p_text, "spu-elapsed", VLC_VAR_TIME );
- val.i_time = mdate() - p_subpic->i_start;
- var_Set( p_spu->p_text, "spu-elapsed", val );
-
- var_Create( p_spu->p_text, "text-rerender", VLC_VAR_BOOL );
- var_SetBool( p_spu->p_text, "text-rerender", VLC_FALSE );
-
- var_Create( p_spu->p_text, "scale", VLC_VAR_INTEGER );
- var_SetInteger( p_spu->p_text, "scale",
- __MIN(i_scale_width_orig, i_scale_height_orig) );
-
- if( p_spu->p_text->pf_render_html && p_region->psz_html )
- {
- p_spu->p_text->pf_render_html( p_spu->p_text,
- p_region, p_region );
- }
- else if( p_spu->p_text->pf_render_text )
- {
- p_spu->p_text->pf_render_text( p_spu->p_text,
- p_region, p_region );
- }
- b_rerender_text = var_GetBool( p_spu->p_text, "text-rerender" );
-
- var_Destroy( p_spu->p_text, "spu-duration" );
- var_Destroy( p_spu->p_text, "spu-elapsed" );
- var_Destroy( p_spu->p_text, "text-rerender" );
- var_Destroy( p_spu->p_text, "scale" );
+ /* Well we will try conversion+scaling */
+ msg_Warn( p_spu, "%4.4s to %4.4s conversion failed",
+ (const char*)&p_scale_yuvp->fmt_in.video.i_chroma,
+ (const char*)&p_scale_yuvp->fmt_out.video.i_chroma );
}
- p_region->i_align |= SUBPICTURE_RENDERED;
}
- if( p_region->i_align & SUBPICTURE_RENDERED )
+ /* Conversion(except from YUVP)/Scaling */
+ if( p_picture &&
+ ( p_picture->format.i_width != i_dst_width ||
+ p_picture->format.i_height != i_dst_height ) )
{
- i_scale_idx = SCALE_TEXT;
- i_inv_scale_x = i_scale_width_orig;
- i_inv_scale_y = i_scale_height_orig;
- }
+ p_scale->fmt_in.video = p_picture->format;
+ p_scale->fmt_out.video = p_picture->format;
- i_x_offset = (p_region->i_x + pi_subpic_x[ i_scale_idx ]) * i_inv_scale_x / 1000;
- i_y_offset = (p_region->i_y + p_subpic->i_y) * i_inv_scale_y / 1000;
+ p_scale->fmt_out.video.i_width = i_dst_width;
+ p_scale->fmt_out.video.i_height = i_dst_height;
- /* Force palette if requested */
- if( p_spu->b_force_palette &&
- ( VLC_FOURCC('Y','U','V','P') == p_region->fmt.i_chroma ) )
- {
- memcpy( p_region->fmt.p_palette->palette,
- p_spu->palette, 16 );
- }
+ 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 );
- /* Scale SPU if necessary */
- if( p_region->p_cache &&
- ( p_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') ) )
- {
- if( pi_scale_width[ i_scale_idx ] * p_region->fmt.i_width / 1000 !=
- p_region->p_cache->fmt.i_width ||
- pi_scale_height[ i_scale_idx ] * p_region->fmt.i_height / 1000 !=
- p_region->p_cache->fmt.i_height )
- {
- p_subpic->pf_destroy_region( VLC_OBJECT(p_spu),
- p_region->p_cache );
- p_region->p_cache = 0;
- }
+ p_picture = p_scale->pf_video_filter( p_scale, p_picture );
+ if( !p_picture )
+ msg_Err( p_spu, "scaling failed" );
}
- if( ( ( pi_scale_width[ i_scale_idx ] != 1000 ) ||
- ( pi_scale_height[ i_scale_idx ] != 1000 ) ) &&
- ( ( pi_scale_width[ i_scale_idx ] > 0 ) ||
- ( pi_scale_height[ i_scale_idx ] > 0 ) ) &&
- p_spu->p_scale && !p_region->p_cache &&
- ( p_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') ) )
+ /* */
+ p_region->p_private = SpuRegionPrivateCreate( &p_picture->format );
+ if( p_region->p_private )
{
- picture_t *p_pic;
-
- p_spu->p_scale->fmt_in.video = p_region->fmt;
- p_spu->p_scale->fmt_out.video = p_region->fmt;
-
- p_region->p_cache =
- p_subpic->pf_create_region( VLC_OBJECT(p_spu),
- &p_spu->p_scale->fmt_out.video );
- if( p_spu->p_scale->fmt_out.video.p_palette )
- *p_spu->p_scale->fmt_out.video.p_palette =
- *p_region->fmt.p_palette;
- p_region->p_cache->p_next = p_region->p_next;
-
- vout_CopyPicture( p_spu, &p_region->p_cache->picture,
- &p_region->picture );
-
- p_spu->p_scale->fmt_out.video.i_width =
- p_region->fmt.i_width * pi_scale_width[ i_scale_idx ] / 1000;
- p_spu->p_scale->fmt_out.video.i_visible_width =
- p_region->fmt.i_visible_width * pi_scale_width[ i_scale_idx ] / 1000;
- p_spu->p_scale->fmt_out.video.i_height =
- p_region->fmt.i_height * pi_scale_height[ i_scale_idx ] / 1000;
- p_spu->p_scale->fmt_out.video.i_visible_height =
- p_region->fmt.i_visible_height * pi_scale_height[ i_scale_idx ] / 1000;
- p_region->p_cache->fmt = p_spu->p_scale->fmt_out.video;
- p_region->p_cache->i_x = p_region->i_x * pi_scale_width[ i_scale_idx ] / 1000;
- p_region->p_cache->i_y = p_region->i_y * pi_scale_height[ i_scale_idx ] / 1000;
- p_region->p_cache->i_align = p_region->i_align;
-
- p_pic = p_spu->p_scale->pf_video_filter(
- p_spu->p_scale, &p_region->p_cache->picture );
- if( p_pic )
+ p_region->p_private->p_picture = p_picture;
+ if( !p_region->p_private->p_picture )
{
- picture_t p_pic_tmp = p_region->p_cache->picture;
- p_region->p_cache->picture = *p_pic;
- *p_pic = p_pic_tmp;
- free( p_pic );
+ SpuRegionPrivateDestroy( p_region->p_private );
+ p_region->p_private = NULL;
}
}
-
- if( ( ( pi_scale_width[ i_scale_idx ] != 1000 ) ||
- ( pi_scale_height[ i_scale_idx ] != 1000 ) ) &&
- ( ( pi_scale_width[ i_scale_idx ] > 0 ) ||
- ( pi_scale_height[ i_scale_idx ] > 0 ) ) &&
- p_spu->p_scale && p_region->p_cache &&
- ( p_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') ) )
+ else
{
- p_region = p_region->p_cache;
+ picture_Release( p_picture );
}
+ }
- if( p_region->i_align & SUBPICTURE_ALIGN_BOTTOM )
- {
- i_y_offset = p_fmt->i_height - p_region->fmt.i_height -
- (p_subpic->i_y + p_region->i_y) * i_inv_scale_y / 1000;
- }
- else if ( !(p_region->i_align & SUBPICTURE_ALIGN_TOP) )
- {
- i_y_offset = p_fmt->i_height / 2 - p_region->fmt.i_height / 2;
- }
+ /* And use the scaled picture */
+ if( p_region->p_private )
+ {
+ region_fmt = p_region->p_private->fmt;
+ p_region_picture = p_region->p_private->p_picture;
+ }
+ }
- if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT )
- {
- i_x_offset = p_fmt->i_width - p_region->fmt.i_width -
- (pi_subpic_x[ i_scale_idx ] + p_region->i_x)
- * i_inv_scale_x / 1000;
- }
- else if ( !(p_region->i_align & SUBPICTURE_ALIGN_LEFT) )
- {
- i_x_offset = p_fmt->i_width / 2 - p_region->fmt.i_width / 2;
- }
+ /* Force cropping if requested */
+ if( b_force_crop )
+ {
+ 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 );
+
+ /* 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
+ {
+ 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( p_subpic->b_absolute )
- {
- i_x_offset = (p_region->i_x +
- pi_subpic_x[ i_scale_idx ] *
- pi_scale_width[ i_scale_idx ] / 1000)
- * i_inv_scale_x / 1000;
- i_y_offset = (p_region->i_y +
- p_subpic->i_y * pi_scale_height[ i_scale_idx ] / 1000)
- * i_inv_scale_y / 1000;
+ /* Update the blender */
+ SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, ®ion_fmt );
- }
+ if( p_spu->p_blend->p_module )
+ {
+ const int i_alpha = SpuRegionAlpha( p_subpic, p_region );
- i_x_offset = __MAX( i_x_offset, 0 );
- i_y_offset = __MAX( i_y_offset, 0 );
+ p_spu->p_blend->pf_video_blend( p_spu->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 );
+ }
- if( ( p_spu->i_margin != 0 ) &&
- ( p_spu->b_force_crop == VLC_FALSE ) )
- {
- int i_diff = 0;
- int i_low = (i_y_offset - p_spu->i_margin) * i_inv_scale_y / 1000;
- int i_high = i_low + p_region->fmt.i_height;
-
- /* crop extra margin to keep within bounds */
- if( i_low < 0 )
- i_diff = i_low;
- if( i_high > (int)p_fmt->i_height )
- i_diff = i_high - p_fmt->i_height;
- i_y_offset -= ( p_spu->i_margin * i_inv_scale_y / 1000 + i_diff );
- }
+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 )
+ {
+ SpuRegionPrivateDestroy( p_region->p_private );
+ p_region->p_private = NULL;
+ }
+ p_region->i_align &= ~SUBPICTURE_RENDERED;
+ }
+ if( b_restore_format )
+ p_region->fmt = fmt_original;
+}
+
+/**
+ * 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
+ *
+ * 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_order, p_subpic1->i_order );
+ return r;
+}
+/**
+ * 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 )
+{
+ 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();
- p_spu->p_blend->fmt_in.video = p_region->fmt;
+ unsigned int i_subpicture;
+ subpicture_t *pp_subpicture[VOUT_MAX_SUBPICTURES];
- /* Force cropping if requested */
- if( p_spu->b_force_crop )
+ 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;
+
+ /* Get lock */
+ vlc_mutex_lock( &p_spu->subpicture_lock );
+
+ /* Preprocess subpictures */
+ i_subpicture = 0;
+ i_subtitle_region_count = 0;
+ for( subpicture_t * p_subpic = p_subpic_list;
+ p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE; /* Check again status (as we where unlocked) */
+ p_subpic = p_subpic->p_next )
+ {
+ /* */
+ if( p_subpic->pf_pre_render )
+ p_subpic->pf_pre_render( p_spu, p_subpic, p_fmt_dst );
+
+ 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_subpic->b_subtitle )
+ {
+ for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next )
+ i_subtitle_region_count++;
+ }
+
+ /* */
+ pp_subpicture[i_subpicture++] = p_subpic;
+ }
+
+ /* Be sure we have at least 1 picture to process */
+ if( i_subpicture <= 0 )
+ {
+ vlc_mutex_unlock( &p_spu->subpicture_lock );
+ return;
+ }
+
+ /* Now order subpicture array
+ * XXX The order is *really* important for overlap subtitles positionning */
+ qsort( pp_subpicture, i_subpicture, sizeof(*pp_subpicture), SubpictureCmp );
+
+ /* Allocate area array for subtitle overlap */
+ i_subtitle_area = 0;
+ p_subtitle_area = p_subtitle_area_buffer;
+ if( i_subtitle_region_count > sizeof(p_subtitle_area_buffer)/sizeof(*p_subtitle_area_buffer) )
+ p_subtitle_area = calloc( i_subtitle_region_count, sizeof(*p_subtitle_area) );
+
+ /* Create the blending module */
+ if( !p_spu->p_blend )
+ SpuRenderCreateBlend( p_spu, p_fmt_dst->i_chroma, p_fmt_dst->i_aspect );
+
+ /* Process all subpictures and regions (in the right order) */
+ for( unsigned int i_index = 0; i_index < i_subpicture; i_index++ )
+ {
+ subpicture_t *p_subpic = pp_subpicture[i_index];
+ subpicture_region_t *p_region;
+
+ if( !p_subpic->p_region )
+ continue;
+
+ /* FIXME when possible use a better rendering size than source size
+ * (max of display size and source size for example) FIXME */
+ int i_render_width = p_subpic->i_original_picture_width;
+ int i_render_height = p_subpic->i_original_picture_height;
+ if( !i_render_width || !i_render_height )
+ {
+ if( i_render_width != 0 || i_render_height != 0 )
+ msg_Err( p_spu, "unsupported original picture size %dx%d",
+ i_render_width, i_render_height );
+
+ p_subpic->i_original_picture_width = i_render_width = i_source_video_width;
+ p_subpic->i_original_picture_height = i_render_height = i_source_video_height;
+ }
+
+ if( p_spu->p_text )
+ {
+ p_spu->p_text->fmt_out.video.i_width =
+ p_spu->p_text->fmt_out.video.i_visible_width = i_render_width;
+
+ p_spu->p_text->fmt_out.video.i_height =
+ p_spu->p_text->fmt_out.video.i_visible_height = i_render_height;
+ }
+
+ /* Compute scaling from picture to source size */
+ spu_scale_t scale = spu_scale_createq( i_source_video_width, i_render_width,
+ i_source_video_height, i_render_height );
+
+ /* Update scaling from source size to display size(p_fmt_dst) */
+ scale.w = scale.w * p_fmt_dst->i_width / i_source_video_width;
+ scale.h = scale.h * p_fmt_dst->i_height / i_source_video_height;
+
+ /* Set default subpicture aspect ratio
+ * FIXME if we only handle 1 aspect ratio per picture, why is it set per
+ * region ? */
+ p_region = p_subpic->p_region;
+ if( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den )
+ {
+ if( p_region->fmt.i_aspect != 0 )
{
- video_format_t *p_fmt = &p_spu->p_blend->fmt_in.video;
- int i_crop_x = p_spu->i_crop_x * pi_scale_width[ i_scale_idx ] / 1000
- * i_inv_scale_x / 1000;
- int i_crop_y = p_spu->i_crop_y * pi_scale_height[ i_scale_idx ] / 1000
- * i_inv_scale_y / 1000;
- int i_crop_width = p_spu->i_crop_width * pi_scale_width[ i_scale_idx ] / 1000
- * i_inv_scale_x / 1000;
- int i_crop_height = p_spu->i_crop_height * pi_scale_height[ i_scale_idx ] / 1000
- * i_inv_scale_y / 1000;
-
- /* 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_crop_y + i_crop_height <= i_y_offset ||
- i_y_offset + (int)p_fmt->i_visible_height < i_crop_y )
- {
- /* No intersection */
- p_fmt->i_visible_width = p_fmt->i_visible_height = 0;
- }
- else
- {
- 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)p_fmt->i_visible_width );
- i_y_end = __MIN( i_crop_y + i_crop_height,
- i_y_offset + (int)p_fmt->i_visible_height );
-
- p_fmt->i_x_offset = i_x - i_x_offset;
- p_fmt->i_y_offset = i_y - i_y_offset;
- p_fmt->i_visible_width = i_x_end - i_x;
- p_fmt->i_visible_height = i_y_end - i_y;
-
- i_x_offset = i_x;
- i_y_offset = i_y;
- }
+ p_region->fmt.i_sar_den = p_region->fmt.i_aspect;
+ p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR;
}
-
- if( p_subpic->b_fade )
+ else
{
- mtime_t i_fade_start = ( p_subpic->i_stop +
- p_subpic->i_start ) / 2;
- mtime_t i_now = mdate();
- if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start )
- {
- i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
- ( p_subpic->i_stop - i_fade_start );
- }
+ p_region->fmt.i_sar_den = p_fmt_dst->i_sar_den;
+ p_region->fmt.i_sar_num = p_fmt_dst->i_sar_num;
}
+ }
+
+ /* Take care of the aspect ratio */
+ if( p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den !=
+ p_region->fmt.i_sar_den * p_fmt_dst->i_sar_num )
+ {
+ /* FIXME FIXME what about region->i_x/i_y ? */
+ scale.w = scale.w *
+ (int64_t)p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den /
+ p_region->fmt.i_sar_den / p_fmt_dst->i_sar_num;
+ }
- i_x_offset = __MAX( i_x_offset, 0 );
- i_y_offset = __MAX( i_y_offset, 0 );
+ /* Render all regions
+ * We always transform non absolute subtitle into absolute one on the
+ * first rendering to allow good subtitle overlap support.
+ */
+ for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next )
+ {
+ spu_area_t area;
- if( p_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') )
- {
- /* Update the output picture size */
- p_spu->p_blend->fmt_out.video.i_width =
- p_spu->p_blend->fmt_out.video.i_visible_width =
- p_fmt->i_width;
- p_spu->p_blend->fmt_out.video.i_height =
- p_spu->p_blend->fmt_out.video.i_visible_height =
- p_fmt->i_height;
-
- p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst,
- p_pic_src, &p_region->picture, i_x_offset, i_y_offset,
- i_fade_alpha * p_subpic->i_alpha / 255 );
- }
+ /* Check scale validity */
+ if( scale.w <= 0 || scale.h <= 0 )
+ continue;
- if( b_rerender_text )
+ /* */
+ SpuRenderRegion( p_spu, p_pic_dst, &area,
+ p_subpic, p_region, scale, p_fmt_dst,
+ p_subtitle_area, i_subtitle_area );
+
+ if( p_subpic->b_subtitle )
{
- /* 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.
- */
- p_region->picture.pf_release( &p_region->picture );
- memset( &p_region->picture, 0, sizeof( picture_t ) );
- p_region->fmt = orig_fmt;
- p_region->i_align &= ~SUBPICTURE_RENDERED;
+ 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;
}
- p_region = p_region->p_next;
}
-
- p_subpic = p_subpic->p_next;
+ if( p_subpic->b_subtitle )
+ p_subpic->b_absolute = true;
}
+ /* */
+ if( p_subtitle_area != p_subtitle_area_buffer )
+ free( p_subtitle_area );
+
vlc_mutex_unlock( &p_spu->subpicture_lock );
}
* 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,
- vlc_bool_t b_paused )
+ bool b_paused, bool b_subtitle_only )
{
- int i_index, i_channel;
+ int i_channel;
subpicture_t *p_subpic = NULL;
- subpicture_t *p_ephemer;
- mtime_t ephemer_date;
/* Run subpicture filters */
- for( i_index = 0; i_index < p_spu->i_filter; i_index++ )
- {
- subpicture_t *p_subpic_filter;
- p_subpic_filter = p_spu->pp_filter[i_index]->
- pf_sub_filter( p_spu->pp_filter[i_index], display_date );
- if( p_subpic_filter )
- {
- spu_DisplaySubpicture( p_spu, p_subpic_filter );
- }
- }
+ filter_chain_SubFilter( p_spu->p_chain, display_date );
/* We get an easily parsable chained list of subpictures which
* ends with NULL since p_subpic was initialized to NULL. */
for( i_channel = 0; i_channel < p_spu->i_channel; i_channel++ )
{
- p_ephemer = 0;
- ephemer_date = 0;
+ subpicture_t *p_ephemer = NULL;
+ mtime_t ephemer_date = 0;
+ int i_index;
for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
{
- if( p_spu->p_subpicture[i_index].i_channel != i_channel ||
- p_spu->p_subpicture[i_index].i_status != READY_SUBPICTURE )
+ subpicture_t *p_current = &p_spu->p_subpicture[i_index];
+
+ if( p_current->i_channel != i_channel ||
+ p_current->i_status != READY_SUBPICTURE ||
+ ( b_subtitle_only && !p_current->b_subtitle ) )
{
continue;
}
if( display_date &&
- display_date < p_spu->p_subpicture[i_index].i_start )
+ display_date < p_current->i_start )
{
/* Too early, come back next monday */
continue;
}
- if( p_spu->p_subpicture[i_index].i_start > ephemer_date )
- ephemer_date = p_spu->p_subpicture[i_index].i_start;
+ if( p_current->i_start > ephemer_date )
+ ephemer_date = p_current->i_start;
- if( display_date > p_spu->p_subpicture[i_index].i_stop &&
- ( !p_spu->p_subpicture[i_index].b_ephemer ||
- p_spu->p_subpicture[i_index].i_stop >
- p_spu->p_subpicture[i_index].i_start ) &&
- !( p_spu->p_subpicture[i_index].b_pausable &&
- b_paused ) )
+ if( display_date > p_current->i_stop &&
+ ( !p_current->b_ephemer || p_current->i_stop > p_current->i_start ) &&
+ !( p_current->b_subtitle && b_paused ) ) /* XXX Assume that subtitle are pausable */
{
/* Too late, destroy the subpic */
spu_DestroySubpicture( p_spu, &p_spu->p_subpicture[i_index] );
}
/* If this is an ephemer subpic, add it to our list */
- if( p_spu->p_subpicture[i_index].b_ephemer )
+ if( p_current->b_ephemer )
{
- p_spu->p_subpicture[i_index].p_next = p_ephemer;
- p_ephemer = &p_spu->p_subpicture[i_index];
+ p_current->p_next = p_ephemer;
+ p_ephemer = p_current;
continue;
}
- p_spu->p_subpicture[i_index].p_next = p_subpic;
- p_subpic = &p_spu->p_subpicture[i_index];
+ p_current->p_next = p_subpic;
+ p_subpic = p_current;
}
/* If we found ephemer subpictures, check if they have to be
* This function destroys the subpictures which belong to the spu channel
* corresponding to i_channel_id.
*****************************************************************************/
-static void SpuClearChannel( spu_t *p_spu, int i_channel )
+static void SpuClearChannel( spu_t *p_spu, int i_channel, bool b_locked )
{
int i_subpic; /* subpicture index */
subpicture_t *p_subpic = NULL; /* first free subpicture */
- vlc_mutex_lock( &p_spu->subpicture_lock );
+ if( !b_locked )
+ vlc_mutex_lock( &p_spu->subpicture_lock );
for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
{
}
}
- vlc_mutex_unlock( &p_spu->subpicture_lock );
+ if( !b_locked )
+ vlc_mutex_unlock( &p_spu->subpicture_lock );
}
/*****************************************************************************
{
case SPU_CHANNEL_REGISTER:
pi = (int *)va_arg( args, int * );
- if( pi ) *pi = p_spu->i_channel++;
+ vlc_mutex_lock( &p_spu->subpicture_lock );
+ if( pi )
+ *pi = p_spu->i_channel++;
+ vlc_mutex_unlock( &p_spu->subpicture_lock );
break;
case SPU_CHANNEL_CLEAR:
i = (int)va_arg( args, int );
- SpuClearChannel( p_spu, i );
+ SpuClearChannel( p_spu, i, false );
break;
default:
{
vlc_value_t val;
- p_spu->b_force_palette = VLC_FALSE;
- p_spu->b_force_crop = VLC_FALSE;
+ vlc_mutex_lock( &p_spu->subpicture_lock );
- if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) return;
+ p_spu->b_force_palette = false;
+ p_spu->b_force_crop = false;
+
+ if( var_Get( p_object, "highlight", &val ) || !val.b_bool )
+ {
+ vlc_mutex_unlock( &p_spu->subpicture_lock );
+ return;
+ }
- p_spu->b_force_crop = VLC_TRUE;
+ 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 );
if( var_Get( p_object, "menu-palette", &val ) == VLC_SUCCESS )
{
memcpy( p_spu->palette, val.p_address, 16 );
- p_spu->b_force_palette = VLC_TRUE;
+ p_spu->b_force_palette = true;
}
+ vlc_mutex_unlock( &p_spu->subpicture_lock );
msg_Dbg( p_object, "crop: %i,%i,%i,%i, palette forced: %i",
p_spu->i_crop_x, p_spu->i_crop_y,
static subpicture_t *spu_new_buffer( filter_t *p_filter )
{
- subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t));
- (void)p_filter;
- memset( p_subpic, 0, sizeof(subpicture_t) );
- p_subpic->b_absolute = VLC_TRUE;
+ 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( 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;
- }
-
- p_picture->pf_release = RegionPictureRelease;
+ const video_format_t *p_fmt = &p_filter->fmt_out.video;
- 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 && p_pic->p_data_orig ) free( p_pic->p_data_orig );
- if( p_pic ) 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 )
{
- (void)p_object; (void)oldval; (void)newval;
+ spu_t *p_spu = p_data;
- if( !strcmp( psz_var, "sub-filter" ) )
- {
- spu_t *p_spu = (spu_t *)p_data;
- vlc_mutex_lock( &p_spu->subpicture_lock );
- spu_DeleteChain( p_spu );
- spu_ParseChain( p_spu );
- vlc_mutex_unlock( &p_spu->subpicture_lock );
- }
+ 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 );
+ spu_ParseChain( p_spu );
+ vlc_mutex_unlock( &p_spu->subpicture_lock );
return VLC_SUCCESS;
}
+
+static int SubFilterAllocationInit( filter_t *p_filter, void *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;
+
+ 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 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 );
+}
+