X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_subpictures.c;h=ce7f6cf466555c9d613b7d2fdc4891a43a306a91;hb=2c7efa6aff2a5fc42599e8b94a47615e8b99f04b;hp=54ee55d3d7af4aeea12de8df1543e594f942cbd1;hpb=a504fae36cad1af4fc65f9829cedd892da262ed7;p=vlc diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index 54ee55d3d7..ce7f6cf466 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -1,7 +1,7 @@ /***************************************************************************** * vout_subpictures.c : subpicture management functions ***************************************************************************** - * Copyright (C) 2000-2005 VideoLAN + * Copyright (C) 2000-2007 the VideoLAN team * $Id$ * * Authors: Vincent Seguin @@ -20,23 +20,17 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* free() */ -#include /* sprintf() */ -#include /* strerror() */ - #include - -#include "vlc_block.h" -#include "vlc_video.h" -#include "video_output.h" -#include "vlc_spu.h" -#include "vlc_filter.h" +#include +#include +#include +#include /***************************************************************************** * Local prototypes @@ -54,6 +48,11 @@ static void spu_del_buffer( filter_t *, subpicture_t * ); static picture_t *spu_new_video_buffer( filter_t * ); 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 * ); + struct filter_owner_sys_t { spu_t *p_spu; @@ -98,7 +97,6 @@ spu_t *__spu_Create( vlc_object_t *p_this ) */ int spu_Init( spu_t *p_spu ) { - char *psz_filter, *psz_filter_orig; vlc_value_t val; /* If the user requested a sub margin, we force the position. */ @@ -107,23 +105,38 @@ int spu_Init( spu_t *p_spu ) p_spu->i_margin = val.i_int; var_Create( p_spu, "sub-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_AddCallback( p_spu, "sub-filter", SubFilterCallback, p_spu ); + + spu_ParseChain( p_spu ); + + return VLC_EGENERIC; +} + +int spu_ParseChain( spu_t *p_spu ) +{ + char *psz_parser; + vlc_value_t val; var_Get( p_spu, "sub-filter", &val ); - psz_filter = psz_filter_orig = val.psz_string; - while( psz_filter && *psz_filter ) + psz_parser = val.psz_string; + + while( psz_parser && *psz_parser ) { - char *psz_parser = strchr( psz_filter, ',' ); - if( !psz_parser ) psz_parser = strchr( psz_filter, ':' ); + config_chain_t *p_cfg; + char *psz_name; - if( psz_parser ) *psz_parser++ = 0; + 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_filter, 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) ); @@ -135,6 +148,7 @@ int spu_Init( spu_t *p_spu ) 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] ); } @@ -144,9 +158,9 @@ int spu_Init( spu_t *p_spu ) msg_Dbg( p_spu, "can't add anymore filters" ); } - psz_filter = psz_parser; + free( psz_name ); } - if( psz_filter_orig ) free( psz_filter_orig ); + if( val.psz_string ) free( val.psz_string ); return VLC_EGENERIC; } @@ -198,17 +212,24 @@ void spu_Destroy( spu_t *p_spu ) vlc_object_destroy( p_spu->p_scale ); } + spu_DeleteChain( p_spu ); + + 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-- ) { 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_mutex_destroy( &p_spu->subpicture_lock ); - vlc_object_destroy( p_spu ); } /** @@ -252,19 +273,21 @@ 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; + 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->i_text_color = 0xFFFFFF; + p_region->p_style = NULL; if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') ) p_fmt->p_palette = p_region->fmt.p_palette = malloc( sizeof(video_palette_t) ); else p_fmt->p_palette = p_region->fmt.p_palette = NULL; - p_region->picture.p_data_orig = 0; + p_region->picture.p_data_orig = NULL; if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') ) return p_region; @@ -274,7 +297,7 @@ subpicture_region_t *__spu_CreateRegion( vlc_object_t *p_this, 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; } @@ -295,12 +318,13 @@ subpicture_region_t *__spu_MakeRegion( vlc_object_t *p_this, picture_t *p_pic ) { 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->i_text_color = 0xFFFFFF; + p_region->p_style = NULL; if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') ) p_fmt->p_palette = p_region->fmt.p_palette = @@ -325,8 +349,13 @@ void __spu_DestroyRegion( vlc_object_t *p_this, subpicture_region_t *p_region ) 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->psz_text ) free( p_region->psz_text ); 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->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 ); } @@ -403,6 +432,7 @@ subpicture_t *spu_CreateSubpicture( spu_t *p_spu ) 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->i_alpha = 0xFF; p_subpic->p_region = 0; @@ -414,7 +444,7 @@ subpicture_t *spu_CreateSubpicture( spu_t *p_spu ) p_subpic->pf_create_region = __spu_CreateRegion; p_subpic->pf_make_region = __spu_MakeRegion; p_subpic->pf_destroy_region = __spu_DestroyRegion; - + return p_subpic; } @@ -473,7 +503,6 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, subpicture_t *p_subpic, int i_scale_width_orig, int i_scale_height_orig ) { - /* Get lock */ vlc_mutex_lock( &p_spu->subpicture_lock ); @@ -482,6 +511,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, { subpicture_region_t *p_region = p_subpic->p_region; int i_scale_width, i_scale_height; + int i_subpic_x = p_subpic->i_x; /* Load the blending module */ if( !p_spu->p_blend && p_region ) @@ -493,40 +523,98 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, 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 ); } /* Load the text rendering module */ - if( !p_spu->p_text && p_region ) + if( !p_spu->p_text && p_region + && p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') ) { + 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_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_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; - p_spu->p_text->p_module = - module_Need( p_spu->p_text, "text renderer", 0, 0 ); + + 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 ); + } + 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) ) + { + 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; - if( p_subpic->i_original_picture_width && - p_subpic->i_original_picture_height ) + if( (p_subpic->i_original_picture_height > 0) && + (p_subpic->i_original_picture_width > 0) ) { i_scale_width = i_scale_width * p_fmt->i_width / - p_subpic->i_original_picture_width; + p_subpic->i_original_picture_width; + i_scale_height = i_scale_height * p_fmt->i_height / + p_subpic->i_original_picture_height; + } + else if( p_subpic->i_original_picture_height > 0 ) + { i_scale_height = i_scale_height * p_fmt->i_height / - p_subpic->i_original_picture_height; + p_subpic->i_original_picture_height; + i_scale_width = i_scale_height * i_scale_height / p_fmt->i_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_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_den = p_fmt->i_sar_den; + p_region->fmt.i_sar_num = p_fmt->i_sar_num; } /* Take care of the aspect ratio */ @@ -536,17 +624,20 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, 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; } /* Load the scaling module */ - if( !p_spu->p_scale && (i_scale_width != 1000 || - i_scale_height != 1000) ) + if( !p_spu->p_scale && + ((i_scale_width > 0) || (i_scale_height > 0)) && + ((i_scale_width != 1000) || (i_scale_height != 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 ... */ 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 = @@ -558,41 +649,76 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, module_Need( p_spu->p_scale, "video filter2", 0, 0 ); } - if( p_subpic->pf_render ) - { - /* HACK to remove when the ogt subpic decoder is gone */ - if( p_spu->p_parent && - p_spu->p_parent->i_object_type == VLC_OBJECT_VOUT ) - { - vout_thread_t *p_vout = (vout_thread_t *)p_spu->p_parent; - p_subpic->pf_render( p_vout, p_pic_dst, p_subpic ); - } - } - else while( p_region && p_spu->p_blend && - p_spu->p_blend->pf_video_blend ) + 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 = p_region->i_x + p_subpic->i_x; + int i_x_offset = p_region->i_x + i_subpic_x; int i_y_offset = p_region->i_y + p_subpic->i_y; if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') ) { - if( p_spu->p_text && p_spu->p_text->p_module && - p_spu->p_text->pf_render_text ) + if( p_spu->p_text && p_spu->p_text->p_module ) { - p_spu->p_text->pf_render_text( p_spu->p_text, - p_region, p_region ); + 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 ); + + 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" ); + } } /* Force palette if requested */ - if( p_spu->b_force_alpha && 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) ) { - p_region->fmt.p_palette->palette[0][3] = p_spu->pi_alpha[0]; - p_region->fmt.p_palette->palette[1][3] = p_spu->pi_alpha[1]; - p_region->fmt.p_palette->palette[2][3] = p_spu->pi_alpha[2]; - p_region->fmt.p_palette->palette[3][3] = p_spu->pi_alpha[3]; + memcpy( p_region->fmt.p_palette->palette, + p_spu->palette, 16 ); } /* Scale SPU if necessary */ @@ -609,7 +735,8 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, } } - if( (i_scale_width != 1000 || i_scale_height != 1000) && + if( ((i_scale_width != 1000) || (i_scale_height != 1000)) && + ((i_scale_width > 0) || (i_scale_height > 0)) && p_spu->p_scale && !p_region->p_cache ) { picture_t *p_pic; @@ -639,6 +766,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, 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_align = p_region->i_align; p_pic = p_spu->p_scale->pf_video_filter( p_spu->p_scale, &p_region->p_cache->picture ); @@ -650,28 +778,29 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, free( p_pic ); } } - if( (i_scale_width != 1000 || i_scale_height != 1000) && + if( ((i_scale_width != 1000) || (i_scale_height != 1000)) && + ((i_scale_width > 0) || (i_scale_height > 0)) && p_spu->p_scale && p_region->p_cache ) { 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; } - 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 - - p_subpic->i_x; + i_subpic_x - p_region->i_x; } - 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; } @@ -679,19 +808,28 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, if( p_subpic->b_absolute ) { i_x_offset = p_region->i_x + - p_subpic->i_x * i_scale_width / 1000; + i_subpic_x * i_scale_width / 1000; i_y_offset = p_region->i_y + p_subpic->i_y * i_scale_height / 1000; - if( p_spu->i_margin >= 0 ) - { - if( p_subpic->i_height + (unsigned int)p_spu->i_margin <= - p_fmt->i_height ) - { - i_y_offset = p_fmt->i_height - - p_spu->i_margin - p_subpic->i_height; - } - } + } + + 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; + int i_high = i_y_offset + p_region->fmt.i_height + - p_spu->i_margin; + + /* 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 ); } p_spu->p_blend->fmt_in.video = p_region->fmt; @@ -754,10 +892,24 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, } } + 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_pic_src, &p_region->picture, i_x_offset, i_y_offset, i_fade_alpha * p_subpic->i_alpha / 255 ); + 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 = p_region->p_next; } @@ -778,7 +930,8 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, * to be removed if a newer one is available), which makes it a lot * 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 ) +subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, + vlc_bool_t b_paused ) { int i_index, i_channel; subpicture_t *p_subpic = NULL; @@ -824,7 +977,9 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date ) 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].i_start ) && + !( p_spu->p_subpicture[i_index].b_pausable && + b_paused ) ) { /* Too late, destroy the subpic */ spu_DestroySubpicture( p_spu, &p_spu->p_subpicture[i_index] ); @@ -920,8 +1075,6 @@ static int spu_vaControlDefault( spu_t *p_spu, int i_query, va_list args ) case SPU_CHANNEL_REGISTER: pi = (int *)va_arg( args, int * ); if( pi ) *pi = p_spu->i_channel++; - msg_Dbg( p_spu, "Registering subpicture channel, ID: %i", - p_spu->i_channel - 1 ); break; case SPU_CHANNEL_CLEAR: @@ -951,7 +1104,7 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) { vlc_value_t val; - p_spu->b_force_alpha = VLC_FALSE; + p_spu->b_force_palette = VLC_FALSE; p_spu->b_force_crop = VLC_FALSE; if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) return; @@ -966,32 +1119,16 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) var_Get( p_object, "y-end", &val ); p_spu->i_crop_height = val.i_int - p_spu->i_crop_y; -#if 0 - if( var_Get( p_object, "color", &val ) == VLC_SUCCESS ) - { - int i; - for( i = 0; i < 4; i++ ) - { - p_spu->pi_color[i] = ((uint8_t *)val.p_address)[i]; - } - } -#endif - - if( var_Get( p_object, "contrast", &val ) == VLC_SUCCESS ) + if( var_Get( p_object, "menu-palette", &val ) == VLC_SUCCESS ) { - int i; - for( i = 0; i < 4; i++ ) - { - p_spu->pi_alpha[i] = ((uint8_t *)val.p_address)[i]; - p_spu->pi_alpha[i] = p_spu->pi_alpha[i] == 0xf ? - 0xff : p_spu->pi_alpha[i] << 4; - } - p_spu->b_force_alpha = VLC_TRUE; + memcpy( p_spu->palette, val.p_address, 16 ); + p_spu->b_force_palette = VLC_TRUE; } - msg_Dbg( p_object, "crop: %i,%i,%i,%i, alpha: %i", + msg_Dbg( p_object, "crop: %i,%i,%i,%i, palette forced: %i", p_spu->i_crop_x, p_spu->i_crop_y, - p_spu->i_crop_width, p_spu->i_crop_height, p_spu->b_force_alpha ); + p_spu->i_crop_width, p_spu->i_crop_height, + p_spu->b_force_palette ); } /***************************************************************************** @@ -1002,6 +1139,7 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) 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; } @@ -1026,6 +1164,7 @@ static void sub_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) 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; @@ -1070,6 +1209,23 @@ static picture_t *spu_new_video_buffer( filter_t *p_filter ) static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_pic ) { + (void)p_filter; if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig ); if( p_pic ) 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 ) +{ + (void)p_object; (void)oldval; (void)newval; + + 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 ); + } + return VLC_SUCCESS; +}