#include "vout_internal.h"
#include <vlc_image.h>
#include <vlc_input.h>
+#include <vlc_modules.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 );
static void UpdateSPU ( spu_t *, vlc_object_t * );
static int CropCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
-static int MarginCallback( vlc_object_t *, char const *,
- vlc_value_t, vlc_value_t, void * );
/* Buffer allocation for SPU filter (blend, scale, ...) */
struct filter_owner_sys_t
};
static int spu_get_attachments( filter_t *,
input_attachment_t ***, int * );
-static subpicture_t *spu_new_buffer( filter_t * );
-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 * );
UpdateSPU( p_spu, p_input );
var_Create( p_input, "highlight", VLC_VAR_BOOL );
var_AddCallback( p_input, "highlight", CropCallback, p_spu );
- var_AddCallback( p_input, "sub-margin", MarginCallback, p_spu->p );
vlc_mutex_lock( &p_spu->p->lock );
p_spu->p->p_input = p_input;
- p_spu->p->i_margin = var_GetInteger( p_input, "sub-margin" );
FilterRelease( p_spu->p->p_text );
p_spu->p->p_text = NULL;
vlc_mutex_unlock( &p_spu->p->lock );
/* Delete callbacks */
- var_DelCallback( p_input, "sub-margin", MarginCallback, p_spu->p );
var_DelCallback( p_input, "highlight", CropCallback, p_spu );
var_Destroy( p_input, "highlight" );
}
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 )
+void spu_ChangeMargin( spu_t *p_spu, int i_margin )
{
- 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 );
+ spu_private_t *p_sys = p_spu->p;
- free( p_subpic->p_private );
- free( p_subpic );
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->i_margin = i_margin;
+ vlc_mutex_unlock( &p_sys->lock );
}
+/* */
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 )
p_text->fmt_out.video.i_height =
p_text->fmt_out.video.i_visible_height = 32;
- p_text->pf_sub_buffer_new = spu_new_buffer;
- p_text->pf_sub_buffer_del = spu_del_buffer;
p_text->pf_get_attachments = spu_get_attachments;
vlc_object_attach( p_text, p_spu );
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;
return VLC_SUCCESS;
}
-/*****************************************************************************
- * MarginCallback: called when requested subtitle position has changed *
- *****************************************************************************/
-
-static int MarginCallback( vlc_object_t *p_object, char const *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
- VLC_UNUSED( psz_var ); VLC_UNUSED( oldval ); VLC_UNUSED( p_object );
- spu_private_t *p_sys = ( spu_private_t* ) p_data;
-
- vlc_mutex_lock( &p_sys->lock );
- p_sys->i_margin = newval.i_int;
- vlc_mutex_unlock( &p_sys->lock );
- return VLC_SUCCESS;
-}
-
/*****************************************************************************
* Buffers allocation callbacks for the filters
*****************************************************************************/
VLC_UNUSED( p_filter );
subpicture_Delete( p_subpic );
}
-
-static subpicture_t *spu_new_buffer( filter_t *p_filter )
-{
- VLC_UNUSED(p_filter);
- return subpicture_New( NULL );
-}
-static void spu_del_buffer( filter_t *p_filter, subpicture_t *p_subpic )
-{
- VLC_UNUSED(p_filter);
- subpicture_Delete( p_subpic );
-}
-
static picture_t *spu_new_video_buffer( filter_t *p_filter )
{
const video_format_t *p_fmt = &p_filter->fmt_out.video;
projects / vlc / blobdiff