X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_text.c;h=d5a8f6244bb2ee1263d20a6197c202a459bb81b6;hb=fd7f8f854a13f7b65cb2b8622755aa47ee932919;hp=5d4f8aec279155469b2427fa9ca220fb6ecf1345;hpb=25cd1327a67705cdecbb8754f405be01557a175b;p=vlc diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c index 5d4f8aec27..d5a8f6244b 100644 --- a/src/video_output/video_text.c +++ b/src/video_output/video_text.c @@ -1,10 +1,10 @@ /***************************************************************************** * video_text.c : text manipulation functions ***************************************************************************** - * Copyright (C) 1999-2004 VideoLAN - * $Id: video_text.c,v 1.50 2004/01/06 12:02:06 zorglub Exp $ + * Copyright (C) 1999-2007 the VideoLAN team + * $Id$ * - * Author: Sigmund Augdal + * Author: Sigmund Augdal Helberg * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,47 +18,48 @@ * * 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. *****************************************************************************/ -#include -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include /** * \brief Show text on the video for some time * \param p_vout pointer to the vout the text is to be showed on + * \param i_channel Subpicture channel * \param psz_string The text to be shown - * \param p_style Pointer to a struct with text style info + * \param p_style Pointer to a struct with text style info (it is duplicated if non NULL) * \param i_flags flags for alignment and such * \param i_hmargin horizontal margin in pixels * \param i_vmargin vertical margin in pixels * \param i_duration Amount of time the text is to be shown. */ -subpicture_t *vout_ShowTextRelative( vout_thread_t *p_vout, char *psz_string, - text_style_t *p_style, int i_flags, - int i_hmargin, int i_vmargin, - mtime_t i_duration ) +int vout_ShowTextRelative( vout_thread_t *p_vout, int i_channel, + char *psz_string, const text_style_t *p_style, + int i_flags, int i_hmargin, int i_vmargin, + mtime_t i_duration ) { - subpicture_t *p_subpic = NULL; mtime_t i_now = mdate(); - if ( p_vout->pf_add_string ) - { - p_subpic = p_vout->pf_add_string( p_vout, psz_string, p_style, i_flags, - i_hmargin, i_vmargin, i_now, i_now + i_duration ); - } - else - { - msg_Warn( p_vout, "No text renderer found" ); - } - - return p_subpic; + return vout_ShowTextAbsolute( p_vout, i_channel, psz_string, + p_style, i_flags, i_hmargin, i_vmargin, + i_now, i_now + i_duration ); } /** * \brief Show text on the video from a given start date to a given end date * \param p_vout pointer to the vout the text is to be showed on + * \param i_channel Subpicture channel * \param psz_string The text to be shown - * \param p_style Pointer to a struct with text style info + * \param p_style Pointer to a struct with text style info (it is duplicated if non NULL) * \param i_flags flags for alignment and such * \param i_hmargin horizontal margin in pixels * \param i_vmargin vertical margin in pixels @@ -67,20 +68,52 @@ subpicture_t *vout_ShowTextRelative( vout_thread_t *p_vout, char *psz_string, * if this is 0 the string will be shown untill the next string * is about to be shown */ -void vout_ShowTextAbsolute( vout_thread_t *p_vout, char *psz_string, - text_style_t *p_style, int i_flags, - int i_hmargin, int i_vmargin, mtime_t i_start, - mtime_t i_stop ) +int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel, + const char *psz_string, const text_style_t *p_style, + int i_flags, int i_hmargin, int i_vmargin, + mtime_t i_start, mtime_t i_stop ) { - if ( p_vout->pf_add_string ) - { - p_vout->pf_add_string( p_vout, psz_string, p_style, i_flags, i_hmargin, - i_vmargin, i_start, i_stop ); - } - else + subpicture_t *p_spu; + video_format_t fmt; + + if( !psz_string ) return VLC_EGENERIC; + + p_spu = subpicture_New(); + if( !p_spu ) + return VLC_EGENERIC; + + p_spu->i_channel = i_channel; + p_spu->i_start = i_start; + p_spu->i_stop = i_stop; + p_spu->b_ephemer = true; + p_spu->b_absolute = false; + p_spu->b_fade = true; + + + /* Create a new subpicture region */ + memset( &fmt, 0, sizeof(video_format_t) ); + fmt.i_chroma = VLC_CODEC_TEXT; + fmt.i_aspect = 0; + fmt.i_width = fmt.i_height = 0; + fmt.i_x_offset = fmt.i_y_offset = 0; + p_spu->p_region = subpicture_region_New( &fmt ); + if( !p_spu->p_region ) { - msg_Warn( p_vout, "No text renderer found" ); + msg_Err( p_vout, "cannot allocate SPU region" ); + subpicture_Delete( p_spu ); + return VLC_EGENERIC; } + + p_spu->p_region->psz_text = strdup( psz_string ); + p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK; + p_spu->p_region->i_x = i_hmargin; + p_spu->p_region->i_y = i_vmargin; + if( p_style ) + p_spu->p_region->p_style = text_style_Duplicate( p_style ); + + spu_DisplaySubpicture( p_vout->p_spu, p_spu ); + + return VLC_SUCCESS; } @@ -88,31 +121,99 @@ void vout_ShowTextAbsolute( vout_thread_t *p_vout, char *psz_string, * \brief Write an informative message at the default location, * for the default duration and only if the OSD option is enabled. * \param p_caller The object that called the function. - * \param psz_string The text to be shown + * \param i_channel Subpicture channel + * \param psz_format printf style formatting **/ -void vout_OSDMessage( vlc_object_t *p_caller, char *psz_string ) +void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel, + const char *psz_format, ... ) { vout_thread_t *p_vout; + char *psz_string = NULL; + va_list args; if( !config_GetInt( p_caller, "osd" ) ) return; p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE ); - if( p_vout ) { - vlc_mutex_lock( &p_vout->change_lock ); - - if( p_vout->p_last_osd_message ) + va_start( args, psz_format ); + if( vasprintf( &psz_string, psz_format, args ) != -1 ) { - vout_DestroySubPicture( p_vout, p_vout->p_last_osd_message ); + vout_ShowTextRelative( p_vout, i_channel, psz_string, NULL, + OSD_ALIGN_TOP|OSD_ALIGN_RIGHT, + 30 + p_vout->fmt_in.i_width + - p_vout->fmt_in.i_visible_width + - p_vout->fmt_in.i_x_offset, + 20 + p_vout->fmt_in.i_y_offset, 1000000 ); + free( psz_string ); } + vlc_object_release( p_vout ); + va_end( args ); + } +} - p_vout->p_last_osd_message = vout_ShowTextRelative( p_vout, psz_string, - NULL, OSD_ALIGN_TOP|OSD_ALIGN_RIGHT, 30,20,1000000 ); +/* */ +text_style_t *text_style_New( void ) +{ + text_style_t *p_style = calloc( 1, sizeof(*p_style) ); + if( !p_style ) + return NULL; - vlc_mutex_unlock( &p_vout->change_lock ); + /* initialize to default text style */ + p_style->psz_fontname = NULL; + p_style->i_font_size = 22; + p_style->i_font_color = 0xffffff; + p_style->i_font_alpha = 0xff; + p_style->i_style_flags = STYLE_OUTLINE; + p_style->i_outline_color = 0x000000; + p_style->i_outline_alpha = 0xff; + p_style->i_shadow_color = 0x000000; + p_style->i_shadow_alpha = 0xff; + p_style->i_background_color = 0xffffff; + p_style->i_background_alpha = 0x80; + p_style->i_karaoke_background_color = 0xffffff; + p_style->i_karaoke_background_alpha = 0xff; + p_style->i_outline_width = 1; + p_style->i_shadow_width = 0; + p_style->i_spacing = -1; - vlc_object_release( p_vout ); - } + return p_style; +} + +text_style_t *text_style_Copy( text_style_t *p_dst, const text_style_t *p_src ) +{ + if( !p_src ) + return p_dst; + + /* */ + if( p_dst->psz_fontname ) + free( p_dst->psz_fontname ); + + /* */ + *p_dst = *p_src; + + /* */ + if( p_dst->psz_fontname ) + p_dst->psz_fontname = strdup( p_dst->psz_fontname ); + + return p_dst; +} + +text_style_t *text_style_Duplicate( const text_style_t *p_src ) +{ + if( !p_src ) + return NULL; + + text_style_t *p_dst = calloc( 1, sizeof(*p_dst) ); + if( p_dst ) + text_style_Copy( p_dst, p_src ); + return p_dst; +} + +void text_style_Delete( text_style_t *p_style ) +{ + if( p_style ) + free( p_style->psz_fontname ); + free( p_style ); }