X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_text.c;h=8bf7a716981329757bdbba3c2f24bee4ba28bffd;hb=b0ffce5e7e9250234dffe86aefde13fbdbefdd44;hp=ea7eb1b938c81e5bb31e61382f72fdaec581bae9;hpb=b6b1e9eef0edf4d43e0db8281e3a9dd25f0afbe3;p=vlc diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c index ea7eb1b938..8bf7a71698 100644 --- a/src/video_output/video_text.c +++ b/src/video_output/video_text.c @@ -1,16 +1,17 @@ /***************************************************************************** - * video_text.c : text manipulation functions + * video_text.c : OSD text manipulation functions ***************************************************************************** - * Copyright (C) 1999-2001 VideoLAN - * $Id: video_text.c,v 1.48 2003/12/09 19:15:03 yoann Exp $ + * Copyright (C) 1999-2010 the VideoLAN team + * $Id$ * - * Authors: Sigmund Augdal + * Author: Sigmund Augdal Helberg + * Laurent Aimar * * 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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -18,101 +19,120 @@ * * 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 - -/** - * \brief Show text on the video for some time - * \param p_vout pointer to the vout the text is to be showed on - * \param psz_string The text to be shown - * \param p_style Pointer to a struct with text style info - * \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 ) + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include + +#include +#include +#include + +struct subpicture_updater_sys_t { + int position; + char *text; +}; + +static int OSDTextValidate(subpicture_t *subpic, + bool has_src_changed, const video_format_t *fmt_src, + bool has_dst_changed, const video_format_t *fmt_dst, + mtime_t ts) { - subpicture_t *p_subpic = NULL; - mtime_t i_now = mdate(); + VLC_UNUSED(subpic); VLC_UNUSED(ts); VLC_UNUSED(fmt_src); + VLC_UNUSED(has_dst_changed); VLC_UNUSED(fmt_dst); - 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; + if( !has_src_changed && !has_dst_changed) + return VLC_SUCCESS; + return VLC_EGENERIC; } -/** - * \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 psz_string The text to be shown - * \param p_style Pointer to a struct with text style info - * \param i_flags flags for alignment and such - * \param i_hmargin horizontal margin in pixels - * \param i_vmargin vertical margin in pixels - * \param i_start the time when this string is to appear on the video - * \param i_stop the time when this string should stop to be displayed - * 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 ) +static void OSDTextUpdate(subpicture_t *subpic, + const video_format_t *fmt_src, + const video_format_t *fmt_dst, + mtime_t ts) { - 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 - { - msg_Warn( p_vout, "No text renderer found" ); - } -} + subpicture_updater_sys_t *sys = subpic->updater.p_sys; + VLC_UNUSED(fmt_dst); VLC_UNUSED(ts); + subpic->i_original_picture_width = fmt_src->i_width; + subpic->i_original_picture_height = fmt_src->i_height; -/** - * \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 - **/ -void vout_OSDMessage( vlc_object_t *p_caller, char *psz_string ) + video_format_t fmt; + video_format_Init( &fmt, VLC_CODEC_TEXT); + fmt.i_sar_num = 0; + fmt.i_sar_den = 1; + + subpicture_region_t *r = subpic->p_region = subpicture_region_New(&fmt); + if (!r) + return; + + r->psz_text = strdup(sys->text); + r->i_align = sys->position; + r->i_x = 30 + fmt_src->i_width + - fmt_src->i_visible_width + - fmt_src->i_x_offset; + r->i_y = 20 + fmt_src->i_y_offset; +} + +static void OSDTextDestroy(subpicture_t *subpic) { - vout_thread_t *p_vout; + subpicture_updater_sys_t *sys = subpic->updater.p_sys; + + free(sys->text); + free(sys); +} - if( !config_GetInt( p_caller, "osd" ) ) return; +void vout_OSDText(vout_thread_t *vout, int channel, + int position, mtime_t duration, const char *text) +{ + assert( (position & ~SUBPICTURE_ALIGN_MASK) == 0); + if (!var_InheritBool(vout, "osd") || duration <= 0) + return; - p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE ); + subpicture_updater_sys_t *sys = malloc(sizeof(*sys)); + if (!sys) + return; + sys->position = position; + sys->text = strdup(text); - if( p_vout ) - { - vlc_mutex_lock( &p_vout->change_lock ); + subpicture_updater_t updater = { + .pf_validate = OSDTextValidate, + .pf_update = OSDTextUpdate, + .pf_destroy = OSDTextDestroy, + .p_sys = sys, + }; + subpicture_t *subpic = subpicture_New(&updater); + if (!subpic) { + free(sys->text); + free(sys); + return; + } - if( p_vout->p_last_osd_message ) - { - vout_DestroySubPicture( p_vout, p_vout->p_last_osd_message ); - } + subpic->i_channel = channel; + subpic->i_start = mdate(); + subpic->i_stop = subpic->i_start + duration; + subpic->b_ephemer = true; + subpic->b_absolute = false; + subpic->b_fade = true; - p_vout->p_last_osd_message = vout_ShowTextRelative( p_vout, psz_string, - NULL, OSD_ALIGN_TOP|OSD_ALIGN_RIGHT, 30,20,1000000 ); + vout_PutSubpicture(vout, subpic); +} - vlc_mutex_unlock( &p_vout->change_lock ); +void vout_OSDMessage(vout_thread_t *vout, int channel, const char *format, ...) +{ + va_list args; + va_start(args, format); - vlc_object_release( p_vout ); + char *string; + if (vasprintf(&string, format, args) != -1) { + vout_OSDText(vout, channel, + SUBPICTURE_ALIGN_TOP|SUBPICTURE_ALIGN_RIGHT, 1000000, + string); + free(string); } + va_end(args); }