*/
VLC_EXPORT( subpicture_t *, subpicture_NewFromPicture, ( vlc_object_t *, picture_t *, vlc_fourcc_t i_chroma ) );
+/**
+ * This function will update the content of a subpicture created with
+ * a non NULL subpicture_updater_t.
+ */
+VLC_EXPORT( void, subpicture_Update, ( subpicture_t *, const video_format_t *src, const video_format_t *, mtime_t ) );
+
/**@}*/
#endif /* _VLC_VIDEO_H */
misc/http_auth.c \
misc/sql.c \
misc/text_style.c \
+ misc/subpicture.c \
+ misc/subpicture.h \
$(NULL)
SOURCES_libvlc_httpd = \
--- /dev/null
+/*****************************************************************************
+ * subpicture.c: Subpicture functions
+ *****************************************************************************
+ * Copyright (C) 2010 Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
+ * $Id$
+ *
+ * Authors: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
+ *
+ * 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
+ * GNU General Public License for more details.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <assert.h>
+
+#include <vlc_common.h>
+#include <vlc_image.h>
+#include <vlc_subpicture.h>
+#include "subpicture.h"
+
+struct subpicture_private_t
+{
+ video_format_t src;
+ video_format_t dst;
+};
+
+subpicture_t *subpicture_New( const subpicture_updater_t *p_upd )
+{
+ subpicture_t *p_subpic = calloc( 1, sizeof(*p_subpic) );
+ if( !p_subpic )
+ return NULL;
+
+ p_subpic->i_order = 0;
+ p_subpic->b_absolute = true;
+ p_subpic->b_fade = false;
+ p_subpic->b_subtitle = false;
+ p_subpic->i_alpha = 0xFF;
+ p_subpic->p_region = NULL;
+
+ if( p_upd )
+ {
+ subpicture_private_t *p_private = malloc( sizeof(*p_private) );
+ if( !p_private )
+ {
+ free( p_subpic );
+ return NULL;
+ }
+ video_format_Init( &p_private->src, 0 );
+ video_format_Init( &p_private->dst, 0 );
+
+ p_subpic->updater = *p_upd;
+ p_subpic->p_private = p_private;
+ }
+ else
+ {
+ p_subpic->p_private = NULL;
+
+ p_subpic->updater.pf_validate = NULL;
+ p_subpic->updater.pf_update = NULL;
+ p_subpic->updater.pf_destroy = NULL;
+ p_subpic->updater.p_sys = NULL;
+ }
+ return p_subpic;
+}
+
+void subpicture_Delete( subpicture_t *p_subpic )
+{
+ subpicture_region_ChainDelete( p_subpic->p_region );
+ p_subpic->p_region = NULL;
+
+ if( p_subpic->updater.pf_destroy )
+ p_subpic->updater.pf_destroy( p_subpic );
+
+ free( p_subpic->p_private );
+ free( p_subpic );
+}
+
+subpicture_t *subpicture_NewFromPicture( vlc_object_t *p_obj,
+ picture_t *p_picture, vlc_fourcc_t i_chroma )
+{
+ /* */
+ video_format_t fmt_in = p_picture->format;
+
+ /* */
+ video_format_t fmt_out;
+ fmt_out = fmt_in;
+ fmt_out.i_chroma = i_chroma;
+
+ /* */
+ image_handler_t *p_image = image_HandlerCreate( p_obj );
+ if( !p_image )
+ return NULL;
+
+ picture_t *p_pip = image_Convert( p_image, p_picture, &fmt_in, &fmt_out );
+
+ image_HandlerDelete( p_image );
+
+ if( !p_pip )
+ return NULL;
+
+ subpicture_t *p_subpic = subpicture_New( NULL );
+ if( !p_subpic )
+ {
+ picture_Release( p_pip );
+ return NULL;
+ }
+
+ p_subpic->i_original_picture_width = fmt_out.i_width;
+ p_subpic->i_original_picture_height = fmt_out.i_height;
+
+ fmt_out.i_sar_num =
+ fmt_out.i_sar_den = 0;
+
+ p_subpic->p_region = subpicture_region_New( &fmt_out );
+ if( p_subpic->p_region )
+ {
+ picture_Release( p_subpic->p_region->p_picture );
+ p_subpic->p_region->p_picture = p_pip;
+ }
+ else
+ {
+ picture_Release( p_pip );
+ }
+ return p_subpic;
+}
+
+void subpicture_Update( subpicture_t *p_subpicture,
+ const video_format_t *p_fmt_src,
+ const video_format_t *p_fmt_dst,
+ mtime_t i_ts )
+{
+ subpicture_updater_t *p_upd = &p_subpicture->updater;
+ subpicture_private_t *p_private = p_subpicture->p_private;
+
+ if( !p_upd->pf_validate )
+ return;
+ if( !p_upd->pf_validate( p_subpicture,
+ !video_format_IsSimilar( p_fmt_src,
+ &p_private->src ), p_fmt_src,
+ !video_format_IsSimilar( p_fmt_dst,
+ &p_private->dst ), p_fmt_dst,
+ i_ts ) )
+ return;
+
+ subpicture_region_ChainDelete( p_subpicture->p_region );
+ p_subpicture->p_region = NULL;
+
+ p_upd->pf_update( p_subpicture, p_fmt_src, p_fmt_dst, i_ts );
+
+ video_format_Clean( &p_private->src );
+ video_format_Clean( &p_private->dst );
+
+ video_format_Copy( &p_private->src, p_fmt_src );
+ video_format_Copy( &p_private->dst, p_fmt_dst );
+}
+
+
+subpicture_region_private_t *subpicture_region_private_New( video_format_t *p_fmt )
+{
+ subpicture_region_private_t *p_private = malloc( sizeof(*p_private) );
+
+ if( !p_private )
+ return NULL;
+
+ p_private->fmt = *p_fmt;
+ if( p_fmt->p_palette )
+ {
+ p_private->fmt.p_palette = malloc( sizeof(*p_private->fmt.p_palette) );
+ if( p_private->fmt.p_palette )
+ *p_private->fmt.p_palette = *p_fmt->p_palette;
+ }
+ p_private->p_picture = NULL;
+
+ return p_private;
+}
+
+void subpicture_region_private_Delete( subpicture_region_private_t *p_private )
+{
+ if( p_private->p_picture )
+ picture_Release( p_private->p_picture );
+ free( p_private->fmt.p_palette );
+ free( p_private );
+}
+
+subpicture_region_t *subpicture_region_New( const video_format_t *p_fmt )
+{
+ subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) );
+ if( !p_region )
+ return NULL;
+
+ p_region->fmt = *p_fmt;
+ p_region->fmt.p_palette = NULL;
+ if( p_fmt->i_chroma == VLC_CODEC_YUVP )
+ {
+ p_region->fmt.p_palette = calloc( 1, sizeof(*p_region->fmt.p_palette) );
+ if( p_fmt->p_palette )
+ *p_region->fmt.p_palette = *p_fmt->p_palette;
+ }
+ p_region->i_alpha = 0xff;
+ p_region->p_next = NULL;
+ p_region->p_private = NULL;
+ p_region->psz_text = NULL;
+ p_region->p_style = NULL;
+ p_region->p_picture = NULL;
+
+ if( p_fmt->i_chroma == VLC_CODEC_TEXT )
+ return p_region;
+
+ p_region->p_picture = picture_NewFromFormat( p_fmt );
+ if( !p_region->p_picture )
+ {
+ free( p_region->fmt.p_palette );
+ free( p_region );
+ return NULL;
+ }
+
+ return p_region;
+}
+
+void subpicture_region_Delete( subpicture_region_t *p_region )
+{
+ if( !p_region )
+ return;
+
+ if( p_region->p_private )
+ subpicture_region_private_Delete( p_region->p_private );
+
+ if( p_region->p_picture )
+ picture_Release( p_region->p_picture );
+
+ free( p_region->fmt.p_palette );
+
+ free( p_region->psz_text );
+ free( p_region->psz_html );
+ if( p_region->p_style )
+ text_style_Delete( p_region->p_style );
+ free( p_region );
+}
+
+void subpicture_region_ChainDelete( subpicture_region_t *p_head )
+{
+ while( p_head )
+ {
+ subpicture_region_t *p_next = p_head->p_next;
+
+ subpicture_region_Delete( p_head );
+
+ p_head = p_next;
+ }
+}
+
--- /dev/null
+/*****************************************************************************
+ * subpicture.h: Private subpicture definitions
+ *****************************************************************************
+ * Copyright (C) 2010 Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
+ * $Id$
+ *
+ * Authors: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
+ *
+ * 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
+ * GNU General Public License for more details.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+struct subpicture_region_private_t {
+ video_format_t fmt;
+ picture_t *p_picture;
+};
+
+subpicture_region_private_t *subpicture_region_private_New(video_format_t *);
+void subpicture_region_private_Delete(subpicture_region_private_t *);
+
#include "vout_internal.h"
#include <vlc_image.h>
#include <vlc_input.h>
+#include "../misc/subpicture.h"
/*****************************************************************************
* Local prototypes
mtime_t i_last_sort_date;
};
-/* */
-struct subpicture_region_private_t
-{
- video_format_t fmt;
- picture_t *p_picture;
-};
-static subpicture_region_private_t *SpuRegionPrivateNew( video_format_t * );
-static void SpuRegionPrivateDelete( subpicture_region_private_t * );
-
/* */
typedef struct
{
#define SCALE_UNIT (1000)
-static void SubpictureUpdate( subpicture_t *,
- const video_format_t *p_fmt_src,
- const video_format_t *p_fmt_dst,
- mtime_t i_ts );
static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic );
static int SubpictureCmp( const void *s0, const void *s1 );
p_subpic != NULL;
p_subpic = p_subpic->p_next )
{
- SubpictureUpdate( p_subpic,
- p_fmt_src, p_fmt_dst,
- p_subpic->b_subtitle ? render_subtitle_date : render_osd_date );
+ subpicture_Update( p_subpic,
+ p_fmt_src, p_fmt_dst,
+ p_subpic->b_subtitle ? render_subtitle_date : render_osd_date );
/* */
if( p_subpic->b_subtitle )
vlc_mutex_unlock( &p_sys->lock );
}
-/*****************************************************************************
- * subpicture_t allocation
- *****************************************************************************/
-struct subpicture_private_t
-{
- video_format_t src;
- video_format_t dst;
-};
-
-subpicture_t *subpicture_New( const subpicture_updater_t *p_upd )
-{
- subpicture_t *p_subpic = calloc( 1, sizeof(*p_subpic) );
- if( !p_subpic )
- return NULL;
-
- p_subpic->i_order = 0;
- p_subpic->b_absolute = true;
- p_subpic->b_fade = false;
- p_subpic->b_subtitle = false;
- p_subpic->i_alpha = 0xFF;
- p_subpic->p_region = NULL;
-
- if( p_upd )
- {
- subpicture_private_t *p_private = malloc( sizeof(*p_private) );
- if( !p_private )
- {
- free( p_subpic );
- return NULL;
- }
- video_format_Init( &p_private->src, 0 );
- video_format_Init( &p_private->dst, 0 );
-
- p_subpic->updater = *p_upd;
- p_subpic->p_private = p_private;
- }
- else
- {
- p_subpic->p_private = NULL;
-
- p_subpic->updater.pf_validate = NULL;
- p_subpic->updater.pf_update = NULL;
- p_subpic->updater.pf_destroy = NULL;
- p_subpic->updater.p_sys = NULL;
- }
- return p_subpic;
-}
-
-void subpicture_Delete( subpicture_t *p_subpic )
-{
- subpicture_region_ChainDelete( p_subpic->p_region );
- p_subpic->p_region = NULL;
-
- if( p_subpic->updater.pf_destroy )
- p_subpic->updater.pf_destroy( p_subpic );
-
- free( p_subpic->p_private );
- free( p_subpic );
-}
-
+/* */
static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic )
{
p_subpic->p_next = *pp_head;
*pp_head = p_subpic;
}
-subpicture_t *subpicture_NewFromPicture( vlc_object_t *p_obj,
- picture_t *p_picture, vlc_fourcc_t i_chroma )
-{
- /* */
- video_format_t fmt_in = p_picture->format;
-
- /* */
- video_format_t fmt_out;
- fmt_out = fmt_in;
- fmt_out.i_chroma = i_chroma;
-
- /* */
- image_handler_t *p_image = image_HandlerCreate( p_obj );
- if( !p_image )
- return NULL;
-
- picture_t *p_pip = image_Convert( p_image, p_picture, &fmt_in, &fmt_out );
-
- image_HandlerDelete( p_image );
-
- if( !p_pip )
- return NULL;
-
- subpicture_t *p_subpic = subpicture_New( NULL );
- if( !p_subpic )
- {
- picture_Release( p_pip );
- return NULL;
- }
-
- p_subpic->i_original_picture_width = fmt_out.i_width;
- p_subpic->i_original_picture_height = fmt_out.i_height;
-
- fmt_out.i_sar_num =
- fmt_out.i_sar_den = 0;
-
- p_subpic->p_region = subpicture_region_New( &fmt_out );
- if( p_subpic->p_region )
- {
- picture_Release( p_subpic->p_region->p_picture );
- p_subpic->p_region->p_picture = p_pip;
- }
- else
- {
- picture_Release( p_pip );
- }
- return p_subpic;
-}
-
-static void SubpictureUpdate( subpicture_t *p_subpicture,
- const video_format_t *p_fmt_src,
- const video_format_t *p_fmt_dst,
- mtime_t i_ts )
-{
- subpicture_updater_t *p_upd = &p_subpicture->updater;
- subpicture_private_t *p_private = p_subpicture->p_private;
-
- if( !p_upd->pf_validate )
- return;
- if( !p_upd->pf_validate( p_subpicture,
- !video_format_IsSimilar( p_fmt_src,
- &p_private->src ), p_fmt_src,
- !video_format_IsSimilar( p_fmt_dst,
- &p_private->dst ), p_fmt_dst,
- i_ts ) )
- return;
-
- subpicture_region_ChainDelete( p_subpicture->p_region );
- p_subpicture->p_region = NULL;
-
- p_upd->pf_update( p_subpicture, p_fmt_src, p_fmt_dst, i_ts );
-
- video_format_Clean( &p_private->src );
- video_format_Clean( &p_private->dst );
-
- video_format_Copy( &p_private->src, p_fmt_src );
- video_format_Copy( &p_private->dst, p_fmt_dst );
-}
-
-/*****************************************************************************
- * subpicture_region_t allocation
- *****************************************************************************/
-subpicture_region_t *subpicture_region_New( const video_format_t *p_fmt )
-{
- subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) );
- if( !p_region )
- return NULL;
-
- p_region->fmt = *p_fmt;
- p_region->fmt.p_palette = NULL;
- if( p_fmt->i_chroma == VLC_CODEC_YUVP )
- {
- p_region->fmt.p_palette = calloc( 1, sizeof(*p_region->fmt.p_palette) );
- if( p_fmt->p_palette )
- *p_region->fmt.p_palette = *p_fmt->p_palette;
- }
- p_region->i_alpha = 0xff;
- p_region->p_next = NULL;
- p_region->p_private = NULL;
- p_region->psz_text = NULL;
- p_region->p_style = NULL;
- p_region->p_picture = NULL;
-
- if( p_fmt->i_chroma == VLC_CODEC_TEXT )
- return p_region;
-
- p_region->p_picture = picture_NewFromFormat( p_fmt );
- if( !p_region->p_picture )
- {
- free( p_region->fmt.p_palette );
- free( p_region );
- return NULL;
- }
-
- return p_region;
-}
-
-/* */
-void subpicture_region_Delete( subpicture_region_t *p_region )
-{
- if( !p_region )
- return;
-
- if( p_region->p_private )
- SpuRegionPrivateDelete( p_region->p_private );
-
- if( p_region->p_picture )
- picture_Release( p_region->p_picture );
-
- free( p_region->fmt.p_palette );
-
- free( p_region->psz_text );
- free( p_region->psz_html );
- if( p_region->p_style )
- text_style_Delete( p_region->p_style );
- free( p_region );
-}
-
-/* */
-void subpicture_region_ChainDelete( subpicture_region_t *p_head )
-{
- while( p_head )
- {
- subpicture_region_t *p_next = p_head->p_next;
-
- subpicture_region_Delete( p_head );
-
- p_head = p_next;
- }
-}
-
-
-
/*****************************************************************************
* heap managment
*****************************************************************************/
}
}
-static subpicture_region_private_t *SpuRegionPrivateNew( video_format_t *p_fmt )
-{
- subpicture_region_private_t *p_private = malloc( sizeof(*p_private) );
-
- if( !p_private )
- return NULL;
-
- p_private->fmt = *p_fmt;
- if( p_fmt->p_palette )
- {
- p_private->fmt.p_palette = malloc( sizeof(*p_private->fmt.p_palette) );
- if( p_private->fmt.p_palette )
- *p_private->fmt.p_palette = *p_fmt->p_palette;
- }
- p_private->p_picture = NULL;
-
- return p_private;
-}
-static void SpuRegionPrivateDelete( subpicture_region_private_t *p_private )
-{
- if( p_private->p_picture )
- picture_Release( p_private->p_picture );
- free( p_private->fmt.p_palette );
- free( p_private );
-}
-
static void FilterRelease( filter_t *p_filter )
{
if( p_filter->p_module )
if( b_changed )
{
- SpuRegionPrivateDelete( p_private );
+ subpicture_region_private_Delete( p_private );
p_region->p_private = NULL;
}
}
/* */
if( p_picture )
{
- p_region->p_private = SpuRegionPrivateNew( &p_picture->format );
+ p_region->p_private = subpicture_region_private_New( &p_picture->format );
if( p_region->p_private )
{
p_region->p_private->p_picture = p_picture;
if( !p_region->p_private->p_picture )
{
- SpuRegionPrivateDelete( p_region->p_private );
+ subpicture_region_private_Delete( p_region->p_private );
p_region->p_private = NULL;
}
}
}
if( p_region->p_private )
{
- SpuRegionPrivateDelete( p_region->p_private );
+ subpicture_region_private_Delete( p_region->p_private );
p_region->p_private = NULL;
}
p_region->i_align &= ~SUBPICTURE_RENDERED;
projects / vlc / commitdiff