# include "config.h"
#endif
-#include <vlc/vlc.h>
+#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>
/*****************************************************************************
* 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 sub_filter_allocation_init( filter_t *, void * );
+static void sub_filter_allocation_clear( filter_t * );
struct filter_owner_sys_t
{
spu_t *p_spu;
SCALE_TEXT,
SCALE_SIZE
};
+
/**
* Creates the subpicture unit
*
p_spu->p_blend = NULL;
p_spu->p_text = NULL;
p_spu->p_scale = NULL;
- p_spu->i_filter = 0;
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,
+ sub_filter_allocation_init,
+ sub_filter_allocation_clear,
+ 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) );
- if( p_sys )
- {
- 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_release( 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;
}
- 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++ )
{
vlc_object_release( p_spu->p_scale );
}
- spu_DeleteChain( p_spu );
+ filter_chain_Delete( p_spu->p_chain );
vlc_mutex_destroy( &p_spu->subpicture_lock );
vlc_object_release( 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_release( p_spu->pp_filter[p_spu->i_filter] );
- }
-}
-
/**
* Attach/Detach the SPU from any input
*
* \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;
if( !p_region ) return NULL;
memset( p_region, 0, sizeof(subpicture_region_t) );
+ p_region->i_alpha = 0xff;
p_region->p_next = NULL;
p_region->p_cache = NULL;
p_region->fmt = *p_fmt;
(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;
/* Copy subpicture information, set some default values */
memset( p_subpic, 0, sizeof(subpicture_t) );
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_pausable = false;
+ p_subpic->b_fade = false;
p_subpic->i_alpha = 0xFF;
p_subpic->p_region = NULL;
p_subpic->pf_render = NULL;
*****************************************************************************
* This function renders all sub picture units in the list.
*****************************************************************************/
+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 );
+
+ /* */
+ if( p_blend->p_module && p_blend->fmt_in.video.i_chroma != p_in_fmt->i_chroma )
+ {
+ /* 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;
+ }
+
+ /* */
+ p_blend->fmt_in.video = *p_in_fmt;
+
+ /* */
+ 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;
+
+ /* */
+ 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 )
+{
+ filter_t *p_text;
+
+ 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;
+
+ es_format_Init( &p_text->fmt_in, VIDEO_ES, 0 );
+
+ 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_height =
+ p_text->fmt_out.video.i_visible_height = i_height;
+
+ 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 void SpuRenderCreateAndLoadScale( spu_t *p_spu )
+{
+ /* FIXME: We'll also be using it for YUVA and RGBA blending ... */
+ const vlc_fourcc_t i_dummy_chroma = VLC_FOURCC('Y','U','V','P');
+
+ filter_t *p_scale;
+
+ assert( !p_spu->p_scale );
+
+ p_spu->p_scale =
+ p_scale = vlc_custom_create( p_spu, sizeof(filter_t),
+ VLC_OBJECT_GENERIC, "scale" );
+ if( !p_scale )
+ return;
+
+ es_format_Init( &p_scale->fmt_in, VIDEO_ES, 0 );
+ p_scale->fmt_in.video.i_chroma = i_dummy_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_dummy_chroma;
+ p_scale->fmt_out.video.i_width =
+ p_scale->fmt_out.video.i_height = 16;
+
+ 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_spu );
+ p_scale->p_module = module_Need( p_spu->p_scale, "video filter2", 0, 0 );
+}
+
+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('T','E','X','T') );
+
+ 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;
+}
+
+static void SpuRenderRegion( spu_t *p_spu,
+ picture_t *p_pic_dst, picture_t *p_pic_src,
+ subpicture_t *p_subpic, subpicture_region_t *p_region,
+ const int i_scale_width_orig, const int i_scale_height_orig,
+ const int pi_subpic_x[SCALE_SIZE],
+ const int pi_scale_width[SCALE_SIZE],
+ const int pi_scale_height[SCALE_SIZE],
+ const video_format_t *p_fmt )
+{
+ video_format_t orig_fmt;
+ bool b_rerender_text;
+ int i_fade_alpha;
+ int i_x_offset;
+ int i_y_offset;
+ int i_scale_idx;
+ int i_inv_scale_x;
+ int i_inv_scale_y;
+
+ orig_fmt = p_region->fmt;
+ b_rerender_text = false;
+ if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
+ {
+ SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, __MIN(i_scale_width_orig, i_scale_height_orig) );
+
+ /* Check if the rendering has failed ... */
+ if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
+ goto exit;
+ }
+
+ if( p_region->i_align & SUBPICTURE_RENDERED )
+ {
+ /* We are using a region which come from rendered text */
+ i_scale_idx = SCALE_TEXT;
+ i_inv_scale_x = i_scale_width_orig;
+ i_inv_scale_y = i_scale_height_orig;
+ }
+ else
+ {
+ i_scale_idx = SCALE_DEFAULT;
+ i_inv_scale_x = 1000;
+ i_inv_scale_y = 1000;
+ }
+
+ 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;
+
+ /* Force palette if requested */
+ if( p_spu->b_force_palette &&
+ p_region->fmt.i_chroma == VLC_FOURCC('Y','U','V','P') )
+ {
+ /* 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]
+ * */
+ memcpy( p_region->fmt.p_palette->palette, p_spu->palette, 16 );
+ }
+
+ if( p_spu->p_scale &&
+ ( ( pi_scale_width[i_scale_idx] > 0 && pi_scale_width[i_scale_idx] != 1000 ) ||
+ ( pi_scale_height[i_scale_idx] > 0 && pi_scale_height[i_scale_idx] != 1000 ) ) )
+ {
+ const int i_dst_width = p_region->fmt.i_width * pi_scale_width[i_scale_idx] / 1000;
+ const int i_dst_height = p_region->fmt.i_height * pi_scale_height[i_scale_idx] / 1000;
+
+ /* Destroy if cache is unusable */
+ if( p_region->p_cache )
+ {
+ if( p_region->p_cache->fmt.i_width != i_dst_width ||
+ p_region->p_cache->fmt.i_height != i_dst_height )
+ {
+ p_subpic->pf_destroy_region( VLC_OBJECT(p_spu),
+ p_region->p_cache );
+ p_region->p_cache = NULL;
+ }
+ }
+
+ /* Scale if needed into cache */
+ if( !p_region->p_cache )
+ {
+ 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 );
+ p_region->p_cache->p_next = p_region->p_next;
+
+ if( p_spu->p_scale->fmt_out.video.p_palette )
+ *p_spu->p_scale->fmt_out.video.p_palette =
+ *p_region->fmt.p_palette;
+
+ vout_CopyPicture( p_spu, &p_region->p_cache->picture,
+ &p_region->picture );
+
+ p_spu->p_scale->fmt_out.video.i_width = i_dst_width;
+ p_spu->p_scale->fmt_out.video.i_height = i_dst_height;
+
+ 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_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_region->p_cache->i_alpha = p_region->i_alpha;
+
+ p_pic = p_spu->p_scale->pf_video_filter(
+ p_spu->p_scale, &p_region->p_cache->picture );
+ if( p_pic )
+ {
+ p_region->p_cache->picture = *p_pic;
+ free( p_pic );
+ }
+ }
+
+ /* And the use the scale picture */
+ if( p_region->p_cache )
+ p_region = p_region->p_cache;
+ }
+
+ 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;
+ }
+
+ 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;
+ }
+
+ 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;
+
+ }
+
+ i_x_offset = __MAX( i_x_offset, 0 );
+ i_y_offset = __MAX( i_y_offset, 0 );
+
+ if( p_spu->i_margin != 0 && !p_spu->b_force_crop )
+ {
+ 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 );
+ }
+
+ /* Force cropping if requested */
+ if( p_spu->b_force_crop )
+ {
+ video_format_t *p_fmt = &p_region->fmt;
+ 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;
+ }
+ }
+
+ i_x_offset = __MAX( i_x_offset, 0 );
+ i_y_offset = __MAX( i_y_offset, 0 );
+
+ /* Compute alpha blend value */
+ 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 )
+ {
+ i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
+ ( p_subpic->i_stop - i_fade_start );
+ }
+ }
+
+ /* Update the blender */
+ SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, &p_region->fmt );
+
+ if( p_spu->p_blend->p_module )
+ {
+ 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 * p_region->i_alpha / 65025 );
+ }
+ 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 );
+ }
+
+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.
+ */
+ 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;
+ }
+}
+
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_source_video_width;
int i_source_video_height;
- subpicture_t *p_subpic_v = p_subpic;
+ subpicture_t *p_subpic_v;
/* Get lock */
vlc_mutex_lock( &p_spu->subpicture_lock );
}
if( i_scale_width_orig <= 0 )
- i_scale_width_orig = 1;
+ i_scale_width_orig = 1000;
if( i_scale_height_orig <= 0 )
- i_scale_height_orig = 1;
+ i_scale_height_orig = 1000;
i_source_video_width = p_fmt->i_width * 1000 / i_scale_width_orig;
i_source_video_height = p_fmt->i_height * 1000 / i_scale_height_orig;
/* Check i_status again to make sure spudec hasn't destroyed the subpic */
- while( ( p_subpic != NULL ) && ( p_subpic->i_status != FREE_SUBPICTURE ) )
+ for( ; ( p_subpic != NULL ) && ( p_subpic->i_status != FREE_SUBPICTURE ); p_subpic = p_subpic->p_next )
{
subpicture_region_t *p_region;
int pi_scale_width[ SCALE_SIZE ];
if( p_subpic->pf_update_regions )
{
- if ( p_subpic->p_region ) {
+ /* FIXME that part look like crap too if there is more than 1 region */
+
+ if( p_subpic->p_region )
spu_DestroyRegion( p_spu, p_subpic->p_region );
- }
- p_subpic->p_region = p_region = p_subpic->pf_update_regions( p_fmt, p_spu, p_subpic, mdate() );
- }
- else
- {
- p_region = p_subpic->p_region;
- }
- /* 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;
-
- /* The blend module will be loaded when needed with the real
- * input format */
- memset( &p_spu->p_blend->fmt_in, 0, sizeof(p_spu->p_blend->fmt_in) );
- p_spu->p_blend->p_module = NULL;
+ /* TODO do not reverse the scaling that was done before calling
+ * spu_RenderSubpictures, just pass it along (or do it inside
+ * spu_RenderSubpictures) */
+ video_format_t fmt_org = *p_fmt;
+ 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->p_region = p_subpic->pf_update_regions( &fmt_org, p_spu, p_subpic, mdate() );
}
+ /* */
+ p_region = p_subpic->p_region;
+ if( !p_region )
+ continue;
+
+ /* Create the blending module */
+ if( !p_spu->p_blend )
+ SpuRenderCreateBlend( p_spu, p_fmt->i_chroma, p_fmt->i_aspect );
+
/* 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;
-
- p_spu->p_text = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
- vlc_object_attach( p_spu->p_text, p_spu );
-
- 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;
-
- p_spu->p_text->pf_sub_buffer_new = spu_new_buffer;
- p_spu->p_text->pf_sub_buffer_del = spu_del_buffer;
-
- psz_modulename = var_CreateGetString( p_spu, "text-renderer" );
- if( psz_modulename && *psz_modulename )
- {
- p_spu->p_text->p_module =
- module_Need( p_spu->p_text, "text renderer",
- psz_modulename, VLC_TRUE );
- }
- if( !p_spu->p_text->p_module )
- {
- p_spu->p_text->p_module =
- module_Need( p_spu->p_text, "text renderer", 0, 0 );
- }
- free( psz_modulename );
- }
+ if( !p_spu->p_text )
+ SpuRenderCreateAndLoadText( p_spu, p_fmt->i_width, p_fmt->i_height );
if( p_spu->p_text )
{
* resolution, rather than video resolution.
*/
while( p_text_region &&
- ( p_text_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') ) )
+ p_text_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') )
{
p_text_region = p_text_region->p_next;
}
p_fmt->i_height;
}
}
+
+ /* */
+ 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;
}
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;
- }
/* If we have an explicit size plane to render to, then turn off
* the fontsize rescaling.
*/
if( (p_subpic->i_original_picture_height > 0) &&
(p_subpic->i_original_picture_width > 0) )
{
+#if 1
+ /* FIXME That seems so wrong */
i_scale_width_orig = 1000;
i_scale_height_orig = 1000;
+#else
+ /* It is probably that :*/
+ pi_scale_width[ SCALE_DEFAULT ] = i_scale_width_orig * i_source_video_width / p_subpic->i_original_picture_width;
+ pi_scale_height[ SCALE_DEFAULT ] = i_scale_height_orig * i_source_video_height / p_subpic->i_original_picture_height;
+#endif
}
for( k = 0; k < SCALE_SIZE ; k++ )
}
/* 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 ) )
+ if( p_region->fmt.i_aspect && ( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den ) )
{
p_region->fmt.i_sar_den = p_region->fmt.i_aspect;
p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR;
}
- if( p_region &&
- ( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den ) )
+ if( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den )
{
p_region->fmt.i_sar_den = p_fmt->i_sar_den;
p_region->fmt.i_sar_num = p_fmt->i_sar_num;
}
/* 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 ) ) )
+ if( ( p_region->fmt.i_sar_num * p_fmt->i_sar_den ) !=
+ ( p_region->fmt.i_sar_den * p_fmt->i_sar_num ) )
{
for( k = 0; k < SCALE_SIZE ; k++ )
{
}
}
- /* 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)))) )
+ /* Load the scaling module when needed */
+ if( !p_spu->p_scale )
{
- 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 );
- }
+ bool b_scale_used = false;
- while( p_region )
- {
- 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') )
- {
- if( p_spu->p_text && p_spu->p_text->p_module )
- {
- 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" );
- }
- p_region->i_align |= SUBPICTURE_RENDERED;
- }
-
- if( p_region->i_align & SUBPICTURE_RENDERED )
- {
- i_scale_idx = SCALE_TEXT;
- i_inv_scale_x = i_scale_width_orig;
- i_inv_scale_y = i_scale_height_orig;
- }
-
- 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;
-
- /* 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 );
- }
-
- /* 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;
- }
- }
-
- 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') ) )
- {
- 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 )
- {
- 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 );
- }
- }
-
- 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_region->p_cache;
- }
-
- 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;
- }
-
- 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;
- }
-
- 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;
-
- }
-
- i_x_offset = __MAX( i_x_offset, 0 );
- i_y_offset = __MAX( i_y_offset, 0 );
-
- 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 );
- }
-
- 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 )
- {
- i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
- ( p_subpic->i_stop - i_fade_start );
- }
- }
-
- if( p_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') )
+ for( k = 0; k < SCALE_SIZE ; k++ )
{
- if( p_spu->p_blend->fmt_in.video.i_chroma != p_region->fmt.i_chroma )
- {
- /* The chroma is not the same, we need to reload the blend module
- * XXX to match the old behaviour just test !p_spu->p_blend->fmt_in.video.i_chroma */
- if( p_spu->p_blend->p_module )
- module_Unneed( p_spu->p_blend, p_spu->p_blend->p_module );
-
- p_spu->p_blend->fmt_in.video = p_region->fmt;
- p_spu->p_blend->p_module = module_Need( p_spu->p_blend, "video blending", 0, 0 );
- }
- else
- {
- p_spu->p_blend->fmt_in.video = p_region->fmt;
- }
-
- /* Force cropping if requested */
- if( p_spu->b_force_crop )
- {
- 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;
- }
- }
-
- i_x_offset = __MAX( i_x_offset, 0 );
- i_y_offset = __MAX( i_y_offset, 0 );
-
- /* 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;
-
- if( p_spu->p_blend->p_module )
- {
- 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 );
- }
- 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 );
- }
+ const int i_scale_w = pi_scale_width[k];
+ const int i_scale_h = pi_scale_height[k];
+ if( ( i_scale_w > 0 && i_scale_w != 1000 ) || ( i_scale_h > 0 && i_scale_h != 1000 ) )
+ b_scale_used = true;
}
- 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.
- */
- 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;
- }
- p_region = p_region->p_next;
+ if( b_scale_used )
+ SpuRenderCreateAndLoadScale( p_spu );
}
- p_subpic = p_subpic->p_next;
+ for( ; p_region != NULL; p_region = p_region->p_next )
+ SpuRenderRegion( p_spu, p_pic_dst, p_pic_src,
+ p_subpic, p_region, i_scale_width_orig, i_scale_height_orig,
+ pi_subpic_x, pi_scale_width, pi_scale_height,
+ p_fmt );
}
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 )
{
int i_index, i_channel;
subpicture_t *p_subpic = NULL;
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. */
* 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_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;
+ p_spu->b_force_palette = false;
+ p_spu->b_force_crop = false;
if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) 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;
}
msg_Dbg( p_object, "crop: %i,%i,%i,%i, palette forced: %i",
subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t));
if( !p_subpic ) return NULL;
memset( p_subpic, 0, sizeof(subpicture_t) );
- p_subpic->b_absolute = VLC_TRUE;
+ p_subpic->b_absolute = true;
p_subpic->pf_create_region = __spu_CreateRegion;
p_subpic->pf_make_region = __spu_MakeRegion;
spu_t *p_spu = (spu_t *)p_data;
vlc_mutex_lock( &p_spu->subpicture_lock );
- spu_DeleteChain( p_spu );
+ 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 sub_filter_allocation_init( filter_t *p_filter, void *p_data )
+{
+ spu_t *p_spu = (spu_t *)p_data;
+
+ 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 )
+{
+ 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