/*****************************************************************************
* vout_subpictures.c : subpicture management functions
*****************************************************************************
- * Copyright (C) 2000-2005 the VideoLAN team
+ * Copyright (C) 2000-2007 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free() */
-#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
#include <vlc_vout.h>
int i_channel;
};
+enum {
+ SCALE_DEFAULT,
+ SCALE_TEXT,
+ SCALE_SIZE
+};
/**
* Creates the subpicture unit
*
spu_ParseChain( p_spu );
- return VLC_EGENERIC;
+ return VLC_SUCCESS;
}
int spu_ParseChain( spu_t *p_spu )
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, 0 );
+ "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++;
+ 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
{
}
if( val.psz_string ) free( val.psz_string );
- return VLC_EGENERIC;
+ return VLC_SUCCESS;
}
/**
static void spu_DeleteChain( spu_t *p_spu )
{
if( p_spu->i_filter )
- while( 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 );
video_format_t *p_fmt )
{
subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) );
+ if( !p_region ) return NULL;
+
memset( p_region, 0, sizeof(subpicture_region_t) );
- p_region->p_next = 0;
- p_region->p_cache = 0;
+ p_region->p_next = NULL;
+ p_region->p_cache = NULL;
p_region->fmt = *p_fmt;
- p_region->psz_text = 0;
+ p_region->psz_text = NULL;
p_region->p_style = NULL;
if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') )
if( !p_region->picture.i_planes )
{
free( p_region );
- free( p_fmt->p_palette );
+ if( p_fmt->p_palette ) free( p_fmt->p_palette );
return NULL;
}
picture_t *p_pic )
{
subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) );
+ (void)p_this;
+ if( !p_region ) return NULL;
memset( p_region, 0, sizeof(subpicture_region_t) );
p_region->p_next = 0;
p_region->p_cache = 0;
if( p_region->psz_text )
free( p_region->psz_text );
+ if( p_region->psz_html )
+ 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->b_pausable = VLC_FALSE;
p_subpic->b_fade = VLC_FALSE;
p_subpic->i_alpha = 0xFF;
- p_subpic->p_region = 0;
- p_subpic->pf_render = 0;
- p_subpic->pf_destroy = 0;
- p_subpic->p_sys = 0;
+ p_subpic->p_region = NULL;
+ p_subpic->pf_render = NULL;
+ p_subpic->pf_destroy = NULL;
+ p_subpic->p_sys = NULL;
vlc_mutex_unlock( &p_spu->subpicture_lock );
p_subpic->pf_create_region = __spu_CreateRegion;
subpicture_t *p_subpic,
int i_scale_width_orig, int i_scale_height_orig )
{
+ int i_source_video_width;
+ int i_source_video_height;
+ subpicture_t *p_subpic_v = p_subpic;
+
/* Get lock */
vlc_mutex_lock( &p_spu->subpicture_lock );
+ for( p_subpic_v = p_subpic;
+ p_subpic_v != NULL && p_subpic_v->i_status != FREE_SUBPICTURE;
+ p_subpic_v = p_subpic_v->p_next )
+ {
+ if( p_subpic_v->pf_pre_render )
+ {
+ p_subpic_v->pf_pre_render( p_fmt, p_spu, p_subpic_v, mdate() );
+ }
+ }
+
+ if( i_scale_width_orig <= 0 )
+ i_scale_width_orig = 1;
+ if( i_scale_height_orig <= 0 )
+ i_scale_height_orig = 1;
+
+ 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 )
+ while( ( p_subpic != NULL ) && ( p_subpic->i_status != FREE_SUBPICTURE ) )
{
- subpicture_region_t *p_region = p_subpic->p_region;
- int i_scale_width, i_scale_height;
- int i_subpic_x = p_subpic->i_x;
+ subpicture_region_t *p_region;
+ int pi_scale_width[ SCALE_SIZE ];
+ int pi_scale_height[ SCALE_SIZE ];
+ int pi_subpic_x[ SCALE_SIZE ];
+ int k;
+
+ /* If the source video and subtitles stream agree on the size of
+ * the video then disregard all further references to the subtitle
+ * stream.
+ */
+ if( ( i_source_video_height == p_subpic->i_original_picture_height ) &&
+ ( i_source_video_width == p_subpic->i_original_picture_width ) )
+ {
+ p_subpic->i_original_picture_height = 0;
+ p_subpic->i_original_picture_width = 0;
+ }
+
+ for( k = 0; k < SCALE_SIZE ; k++ )
+ pi_subpic_x[ k ] = p_subpic->i_x;
+
+ if( p_subpic->pf_update_regions )
+ {
+ 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->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');
- /* XXX: 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 );
+ /* 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;
}
- /* Load the text rendering module */
- if( !p_spu->p_text && p_region && p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
+ /* 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( psz_modulename && *psz_modulename )
{
p_spu->p_text->p_module =
- module_Need( p_spu->p_text, "text renderer", psz_modulename, VLC_TRUE );
+ module_Need( p_spu->p_text, "text renderer",
+ psz_modulename, VLC_TRUE );
}
if( !p_spu->p_text->p_module )
{
}
if( psz_modulename ) free( psz_modulename );
}
+
if( p_spu->p_text )
{
- if( p_subpic->i_original_picture_height > 0 &&
- p_subpic->i_original_picture_width > 0 )
+ 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') ) )
{
- p_spu->p_text->fmt_out.video.i_width =
- p_spu->p_text->fmt_out.video.i_visible_width =
- p_subpic->i_original_picture_width;
- p_spu->p_text->fmt_out.video.i_height =
- p_spu->p_text->fmt_out.video.i_visible_height =
- p_subpic->i_original_picture_height;
+ p_text_region = p_text_region->p_next;
}
- else
+
+ 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;
+ if( (p_subpic->i_original_picture_height > 0) &&
+ (p_subpic->i_original_picture_width > 0) )
+ {
+ p_spu->p_text->fmt_out.video.i_width =
+ p_spu->p_text->fmt_out.video.i_visible_width =
+ p_subpic->i_original_picture_width;
+ p_spu->p_text->fmt_out.video.i_height =
+ p_spu->p_text->fmt_out.video.i_visible_height =
+ p_subpic->i_original_picture_height;
+ }
+ else
+ {
+ 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;
+ }
}
}
- i_scale_width = i_scale_width_orig;
- i_scale_height = i_scale_height_orig;
+ pi_scale_width[ SCALE_DEFAULT ] = i_scale_width_orig;
+ pi_scale_height[ SCALE_DEFAULT ] = i_scale_height_orig;
- if( p_subpic->i_original_picture_height > 0 &&
- p_subpic->i_original_picture_width > 0 )
+ if( p_spu->p_text )
{
- i_scale_width = i_scale_width * p_fmt->i_width /
- p_subpic->i_original_picture_width;
- i_scale_height = i_scale_height * p_fmt->i_height /
- p_subpic->i_original_picture_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;
}
- else if( p_subpic->i_original_picture_height > 0 )
+ /* 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) )
{
- i_scale_height = i_scale_height * p_fmt->i_height /
- p_subpic->i_original_picture_height;
- i_scale_width = i_scale_height * i_scale_height / p_fmt->i_height;
+ i_scale_width_orig = 1000;
+ i_scale_height_orig = 1000;
+ }
+
+ for( k = 0; k < SCALE_SIZE ; k++ )
+ {
+ /* Case of both width and height being specified has been dealt
+ * with above by instead rendering to an output pane of the
+ * explicit dimensions specified - we don't need to scale it.
+ */
+ if( (p_subpic->i_original_picture_height > 0) &&
+ (p_subpic->i_original_picture_width <= 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;
+ }
}
/* 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) )
+ ( !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) )
+ ( !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 &&
+ ( ( p_region->fmt.i_sar_num * p_fmt->i_sar_den ) !=
+ ( p_region->fmt.i_sar_den * p_fmt->i_sar_num ) ) )
{
- i_scale_width = i_scale_width *
- (int64_t)p_region->fmt.i_sar_num * p_fmt->i_sar_den /
- p_region->fmt.i_sar_den / p_fmt->i_sar_num;
- i_subpic_x = p_subpic->i_x * i_scale_width / 1000;
+ for( k = 0; k < SCALE_SIZE ; k++ )
+ {
+ 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;
+ }
}
/* Load the scaling module */
- if( !p_spu->p_scale && (i_scale_width != 1000 ||
- i_scale_height != 1000) )
+ 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)))) )
{
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');
- /* XXX: We'll also be using it for YUVA and RGBA blending ... */
+ /* 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 =
module_Need( p_spu->p_scale, "video filter2", 0, 0 );
}
- while( p_region && p_spu->p_blend && p_spu->p_blend->pf_video_blend )
+ 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 = p_region->i_x + i_subpic_x;
- int i_y_offset = p_region->i_y + p_subpic->i_y;
+ 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 )
{
- p_region->i_align = p_subpic->i_flags;
+ 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_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 )
+ 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 )
+ if( p_region->p_cache &&
+ ( p_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') ) )
{
- if( i_scale_width * p_region->fmt.i_width / 1000 !=
+ if( pi_scale_width[ i_scale_idx ] * p_region->fmt.i_width / 1000 !=
p_region->p_cache->fmt.i_width ||
- i_scale_height * p_region->fmt.i_height / 1000 !=
+ 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),
}
}
- if( (i_scale_width != 1000 || i_scale_height != 1000) &&
- p_spu->p_scale && !p_region->p_cache )
+ 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_region->picture );
p_spu->p_scale->fmt_out.video.i_width =
- p_region->fmt.i_width * i_scale_width / 1000;
+ 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 * i_scale_width / 1000;
+ 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 * i_scale_height / 1000;
+ 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 * i_scale_height / 1000;
+ 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 * i_scale_width / 1000;
- p_region->p_cache->i_y = p_region->i_y * i_scale_height / 1000;
+ 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 );
free( p_pic );
}
}
- if( (i_scale_width != 1000 || i_scale_height != 1000) &&
- p_spu->p_scale && p_region->p_cache )
+
+ 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_subpic->i_flags & SUBPICTURE_ALIGN_BOTTOM )
+ 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_subpic->i_y + p_region->i_y) * i_inv_scale_y / 1000;
}
- else if ( !(p_subpic->i_flags & SUBPICTURE_ALIGN_TOP) )
+ 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_subpic->i_flags & SUBPICTURE_ALIGN_RIGHT )
+ if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT )
{
i_x_offset = p_fmt->i_width - p_region->fmt.i_width -
- i_subpic_x;
+ (pi_subpic_x[ i_scale_idx ] + p_region->i_x)
+ * i_inv_scale_x / 1000;
}
- else if ( !(p_subpic->i_flags & SUBPICTURE_ALIGN_LEFT) )
+ 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 +
- i_subpic_x * i_scale_width / 1000;
- i_y_offset = p_region->i_y +
- p_subpic->i_y * i_scale_height / 1000;
+ 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 )
+ 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;
- int i_high = i_y_offset + p_region->fmt.i_height - p_spu->i_margin;
+ 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_diff );
+ 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 );
}
- 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 * i_scale_width / 1000;
- int i_crop_y = p_spu->i_crop_y * i_scale_height / 1000;
- int i_crop_width = p_spu->i_crop_width * i_scale_width / 1000;
- int i_crop_height = p_spu->i_crop_height * i_scale_height/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;
- }
- }
-
- /* 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_subpic->b_fade )
{
mtime_t i_fade_start = ( p_subpic->i_stop +
}
}
- i_x_offset = __MAX( i_x_offset, 0 );
- i_y_offset = __MAX( i_y_offset, 0 );
+ if( p_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') )
+ {
+ 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->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 );
+ 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 );
+ }
+ }
+
+ 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;
}
static int CropCallback( vlc_object_t *p_object, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ (void)psz_var; (void)oldval; (void)newval;
UpdateSPU( (spu_t *)p_data, p_object );
return VLC_SUCCESS;
}
static subpicture_t *spu_new_buffer( filter_t *p_filter )
{
+ (void)p_filter;
subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t));
+ if( !p_subpic ) return NULL;
memset( p_subpic, 0, sizeof(subpicture_t) );
p_subpic->b_absolute = VLC_TRUE;
static picture_t *spu_new_video_buffer( filter_t *p_filter )
{
picture_t *p_picture = malloc( sizeof(picture_t) );
-
+ if( !p_picture ) return NULL;
if( vout_AllocatePicture( p_filter, p_picture,
p_filter->fmt_out.video.i_chroma,
p_filter->fmt_out.video.i_width,
static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_pic )
{
- if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
- if( p_pic ) free( p_pic );
+ (void)p_filter;
+ if( p_pic )
+ {
+ if( p_pic->p_data_orig ) free( p_pic->p_data_orig );
+ free( p_pic );
+ }
}
static int SubFilterCallback( vlc_object_t *p_object, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *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 );
- }
+ (void)p_object; (void)oldval; (void)newval;
+
+ 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 );
return VLC_SUCCESS;
}