/*****************************************************************************
* vout_subpictures.c : subpicture management functions
*****************************************************************************
- * Copyright (C) 2000-2005 the VideoLAN team
+ * Copyright (C) 2000-2007 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* free() */
-#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
-
-#include <vlc/vlc.h>
-
-#include "vlc_block.h"
-#include "vlc_video.h"
-#include "video_output.h"
-#include "vlc_spu.h"
-#include "vlc_filter.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+#include <limits.h>
+
+#include <vlc_common.h>
+#include <vlc_vout.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
+#include <vlc_spu.h>
+#include "../libvlc.h"
+#include "vout_internal.h"
+#include <vlc_image.h>
+#include <vlc_input.h>
+#include <vlc_modules.h>
+#include "../misc/subpicture.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+
+/* Number of simultaneous subpictures */
+#define VOUT_MAX_SUBPICTURES (__MAX(VOUT_MAX_PICTURES, SPU_MAX_PREPARE_TIME/5000))
+
+/* */
+typedef struct
+{
+ subpicture_t *p_subpicture;
+ bool b_reject;
+} spu_heap_entry_t;
+
+typedef struct
+{
+ spu_heap_entry_t p_entry[VOUT_MAX_SUBPICTURES];
+
+} spu_heap_t;
+
+static void SpuHeapInit( spu_heap_t * );
+static int SpuHeapPush( spu_heap_t *, subpicture_t * );
+static void SpuHeapDeleteAt( spu_heap_t *, int i_index );
+static int SpuHeapDeleteSubpicture( spu_heap_t *, subpicture_t * );
+static void SpuHeapClean( spu_heap_t *p_heap );
+
+struct spu_private_t
+{
+ vlc_mutex_t lock; /* lock to protect all followings fields */
+ vlc_object_t *p_input;
+
+ spu_heap_t heap;
+
+ int i_channel; /**< number of subpicture channels registered */
+ filter_t *p_blend; /**< alpha blending module */
+ filter_t *p_text; /**< text renderer module */
+ filter_t *p_scale_yuvp; /**< scaling module for YUVP */
+ filter_t *p_scale; /**< scaling module (all but YUVP) */
+ bool b_force_crop; /**< force cropping of subpicture */
+ int i_crop_x, i_crop_y, i_crop_width, i_crop_height; /**< cropping */
+
+ int i_margin; /**< force position of a subpicture */
+ bool b_force_palette; /**< force palette of subpicture */
+ uint8_t palette[4][4]; /**< forced palette */
+
+ /* Subpiture filters */
+ char *psz_chain_update;
+ vlc_mutex_t chain_lock;
+ filter_chain_t *p_chain;
+
+ /* */
+ mtime_t i_last_sort_date;
+};
+
+/* */
+typedef struct
+{
+ int w;
+ int h;
+} spu_scale_t;
+static spu_scale_t spu_scale_create( int w, int h );
+static spu_scale_t spu_scale_unit(void );
+static spu_scale_t spu_scale_createq( int wn, int wd, int hn, int hd );
+static int spu_scale_w( int v, const spu_scale_t s );
+static int spu_scale_h( int v, const spu_scale_t s );
+static int spu_invscale_w( int v, const spu_scale_t s );
+static int spu_invscale_h( int v, const spu_scale_t s );
+
+typedef struct
+{
+ int i_x;
+ int i_y;
+ int i_width;
+ int i_height;
+
+ spu_scale_t scale;
+} spu_area_t;
+
+static spu_area_t spu_area_create( int x, int y, int w, int h, spu_scale_t );
+static spu_area_t spu_area_scaled( spu_area_t );
+static spu_area_t spu_area_unscaled( spu_area_t, spu_scale_t );
+static bool spu_area_overlap( spu_area_t, spu_area_t );
+
+
+/* Subpicture rendered flag
+ * FIXME ? it could be moved to private ? */
+#define SUBPICTURE_RENDERED (0x1000)
+#if SUBPICTURE_RENDERED < SUBPICTURE_ALIGN_MASK
+# error SUBPICTURE_RENDERED too low
+#endif
+
+#define SCALE_UNIT (1000)
+
+static void SubpictureChain( subpicture_t **pp_head, subpicture_t *p_subpic );
+static int SubpictureCmp( const void *s0, const void *s1 );
+
+static void SpuRenderRegion( spu_t *,
+ picture_t *p_pic_dst, spu_area_t *,
+ subpicture_t *, subpicture_region_t *,
+ const spu_scale_t scale_size,
+ const video_format_t *p_fmt,
+ const spu_area_t *p_subtitle_area, int i_subtitle_area,
+ mtime_t render_date );
+
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 spu_vaControlDefault( spu_t *, int, va_list );
-
-static subpicture_t *sub_new_buffer( filter_t * );
-static void sub_del_buffer( filter_t *, subpicture_t * );
-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 * );
-
+/* Buffer allocation for SPU filter (blend, scale, ...) */
struct filter_owner_sys_t
{
spu_t *p_spu;
int i_channel;
};
+static int spu_get_attachments( filter_t *,
+ input_attachment_t ***, int * );
+static picture_t *spu_new_video_buffer( filter_t * );
+static void spu_del_video_buffer( filter_t *, picture_t * );
+
+/* Buffer aloccation fir SUB filter */
+static int SubFilterAllocationInit( filter_t *, void * );
+static void SubFilterAllocationClean( filter_t * );
+
+/* */
+static void SpuRenderCreateAndLoadText( spu_t * );
+static void SpuRenderCreateAndLoadScale( spu_t * );
+static void FilterRelease( filter_t *p_filter );
+
+/*****************************************************************************
+ * Public API
+ *****************************************************************************/
+#undef spu_Create
/**
* Creates the subpicture unit
*
* \param p_this the parent object which creates the subpicture unit
*/
-spu_t *__spu_Create( vlc_object_t *p_this )
+spu_t *spu_Create( vlc_object_t *p_this )
{
- int i_index;
- spu_t *p_spu = vlc_object_create( p_this, VLC_OBJECT_SPU );
-
- for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++)
- {
- p_spu->p_subpicture[i_index].i_status = FREE_SUBPICTURE;
- }
+ spu_t *p_spu;
+ spu_private_t *p_sys;
- p_spu->p_blend = NULL;
- p_spu->p_text = NULL;
- p_spu->p_scale = NULL;
- p_spu->i_filter = 0;
- p_spu->pf_control = spu_vaControlDefault;
+ p_spu = vlc_custom_create( p_this, sizeof(spu_t) + sizeof(spu_private_t),
+ VLC_OBJECT_GENERIC, "subpicture" );
+ if( !p_spu )
+ return NULL;
+ vlc_object_attach( p_spu, p_this );
- /* Register the default subpicture channel */
- p_spu->i_channel = 2;
+ /* Initialize spu fields */
+ p_spu->p = p_sys = (spu_private_t*)&p_spu[1];
- vlc_mutex_init( p_this, &p_spu->subpicture_lock );
+ /* Initialize private fields */
+ vlc_mutex_init( &p_sys->lock );
- vlc_object_attach( p_spu, p_this );
+ SpuHeapInit( &p_sys->heap );
- return p_spu;
-}
+ p_sys->p_blend = NULL;
+ p_sys->p_text = NULL;
+ p_sys->p_scale = NULL;
+ p_sys->p_scale_yuvp = NULL;
-/**
- * Initialise the subpicture unit
- *
- * \param p_spu the subpicture unit object
- */
-int spu_Init( spu_t *p_spu )
-{
- char *psz_filter, *psz_filter_orig;
- vlc_value_t val;
+ p_sys->i_margin = var_InheritInteger( p_spu, "sub-margin" );
- /* If the user requested a sub margin, we force the position. */
- var_Create( p_spu, "sub-margin", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_spu, "sub-margin", &val );
- p_spu->i_margin = val.i_int;
+ /* Register the default subpicture channel */
+ p_sys->i_channel = SPU_DEFAULT_CHANNEL + 1;
- var_Create( p_spu, "sub-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Get( p_spu, "sub-filter", &val );
- psz_filter = psz_filter_orig = val.psz_string;
- while( psz_filter && *psz_filter )
- {
- char *psz_parser = strchr( psz_filter, ':' );
-
- if( psz_parser ) *psz_parser++ = 0;
-
- 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_module =
- module_Need( p_spu->pp_filter[p_spu->i_filter],
- "sub filter", psz_filter, 0 );
- if( p_spu->pp_filter[p_spu->i_filter]->p_module )
- {
- filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) );
- p_spu->pp_filter[p_spu->i_filter]->p_owner = p_sys;
- spu_Control( p_spu, SPU_CHANNEL_REGISTER, &p_sys->i_channel );
- p_sys->p_spu = p_spu;
- p_spu->i_filter++;
- }
- else
- {
- msg_Dbg( p_spu, "no sub filter found" );
- vlc_object_detach( p_spu->pp_filter[p_spu->i_filter] );
- vlc_object_destroy( p_spu->pp_filter[p_spu->i_filter] );
- }
+ p_sys->psz_chain_update = NULL;
+ vlc_mutex_init( &p_sys->chain_lock );
+ p_sys->p_chain = filter_chain_New( p_spu, "sub filter", false,
+ SubFilterAllocationInit,
+ SubFilterAllocationClean,
+ p_spu );
- if( p_spu->i_filter >= 10 )
- {
- msg_Dbg( p_spu, "can't add anymore filters" );
- }
+ /* Load text and scale module */
+ SpuRenderCreateAndLoadText( p_spu );
+ SpuRenderCreateAndLoadScale( p_spu );
- psz_filter = psz_parser;
- }
- if( psz_filter_orig ) free( psz_filter_orig );
+ /* */
+ p_sys->i_last_sort_date = -1;
- return VLC_EGENERIC;
+ return p_spu;
}
/**
*/
void spu_Destroy( spu_t *p_spu )
{
- int i_index;
-
- vlc_object_detach( p_spu );
-
- /* Destroy all remaining subpictures */
- for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
- {
- if( p_spu->p_subpicture[i_index].i_status != FREE_SUBPICTURE )
- {
- spu_DestroySubpicture( p_spu, &p_spu->p_subpicture[i_index] );
- }
- }
+ spu_private_t *p_sys = p_spu->p;
- if( p_spu->p_blend )
- {
- if( p_spu->p_blend->p_module )
- module_Unneed( p_spu->p_blend, p_spu->p_blend->p_module );
+ if( p_sys->p_blend )
+ filter_DeleteBlend( p_sys->p_blend );
- vlc_object_detach( p_spu->p_blend );
- vlc_object_destroy( p_spu->p_blend );
- }
+ if( p_sys->p_text )
+ FilterRelease( p_sys->p_text );
- if( p_spu->p_text )
- {
- if( p_spu->p_text->p_module )
- module_Unneed( p_spu->p_text, p_spu->p_text->p_module );
+ if( p_sys->p_scale_yuvp )
+ FilterRelease( p_sys->p_scale_yuvp );
- vlc_object_detach( p_spu->p_text );
- vlc_object_destroy( p_spu->p_text );
- }
+ if( p_sys->p_scale )
+ FilterRelease( p_sys->p_scale );
- if( p_spu->p_scale )
- {
- if( p_spu->p_scale->p_module )
- module_Unneed( p_spu->p_scale, p_spu->p_scale->p_module );
+ filter_chain_Delete( p_sys->p_chain );
+ vlc_mutex_destroy( &p_sys->chain_lock );
+ free( p_sys->psz_chain_update );
- vlc_object_detach( p_spu->p_scale );
- vlc_object_destroy( p_spu->p_scale );
- }
+ /* Destroy all remaining subpictures */
+ SpuHeapClean( &p_sys->heap );
- 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 );
- 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_sys->lock );
- vlc_mutex_destroy( &p_spu->subpicture_lock );
- vlc_object_destroy( p_spu );
+ vlc_object_release( p_spu );
}
/**
* \param p_this the object in which to destroy the subpicture unit
* \param b_attach to select attach or detach
*/
-void spu_Attach( spu_t *p_spu, vlc_object_t *p_this, vlc_bool_t b_attach )
+void spu_Attach( spu_t *p_spu, vlc_object_t *p_input, bool b_attach )
{
- vlc_object_t *p_input;
-
- p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT );
- if( !p_input ) return;
-
if( b_attach )
{
- UpdateSPU( p_spu, VLC_OBJECT(p_input) );
+ UpdateSPU( p_spu, p_input );
+ var_Create( p_input, "highlight", VLC_VAR_BOOL );
var_AddCallback( p_input, "highlight", CropCallback, p_spu );
- vlc_object_release( p_input );
+
+ vlc_mutex_lock( &p_spu->p->lock );
+ p_spu->p->p_input = p_input;
+
+ FilterRelease( p_spu->p->p_text );
+ p_spu->p->p_text = NULL;
+ SpuRenderCreateAndLoadText( p_spu );
+
+ vlc_mutex_unlock( &p_spu->p->lock );
}
else
{
- /* Delete callback */
+ vlc_mutex_lock( &p_spu->p->lock );
+ p_spu->p->p_input = NULL;
+ vlc_mutex_unlock( &p_spu->p->lock );
+
+ /* Delete callbacks */
var_DelCallback( p_input, "highlight", CropCallback, p_spu );
- vlc_object_release( p_input );
+ var_Destroy( p_input, "highlight" );
}
}
/**
- * Create a subpicture region
- *
- * \param p_this vlc_object_t
- * \param p_fmt the format that this subpicture region should have
+ * Inform the SPU filters of mouse event
*/
-static void RegionPictureRelease( picture_t *p_pic )
+int spu_ProcessMouse( spu_t *p_spu,
+ const vlc_mouse_t *p_mouse,
+ const video_format_t *p_fmt )
{
- if( p_pic->p_data_orig ) free( p_pic->p_data_orig );
-}
-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) );
- 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->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 = NULL;
+ spu_private_t *p_sys = p_spu->p;
- if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') ) return p_region;
+ vlc_mutex_lock( &p_sys->chain_lock );
+ filter_chain_MouseEvent( p_sys->p_chain, p_mouse, p_fmt );
+ vlc_mutex_unlock( &p_sys->chain_lock );
- vout_AllocatePicture( p_this, &p_region->picture, p_fmt->i_chroma,
- p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect );
-
- if( !p_region->picture.i_planes )
- {
- free( p_region );
- free( p_fmt->p_palette );
- return NULL;
- }
-
- p_region->picture.pf_release = RegionPictureRelease;
-
- return p_region;
-}
-
-/**
- * Make a subpicture region from an existing picture_t
- *
- * \param p_this vlc_object_t
- * \param p_fmt the format that this subpicture region should have
- * \param p_pic a pointer to the picture creating the region (not freed)
- */
-subpicture_region_t *__spu_MakeRegion( vlc_object_t *p_this,
- video_format_t *p_fmt,
- picture_t *p_pic )
-{
- subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) );
- 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->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;
-
- memcpy( &p_region->picture, p_pic, sizeof(picture_t) );
- p_region->picture.pf_release = RegionPictureRelease;
-
- return p_region;
-}
-
-/**
- * Destroy a subpicture region
- *
- * \param p_this vlc_object_t
- * \param p_region the subpicture region to destroy
- */
-void __spu_DestroyRegion( vlc_object_t *p_this, subpicture_region_t *p_region )
-{
- if( !p_region ) return;
- 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->p_cache ) __spu_DestroyRegion( p_this, p_region->p_cache );
- free( p_region );
+ return VLC_SUCCESS;
}
/**
*/
void spu_DisplaySubpicture( spu_t *p_spu, subpicture_t *p_subpic )
{
- /* Check if status is valid */
- if( p_subpic->i_status != RESERVED_SUBPICTURE )
- {
- msg_Err( p_spu, "subpicture %p has invalid status #%d",
- p_subpic, p_subpic->i_status );
- }
+ spu_private_t *p_sys = p_spu->p;
+
+ /* SPU_DEFAULT_CHANNEL always reset itself */
+ if( p_subpic->i_channel == SPU_DEFAULT_CHANNEL )
+ spu_ClearChannel( p_spu, SPU_DEFAULT_CHANNEL );
- /* Remove reservation flag */
- p_subpic->i_status = READY_SUBPICTURE;
+ /* p_private is for spu only and cannot be non NULL here */
+ for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next )
+ assert( r->p_private == NULL );
- if( p_subpic->i_channel == DEFAULT_CHAN )
+ /* */
+ vlc_mutex_lock( &p_sys->lock );
+ if( SpuHeapPush( &p_sys->heap, p_subpic ) )
{
- p_subpic->i_channel = 0xFFFF;
- spu_Control( p_spu, SPU_CHANNEL_CLEAR, DEFAULT_CHAN );
- p_subpic->i_channel = DEFAULT_CHAN;
+ vlc_mutex_unlock( &p_sys->lock );
+ msg_Err( p_spu, "subpicture heap full" );
+ subpicture_Delete( p_subpic );
+ return;
}
+ vlc_mutex_unlock( &p_sys->lock );
}
/**
- * Allocate a subpicture in the spu heap.
- *
- * This function create a reserved subpicture in the spu heap.
- * A null pointer is returned if the function fails. This method provides an
- * already allocated zone of memory in the spu data fields. It needs locking
- * since several pictures can be created by several producers threads.
- * \param p_spu the subpicture unit in which to create the subpicture
- * \return NULL on error, a reserved subpicture otherwise
+ * This function renders all sub picture units in the list.
*/
-subpicture_t *spu_CreateSubpicture( spu_t *p_spu )
+void spu_RenderSubpictures( spu_t *p_spu,
+ picture_t *p_pic_dst, const video_format_t *p_fmt_dst,
+ subpicture_t *p_subpic_list,
+ const video_format_t *p_fmt_src,
+ mtime_t render_subtitle_date )
{
- int i_subpic; /* subpicture index */
- subpicture_t * p_subpic = NULL; /* first free subpicture */
-
- /* Get lock */
- vlc_mutex_lock( &p_spu->subpicture_lock );
+ spu_private_t *p_sys = p_spu->p;
- /*
- * Look for an empty place
- */
- p_subpic = NULL;
- for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
- {
- if( p_spu->p_subpicture[i_subpic].i_status == FREE_SUBPICTURE )
- {
- /* Subpicture is empty and ready for allocation */
- p_subpic = &p_spu->p_subpicture[i_subpic];
- p_spu->p_subpicture[i_subpic].i_status = RESERVED_SUBPICTURE;
- break;
- }
- }
+ const mtime_t render_osd_date = mdate();
- /* If no free subpicture could be found */
- if( p_subpic == NULL )
- {
- msg_Err( p_spu, "subpicture heap is full" );
- vlc_mutex_unlock( &p_spu->subpicture_lock );
- return NULL;
- }
+ const int i_source_video_width = p_fmt_src->i_width;
+ const int i_source_video_height = p_fmt_src->i_height;
- /* Copy subpicture information, set some default values */
- 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;
- p_subpic->pf_render = 0;
- p_subpic->pf_destroy = 0;
- p_subpic->p_sys = 0;
- vlc_mutex_unlock( &p_spu->subpicture_lock );
-
- p_subpic->pf_create_region = __spu_CreateRegion;
- p_subpic->pf_make_region = __spu_MakeRegion;
- p_subpic->pf_destroy_region = __spu_DestroyRegion;
+ unsigned int i_subpicture;
+ subpicture_t *pp_subpicture[VOUT_MAX_SUBPICTURES];
- return p_subpic;
-}
+ unsigned int i_subtitle_region_count;
+ spu_area_t p_subtitle_area_buffer[VOUT_MAX_SUBPICTURES];
+ spu_area_t *p_subtitle_area;
+ int i_subtitle_area;
-/**
- * Remove a subpicture from the heap
- *
- * This function frees a previously reserved subpicture.
- * It is meant to be used when the construction of a picture aborted.
- * This function does not need locking since reserved subpictures are ignored
- * by the spu.
- */
-void spu_DestroySubpicture( spu_t *p_spu, subpicture_t *p_subpic )
-{
- /* Get lock */
- vlc_mutex_lock( &p_spu->subpicture_lock );
+ vlc_mutex_lock( &p_sys->lock );
- /* There can be race conditions so we need to check the status */
- if( p_subpic->i_status == FREE_SUBPICTURE )
+ /* Preprocess subpictures */
+ i_subpicture = 0;
+ i_subtitle_region_count = 0;
+ for( subpicture_t * p_subpic = p_subpic_list;
+ p_subpic != NULL;
+ p_subpic = p_subpic->p_next )
{
- vlc_mutex_unlock( &p_spu->subpicture_lock );
- return;
- }
+ subpicture_Update( p_subpic,
+ p_fmt_src, p_fmt_dst,
+ p_subpic->b_subtitle ? render_subtitle_date : render_osd_date );
- /* Check if status is valid */
- if( ( p_subpic->i_status != RESERVED_SUBPICTURE )
- && ( p_subpic->i_status != READY_SUBPICTURE ) )
- {
- msg_Err( p_spu, "subpicture %p has invalid status %d",
- p_subpic, p_subpic->i_status );
- }
+ /* */
+ if( p_subpic->b_subtitle )
+ {
+ for( subpicture_region_t *r = p_subpic->p_region; r != NULL; r = r->p_next )
+ i_subtitle_region_count++;
+ }
- while( p_subpic->p_region )
- {
- subpicture_region_t *p_region = p_subpic->p_region;
- p_subpic->p_region = p_region->p_next;
- spu_DestroyRegion( p_spu, p_region );
+ /* */
+ pp_subpicture[i_subpicture++] = p_subpic;
}
- if( p_subpic->pf_destroy )
+ /* Be sure we have at least 1 picture to process */
+ if( i_subpicture <= 0 )
{
- p_subpic->pf_destroy( p_subpic );
+ vlc_mutex_unlock( &p_sys->lock );
+ return;
}
- p_subpic->i_status = FREE_SUBPICTURE;
+ /* Now order subpicture array
+ * XXX The order is *really* important for overlap subtitles positionning */
+ qsort( pp_subpicture, i_subpicture, sizeof(*pp_subpicture), SubpictureCmp );
- vlc_mutex_unlock( &p_spu->subpicture_lock );
-}
+ /* Allocate area array for subtitle overlap */
+ i_subtitle_area = 0;
+ p_subtitle_area = p_subtitle_area_buffer;
+ if( i_subtitle_region_count > sizeof(p_subtitle_area_buffer)/sizeof(*p_subtitle_area_buffer) )
+ p_subtitle_area = calloc( i_subtitle_region_count, sizeof(*p_subtitle_area) );
-/*****************************************************************************
- * spu_RenderSubpictures: render a subpicture list
- *****************************************************************************
- * This function renders all sub picture units in the list.
- *****************************************************************************/
-void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
- picture_t *p_pic_dst, picture_t *p_pic_src,
- subpicture_t *p_subpic,
- int i_scale_width_orig, int i_scale_height_orig )
-{
- /* Get lock */
- vlc_mutex_lock( &p_spu->subpicture_lock );
+ /* Create the blending module */
+ if( !p_sys->p_blend )
+ p_spu->p->p_blend = filter_NewBlend( VLC_OBJECT(p_spu), p_fmt_dst );
- /* Check i_status again to make sure spudec hasn't destroyed the subpic */
- while( p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE )
+ /* Process all subpictures and regions (in the right order) */
+ for( unsigned int i_index = 0; i_index < i_subpicture; i_index++ )
{
- subpicture_region_t *p_region = p_subpic->p_region;
- int i_scale_width, i_scale_height;
- int i_subpic_x = p_subpic->i_x;
+ subpicture_t *p_subpic = pp_subpicture[i_index];
+ subpicture_region_t *p_region;
- /* Load the blending module */
- if( !p_spu->p_blend && p_region )
- {
- p_spu->p_blend = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
- vlc_object_attach( p_spu->p_blend, p_spu );
- p_spu->p_blend->fmt_out.video.i_x_offset =
- p_spu->p_blend->fmt_out.video.i_y_offset = 0;
- 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');
-
- p_spu->p_blend->p_module =
- module_Need( p_spu->p_blend, "video blending", 0, 0 );
- }
+ if( !p_subpic->p_region )
+ continue;
- /* Load the text rendering module */
- if( !p_spu->p_text && p_region && p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') )
+ /* FIXME when possible use a better rendering size than source size
+ * (max of display size and source size for example) FIXME */
+ int i_render_width = p_subpic->i_original_picture_width;
+ int i_render_height = p_subpic->i_original_picture_height;
+ if( !i_render_width || !i_render_height )
{
- 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_spu->p_text->fmt_out.video.i_height =
- p_spu->p_text->fmt_out.video.i_visible_height =
- p_fmt->i_height;
+ if( i_render_width != 0 || i_render_height != 0 )
+ msg_Err( p_spu, "unsupported original picture size %dx%d",
+ i_render_width, i_render_height );
- p_spu->p_text->pf_sub_buffer_new = spu_new_buffer;
- p_spu->p_text->pf_sub_buffer_del = spu_del_buffer;
-
- 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 );
+ p_subpic->i_original_picture_width = i_render_width = i_source_video_width;
+ p_subpic->i_original_picture_height = i_render_height = i_source_video_height;
}
- if( p_spu->p_text )
+
+ if( p_sys->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;
- }
+ p_sys->p_text->fmt_out.video.i_width =
+ p_sys->p_text->fmt_out.video.i_visible_width = i_render_width;
+
+ p_sys->p_text->fmt_out.video.i_height =
+ p_sys->p_text->fmt_out.video.i_visible_height = i_render_height;
}
- i_scale_width = i_scale_width_orig;
- i_scale_height = i_scale_height_orig;
+ /* Compute scaling from picture to source size */
+ spu_scale_t scale = spu_scale_createq( i_source_video_width, i_render_width,
+ i_source_video_height, i_render_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;
- 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;
- i_scale_width = i_scale_height * i_scale_height / p_fmt->i_height;
- }
+ /* Update scaling from source size to display size(p_fmt_dst) */
+ scale.w = scale.w * p_fmt_dst->i_width / i_source_video_width;
+ scale.h = scale.h * p_fmt_dst->i_height / i_source_video_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) )
+ /* Set default subpicture aspect ratio
+ * FIXME if we only handle 1 aspect ratio per picture, why is it set per
+ * region ? */
+ p_region = p_subpic->p_region;
+ if( !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;
+ p_region->fmt.i_sar_den = p_fmt_dst->i_sar_den;
+ p_region->fmt.i_sar_num = p_fmt_dst->i_sar_num;
}
/* Take care of the aspect ratio */
- if( p_region && p_region->fmt.i_sar_num * p_fmt->i_sar_den !=
- p_region->fmt.i_sar_den * p_fmt->i_sar_num )
- {
- 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_region->fmt.i_sar_num * p_fmt_dst->i_sar_den !=
+ p_region->fmt.i_sar_den * p_fmt_dst->i_sar_num )
{
- 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');
- 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 =
- p_spu->p_scale->fmt_out.video.i_height = 16;
-
- p_spu->p_scale->pf_vout_buffer_new = spu_new_video_buffer;
- p_spu->p_scale->pf_vout_buffer_del = spu_del_video_buffer;
- p_spu->p_scale->p_module =
- module_Need( p_spu->p_scale, "video filter2", 0, 0 );
+ /* FIXME FIXME what about region->i_x/i_y ? */
+ scale.w = scale.w *
+ (int64_t)p_region->fmt.i_sar_num * p_fmt_dst->i_sar_den /
+ p_region->fmt.i_sar_den / p_fmt_dst->i_sar_num;
}
- while( p_region && p_spu->p_blend && p_spu->p_blend->pf_video_blend )
+ /* Render all regions
+ * We always transform non absolute subtitle into absolute one on the
+ * first rendering to allow good subtitle overlap support.
+ */
+ for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next )
{
- int i_fade_alpha = 255;
- 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 )
- {
- p_region->i_align = p_subpic->i_flags;
- p_spu->p_text->pf_render_text( p_spu->p_text,
- p_region, p_region );
- }
- }
-
- /* Force palette if requested */
- if( p_spu->b_force_palette && VLC_FOURCC('Y','U','V','P') ==
- p_region->fmt.i_chroma )
- {
- memcpy( p_region->fmt.p_palette->palette,
- p_spu->palette, 16 );
- }
-
- /* Scale SPU if necessary */
- if( p_region->p_cache )
- {
- if( i_scale_width * p_region->fmt.i_width / 1000 !=
- p_region->p_cache->fmt.i_width ||
- i_scale_height * p_region->fmt.i_height / 1000 !=
- p_region->p_cache->fmt.i_height )
- {
- p_subpic->pf_destroy_region( VLC_OBJECT(p_spu),
- p_region->p_cache );
- p_region->p_cache = 0;
- }
- }
-
- if( (i_scale_width != 1000 || i_scale_height != 1000) &&
- p_spu->p_scale && !p_region->p_cache )
- {
- picture_t *p_pic;
-
- p_spu->p_scale->fmt_in.video = p_region->fmt;
- p_spu->p_scale->fmt_out.video = p_region->fmt;
-
- p_region->p_cache =
- p_subpic->pf_create_region( VLC_OBJECT(p_spu),
- &p_spu->p_scale->fmt_out.video );
- if( p_spu->p_scale->fmt_out.video.p_palette )
- *p_spu->p_scale->fmt_out.video.p_palette =
- *p_region->fmt.p_palette;
- p_region->p_cache->p_next = p_region->p_next;
-
- vout_CopyPicture( p_spu, &p_region->p_cache->picture,
- &p_region->picture );
-
- p_spu->p_scale->fmt_out.video.i_width =
- p_region->fmt.i_width * i_scale_width / 1000;
- p_spu->p_scale->fmt_out.video.i_visible_width =
- p_region->fmt.i_visible_width * i_scale_width / 1000;
- p_spu->p_scale->fmt_out.video.i_height =
- p_region->fmt.i_height * i_scale_height / 1000;
- p_spu->p_scale->fmt_out.video.i_visible_height =
- p_region->fmt.i_visible_height * i_scale_height / 1000;
- 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_pic = p_spu->p_scale->pf_video_filter(
- p_spu->p_scale, &p_region->p_cache->picture );
- if( p_pic )
- {
- picture_t p_pic_tmp = p_region->p_cache->picture;
- p_region->p_cache->picture = *p_pic;
- *p_pic = p_pic_tmp;
- free( p_pic );
- }
- }
- if( (i_scale_width != 1000 || i_scale_height != 1000) &&
- p_spu->p_scale && p_region->p_cache )
- {
- p_region = p_region->p_cache;
- }
-
- if( p_subpic->i_flags & SUBPICTURE_ALIGN_BOTTOM )
- {
- i_y_offset = p_fmt->i_height - p_region->fmt.i_height -
- p_subpic->i_y;
- }
- else if ( !(p_subpic->i_flags & 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 )
- {
- i_x_offset = p_fmt->i_width - p_region->fmt.i_width -
- i_subpic_x;
- }
- else if ( !(p_subpic->i_flags & SUBPICTURE_ALIGN_LEFT) )
- {
- i_x_offset = p_fmt->i_width / 2 - p_region->fmt.i_width / 2;
- }
-
- if( p_subpic->b_absolute )
- {
- i_x_offset = p_region->i_x +
- 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 && 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 );
- }
+ spu_area_t area;
- p_spu->p_blend->fmt_in.video = p_region->fmt;
-
- /* Force cropping if requested */
- if( p_spu->b_force_crop )
- {
- video_format_t *p_fmt = &p_spu->p_blend->fmt_in.video;
- int i_crop_x = p_spu->i_crop_x * i_scale_width / 1000;
- int i_crop_y = p_spu->i_crop_y * i_scale_height / 1000;
- int i_crop_width = p_spu->i_crop_width * i_scale_width / 1000;
- int i_crop_height = p_spu->i_crop_height * i_scale_height/1000;
-
- /* Find the intersection */
- if( i_crop_x + i_crop_width <= i_x_offset ||
- i_x_offset + (int)p_fmt->i_visible_width < i_crop_x ||
- i_crop_y + i_crop_height <= i_y_offset ||
- i_y_offset + (int)p_fmt->i_visible_height < i_crop_y )
- {
- /* No intersection */
- p_fmt->i_visible_width = p_fmt->i_visible_height = 0;
- }
- else
- {
- int i_x, i_y, i_x_end, i_y_end;
- i_x = __MAX( i_crop_x, i_x_offset );
- i_y = __MAX( i_crop_y, i_y_offset );
- i_x_end = __MIN( i_crop_x + i_crop_width,
- i_x_offset + (int)p_fmt->i_visible_width );
- i_y_end = __MIN( i_crop_y + i_crop_height,
- i_y_offset + (int)p_fmt->i_visible_height );
-
- p_fmt->i_x_offset = i_x - i_x_offset;
- p_fmt->i_y_offset = i_y - i_y_offset;
- p_fmt->i_visible_width = i_x_end - i_x;
- p_fmt->i_visible_height = i_y_end - i_y;
-
- i_x_offset = i_x;
- i_y_offset = i_y;
- }
- }
+ /* Check scale validity */
+ if( scale.w <= 0 || scale.h <= 0 )
+ continue;
- /* Update the output picture size */
- p_spu->p_blend->fmt_out.video.i_width =
- p_spu->p_blend->fmt_out.video.i_visible_width =
- p_fmt->i_width;
- p_spu->p_blend->fmt_out.video.i_height =
- p_spu->p_blend->fmt_out.video.i_visible_height =
- p_fmt->i_height;
+ /* */
+ SpuRenderRegion( p_spu, p_pic_dst, &area,
+ p_subpic, p_region, scale, p_fmt_dst,
+ p_subtitle_area, i_subtitle_area,
+ p_subpic->b_subtitle ? render_subtitle_date : render_osd_date );
- if( p_subpic->b_fade )
+ if( p_subpic->b_subtitle )
{
- mtime_t i_fade_start = ( p_subpic->i_stop +
- p_subpic->i_start ) / 2;
- mtime_t i_now = mdate();
- if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start )
+ area = spu_area_unscaled( area, scale );
+ if( !p_subpic->b_absolute && area.i_width > 0 && area.i_height > 0 )
{
- i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
- ( p_subpic->i_stop - i_fade_start );
+ p_region->i_x = area.i_x;
+ p_region->i_y = area.i_y;
}
+ if( p_subtitle_area )
+ p_subtitle_area[i_subtitle_area++] = area;
}
-
- 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 );
-
- p_region = p_region->p_next;
}
-
- p_subpic = p_subpic->p_next;
+ if( p_subpic->b_subtitle )
+ p_subpic->b_absolute = true;
}
- vlc_mutex_unlock( &p_spu->subpicture_lock );
+ /* */
+ if( p_subtitle_area != p_subtitle_area_buffer )
+ free( p_subtitle_area );
+
+ vlc_mutex_unlock( &p_sys->lock );
}
/*****************************************************************************
* spu_SortSubpictures: find the subpictures to display
*****************************************************************************
* This function parses all subpictures and decides which ones need to be
- * displayed. This operation does not need lock, since only READY_SUBPICTURE
- * are handled. If no picture has been selected, display_date will depend on
+ * displayed. If no picture has been selected, display_date will depend on
* the subpicture.
* We also check for ephemer DVD subpictures (subpictures that have
* 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,
- vlc_bool_t b_paused )
+subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t render_subtitle_date,
+ bool b_subtitle_only )
{
- int i_index, i_channel;
+ spu_private_t *p_sys = p_spu->p;
subpicture_t *p_subpic = NULL;
- subpicture_t *p_ephemer;
- mtime_t ephemer_date;
+ const mtime_t render_osd_date = mdate();
+
+ /* Update sub-filter chain */
+ vlc_mutex_lock( &p_sys->lock );
+ char *psz_chain_update = p_sys->psz_chain_update;
+ p_sys->psz_chain_update = NULL;
+ vlc_mutex_unlock( &p_sys->lock );
+ vlc_mutex_lock( &p_sys->chain_lock );
+ if( psz_chain_update )
+ {
+ filter_chain_Reset( p_sys->p_chain, NULL, NULL );
+
+ filter_chain_AppendFromString( p_spu->p->p_chain, psz_chain_update );
+
+ free( psz_chain_update );
+ }
/* Run subpicture filters */
- for( i_index = 0; i_index < p_spu->i_filter; i_index++ )
+ filter_chain_SubFilter( p_sys->p_chain, render_osd_date );
+ vlc_mutex_unlock( &p_sys->chain_lock );
+
+ vlc_mutex_lock( &p_sys->lock );
+
+ /* Create a list of channels */
+ int pi_channel[VOUT_MAX_SUBPICTURES];
+ int i_channel_count = 0;
+
+ for( int i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
{
- subpicture_t *p_subpic_filter;
- p_subpic_filter = p_spu->pp_filter[i_index]->
- pf_sub_filter( p_spu->pp_filter[i_index], display_date );
- if( p_subpic_filter )
+ spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_index];
+ if( !p_entry->p_subpicture || p_entry->b_reject )
+ continue;
+ const int i_channel = p_entry->p_subpicture->i_channel;
+ int i;
+ for( i = 0; i < i_channel_count; i++ )
{
- spu_DisplaySubpicture( p_spu, p_subpic_filter );
+ if( pi_channel[i] == i_channel )
+ break;
}
+ if( i_channel_count <= i )
+ pi_channel[i_channel_count++] = i_channel;
}
/* We get an easily parsable chained list of subpictures which
* ends with NULL since p_subpic was initialized to NULL. */
- for( i_channel = 0; i_channel < p_spu->i_channel; i_channel++ )
+ for( int i = 0; i < i_channel_count; i++ )
{
- p_ephemer = 0;
- ephemer_date = 0;
-
+ const int i_channel = pi_channel[i];
+ subpicture_t *p_available_subpic[VOUT_MAX_SUBPICTURES];
+ bool pb_available_late[VOUT_MAX_SUBPICTURES];
+ int i_available = 0;
+
+ mtime_t start_date = render_subtitle_date;
+ mtime_t ephemer_subtitle_date = 0;
+ mtime_t ephemer_osd_date = 0;
+ int64_t i_ephemer_subtitle_order = INT64_MIN;
+ int64_t i_ephemer_system_order = INT64_MIN;
+ int i_index;
+
+ /* Select available pictures */
for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
{
- if( p_spu->p_subpicture[i_index].i_channel != i_channel ||
- p_spu->p_subpicture[i_index].i_status != READY_SUBPICTURE )
+ spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_index];
+ subpicture_t *p_current = p_entry->p_subpicture;
+ bool b_stop_valid;
+ bool b_late;
+
+ if( !p_current || p_entry->b_reject )
{
+ if( p_entry->b_reject )
+ SpuHeapDeleteAt( &p_sys->heap, i_index );
continue;
}
- if( display_date &&
- display_date < p_spu->p_subpicture[i_index].i_start )
+
+ if( p_current->i_channel != i_channel ||
+ ( b_subtitle_only && !p_current->b_subtitle ) )
{
- /* Too early, come back next monday */
continue;
}
-
- if( p_spu->p_subpicture[i_index].i_start > ephemer_date )
- ephemer_date = p_spu->p_subpicture[i_index].i_start;
-
- 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].b_pausable &&
- b_paused ) )
+ const mtime_t render_date = p_current->b_subtitle ? render_subtitle_date : render_osd_date;
+ if( render_date &&
+ render_date < p_current->i_start )
{
- /* Too late, destroy the subpic */
- spu_DestroySubpicture( p_spu, &p_spu->p_subpicture[i_index] );
+ /* Too early, come back next monday */
continue;
}
- /* If this is an ephemer subpic, add it to our list */
- if( p_spu->p_subpicture[i_index].b_ephemer )
+ mtime_t *pi_ephemer_date = p_current->b_subtitle ? &ephemer_subtitle_date : &ephemer_osd_date;
+ int64_t *pi_ephemer_order = p_current->b_subtitle ? &i_ephemer_subtitle_order : &i_ephemer_system_order;
+ if( p_current->i_start >= *pi_ephemer_date )
{
- p_spu->p_subpicture[i_index].p_next = p_ephemer;
- p_ephemer = &p_spu->p_subpicture[i_index];
-
- continue;
+ *pi_ephemer_date = p_current->i_start;
+ if( p_current->i_order > *pi_ephemer_order )
+ *pi_ephemer_order = p_current->i_order;
}
- p_spu->p_subpicture[i_index].p_next = p_subpic;
- p_subpic = &p_spu->p_subpicture[i_index];
+ b_stop_valid = !p_current->b_ephemer || p_current->i_stop > p_current->i_start;
+
+ b_late = b_stop_valid && p_current->i_stop <= render_date;
+
+ /* start_date will be used for correct automatic overlap support
+ * in case picture that should not be displayed anymore (display_time)
+ * overlap with a picture to be displayed (p_current->i_start) */
+ if( p_current->b_subtitle && !b_late && !p_current->b_ephemer )
+ start_date = p_current->i_start;
+
+ /* */
+ p_available_subpic[i_available] = p_current;
+ pb_available_late[i_available] = b_late;
+ i_available++;
}
- /* If we found ephemer subpictures, check if they have to be
- * displayed or destroyed */
- while( p_ephemer != NULL )
+ /* Only forced old picture display at the transition */
+ if( start_date < p_sys->i_last_sort_date )
+ start_date = p_sys->i_last_sort_date;
+ if( start_date <= 0 )
+ start_date = INT64_MAX;
+
+ /* Select pictures to be displayed */
+ for( i_index = 0; i_index < i_available; i_index++ )
{
- subpicture_t *p_tmp = p_ephemer;
- p_ephemer = p_ephemer->p_next;
+ subpicture_t *p_current = p_available_subpic[i_index];
+ bool b_late = pb_available_late[i_index];
+
+ const mtime_t stop_date = p_current->b_subtitle ? __MAX( start_date, p_sys->i_last_sort_date ) : render_osd_date;
+ const mtime_t ephemer_date = p_current->b_subtitle ? ephemer_subtitle_date : ephemer_osd_date;
+ const int64_t i_ephemer_order = p_current->b_subtitle ? i_ephemer_subtitle_order : i_ephemer_system_order;
- if( p_tmp->i_start < ephemer_date )
+ /* Destroy late and obsolete ephemer subpictures */
+ bool b_rejet = b_late && p_current->i_stop <= stop_date;
+ if( p_current->b_ephemer )
{
- /* Ephemer subpicture has lived too long */
- spu_DestroySubpicture( p_spu, p_tmp );
+ if( p_current->i_start < ephemer_date )
+ b_rejet = true;
+ else if( p_current->i_start == ephemer_date &&
+ p_current->i_order < i_ephemer_order )
+ b_rejet = true;
}
+
+ if( b_rejet )
+ SpuHeapDeleteSubpicture( &p_sys->heap, p_current );
else
- {
- /* Ephemer subpicture can still live a bit */
- p_tmp->p_next = p_subpic;
- p_subpic = p_tmp;
- }
+ SubpictureChain( &p_subpic, p_current );
}
}
+ p_sys->i_last_sort_date = render_subtitle_date;
+ vlc_mutex_unlock( &p_sys->lock );
+
return p_subpic;
}
-/*****************************************************************************
- * SpuClearChannel: clear an spu channel
- *****************************************************************************
- * This function destroys the subpictures which belong to the spu channel
- * corresponding to i_channel_id.
+void spu_OffsetSubtitleDate( spu_t *p_spu, mtime_t i_duration )
+{
+ spu_private_t *p_sys = p_spu->p;
+
+ vlc_mutex_lock( &p_sys->lock );
+ for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
+ {
+ spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i];
+ subpicture_t *p_current = p_entry->p_subpicture;
+
+ if( p_current && p_current->b_subtitle )
+ {
+ if( p_current->i_start > 0 )
+ p_current->i_start += i_duration;
+ if( p_current->i_stop > 0 )
+ p_current->i_stop += i_duration;
+ }
+ }
+ vlc_mutex_unlock( &p_sys->lock );
+}
+
+int spu_RegisterChannel( spu_t *p_spu )
+{
+ spu_private_t *p_sys = p_spu->p;
+
+ vlc_mutex_lock( &p_sys->lock );
+ int i_channel = p_sys->i_channel++;
+ vlc_mutex_unlock( &p_sys->lock );
+
+ return i_channel;
+}
+
+void spu_ClearChannel( spu_t *p_spu, int i_channel )
+{
+ spu_private_t *p_sys = p_spu->p;
+
+ vlc_mutex_lock( &p_sys->lock );
+
+ for( int i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
+ {
+ spu_heap_entry_t *p_entry = &p_sys->heap.p_entry[i_subpic];
+ subpicture_t *p_subpic = p_entry->p_subpicture;
+
+ if( !p_subpic )
+ continue;
+ if( p_subpic->i_channel != i_channel && ( i_channel != -1 || p_subpic->i_channel == SPU_DEFAULT_CHANNEL ) )
+ continue;
+
+ /* You cannot delete subpicture outside of spu_SortSubpictures */
+ p_entry->b_reject = true;
+ }
+
+ vlc_mutex_unlock( &p_sys->lock );
+}
+
+void spu_ChangeFilters( spu_t *p_spu, const char *psz_filters )
+{
+ spu_private_t *p_sys = p_spu->p;
+
+ vlc_mutex_lock( &p_sys->lock );
+
+ free( p_sys->psz_chain_update );
+ p_sys->psz_chain_update = strdup( psz_filters );
+
+ vlc_mutex_unlock( &p_sys->lock );
+}
+
+void spu_ChangeMargin( spu_t *p_spu, int i_margin )
+{
+ spu_private_t *p_sys = p_spu->p;
+
+ 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;
+}
+
+/*****************************************************************************
+ * heap managment
*****************************************************************************/
-static void SpuClearChannel( spu_t *p_spu, int i_channel )
+static void SpuHeapInit( spu_heap_t *p_heap )
+{
+ for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
+ {
+ spu_heap_entry_t *e = &p_heap->p_entry[i];
+
+ e->p_subpicture = NULL;
+ e->b_reject = false;
+ }
+}
+
+static int SpuHeapPush( spu_heap_t *p_heap, subpicture_t *p_subpic )
{
- int i_subpic; /* subpicture index */
- subpicture_t *p_subpic = NULL; /* first free subpicture */
+ for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
+ {
+ spu_heap_entry_t *e = &p_heap->p_entry[i];
- vlc_mutex_lock( &p_spu->subpicture_lock );
+ if( e->p_subpicture )
+ continue;
+
+ e->p_subpicture = p_subpic;
+ e->b_reject = false;
+ return VLC_SUCCESS;
+ }
+ return VLC_EGENERIC;
+}
- for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
+static void SpuHeapDeleteAt( spu_heap_t *p_heap, int i_index )
+{
+ spu_heap_entry_t *e = &p_heap->p_entry[i_index];
+
+ if( e->p_subpicture )
+ subpicture_Delete( e->p_subpicture );
+
+ e->p_subpicture = NULL;
+}
+
+static int SpuHeapDeleteSubpicture( spu_heap_t *p_heap, subpicture_t *p_subpic )
+{
+ for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
{
- p_subpic = &p_spu->p_subpicture[i_subpic];
- if( p_subpic->i_status == FREE_SUBPICTURE
- || ( p_subpic->i_status != RESERVED_SUBPICTURE
- && p_subpic->i_status != READY_SUBPICTURE ) )
- {
+ spu_heap_entry_t *e = &p_heap->p_entry[i];
+
+ if( e->p_subpicture != p_subpic )
continue;
- }
- if( p_subpic->i_channel == i_channel )
+ SpuHeapDeleteAt( p_heap, i );
+ return VLC_SUCCESS;
+ }
+ return VLC_EGENERIC;
+}
+
+static void SpuHeapClean( spu_heap_t *p_heap )
+{
+ for( int i = 0; i < VOUT_MAX_SUBPICTURES; i++ )
+ {
+ spu_heap_entry_t *e = &p_heap->p_entry[i];
+ if( e->p_subpicture )
+ subpicture_Delete( e->p_subpicture );
+ }
+}
+
+static void FilterRelease( filter_t *p_filter )
+{
+ if( p_filter->p_module )
+ module_unneed( p_filter, p_filter->p_module );
+ if( p_filter->p_owner )
+ free( p_filter->p_owner );
+
+ vlc_object_release( p_filter );
+}
+
+static void SpuRenderCreateAndLoadText( spu_t *p_spu )
+{
+ filter_t *p_text;
+
+ assert( !p_spu->p->p_text );
+
+ p_spu->p->p_text =
+ p_text = vlc_custom_create( p_spu, sizeof(filter_t),
+ VLC_OBJECT_GENERIC, "spu text" );
+ if( !p_text )
+ return;
+
+ p_text->p_owner = xmalloc( sizeof(*p_text->p_owner) );
+ p_text->p_owner->p_spu = p_spu;
+
+ es_format_Init( &p_text->fmt_in, VIDEO_ES, 0 );
+
+ es_format_Init( &p_text->fmt_out, VIDEO_ES, 0 );
+ p_text->fmt_out.video.i_width =
+ p_text->fmt_out.video.i_visible_width = 32;
+ p_text->fmt_out.video.i_height =
+ p_text->fmt_out.video.i_visible_height = 32;
+
+ p_text->pf_get_attachments = spu_get_attachments;
+
+ vlc_object_attach( p_text, p_spu );
+
+ /* FIXME TOCHECK shouldn't module_need( , , psz_modulename, false ) do the
+ * same than these 2 calls ? */
+ char *psz_modulename = var_CreateGetString( p_spu, "text-renderer" );
+ if( psz_modulename && *psz_modulename )
+ {
+ p_text->p_module = module_need( p_text, "text renderer",
+ psz_modulename, true );
+ }
+ free( psz_modulename );
+
+ if( !p_text->p_module )
+ p_text->p_module = module_need( p_text, "text renderer", NULL, false );
+
+ /* Create a few variables used for enhanced text rendering */
+ var_Create( p_text, "spu-duration", VLC_VAR_TIME );
+ var_Create( p_text, "spu-elapsed", VLC_VAR_TIME );
+ var_Create( p_text, "text-rerender", VLC_VAR_BOOL );
+ var_Create( p_text, "scale", VLC_VAR_INTEGER );
+}
+
+static filter_t *CreateAndLoadScale( vlc_object_t *p_obj,
+ vlc_fourcc_t i_src_chroma, vlc_fourcc_t i_dst_chroma,
+ bool b_resize )
+{
+ filter_t *p_scale;
+
+ p_scale = vlc_custom_create( p_obj, sizeof(filter_t),
+ VLC_OBJECT_GENERIC, "scale" );
+ if( !p_scale )
+ return NULL;
+
+ es_format_Init( &p_scale->fmt_in, VIDEO_ES, 0 );
+ p_scale->fmt_in.video.i_chroma = i_src_chroma;
+ p_scale->fmt_in.video.i_width =
+ p_scale->fmt_in.video.i_height = 32;
+
+ es_format_Init( &p_scale->fmt_out, VIDEO_ES, 0 );
+ p_scale->fmt_out.video.i_chroma = i_dst_chroma;
+ p_scale->fmt_out.video.i_width =
+ p_scale->fmt_out.video.i_height = b_resize ? 16 : 32;
+
+ p_scale->pf_video_buffer_new = spu_new_video_buffer;
+ p_scale->pf_video_buffer_del = spu_del_video_buffer;
+
+ vlc_object_attach( p_scale, p_obj );
+ p_scale->p_module = module_need( p_scale, "video filter2", NULL, false );
+
+ return p_scale;
+}
+static void SpuRenderCreateAndLoadScale( spu_t *p_spu )
+{
+ assert( !p_spu->p->p_scale );
+ assert( !p_spu->p->p_scale_yuvp );
+ /* XXX p_spu->p_scale is used for all conversion/scaling except yuvp to
+ * yuva/rgba */
+ p_spu->p->p_scale = CreateAndLoadScale( VLC_OBJECT(p_spu),
+ VLC_CODEC_YUVA, VLC_CODEC_YUVA, true );
+ /* This one is used for YUVP to YUVA/RGBA without scaling
+ * FIXME rename it */
+ p_spu->p->p_scale_yuvp = CreateAndLoadScale( VLC_OBJECT(p_spu),
+ VLC_CODEC_YUVP, VLC_CODEC_YUVA, false );
+}
+
+static void SpuRenderText( spu_t *p_spu, bool *pb_rerender_text,
+ subpicture_t *p_subpic, subpicture_region_t *p_region,
+ int i_min_scale_ratio, mtime_t render_date )
+{
+ filter_t *p_text = p_spu->p->p_text;
+
+ assert( p_region->fmt.i_chroma == VLC_CODEC_TEXT );
+
+ if( !p_text || !p_text->p_module )
+ goto exit;
+
+ /* 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_SetTime( p_text, "spu-duration", p_subpic->i_stop - p_subpic->i_start );
+ var_SetTime( p_text, "spu-elapsed", render_date );
+ var_SetBool( p_text, "text-rerender", false );
+ var_SetInteger( p_text, "scale", i_min_scale_ratio );
+
+ if( p_text->pf_render_html && p_region->psz_html )
+ {
+ p_text->pf_render_html( p_text, p_region, p_region );
+ }
+ else if( p_text->pf_render_text )
+ {
+ p_text->pf_render_text( p_text, p_region, p_region );
+ }
+ *pb_rerender_text = var_GetBool( p_text, "text-rerender" );
+
+exit:
+ p_region->i_align |= SUBPICTURE_RENDERED;
+}
+
+/**
+ * A few scale functions helpers.
+ */
+static spu_scale_t spu_scale_create( int w, int h )
+{
+ spu_scale_t s = { .w = w, .h = h };
+ if( s.w <= 0 )
+ s.w = SCALE_UNIT;
+ if( s.h <= 0 )
+ s.h = SCALE_UNIT;
+ return s;
+}
+static spu_scale_t spu_scale_unit( void )
+{
+ return spu_scale_create( SCALE_UNIT, SCALE_UNIT );
+}
+static spu_scale_t spu_scale_createq( int wn, int wd, int hn, int hd )
+{
+ return spu_scale_create( wn * SCALE_UNIT / wd,
+ hn * SCALE_UNIT / hd );
+}
+static int spu_scale_w( int v, const spu_scale_t s )
+{
+ return v * s.w / SCALE_UNIT;
+}
+static int spu_scale_h( int v, const spu_scale_t s )
+{
+ return v * s.h / SCALE_UNIT;
+}
+static int spu_invscale_w( int v, const spu_scale_t s )
+{
+ return v * SCALE_UNIT / s.w;
+}
+static int spu_invscale_h( int v, const spu_scale_t s )
+{
+ return v * SCALE_UNIT / s.h;
+}
+
+/**
+ * A few area functions helpers
+ */
+static spu_area_t spu_area_create( int x, int y, int w, int h, spu_scale_t s )
+{
+ spu_area_t a = { .i_x = x, .i_y = y, .i_width = w, .i_height = h, .scale = s };
+ return a;
+}
+static spu_area_t spu_area_scaled( spu_area_t a )
+{
+ if( a.scale.w == SCALE_UNIT && a.scale.h == SCALE_UNIT )
+ return a;
+
+ a.i_x = spu_scale_w( a.i_x, a.scale );
+ a.i_y = spu_scale_h( a.i_y, a.scale );
+
+ a.i_width = spu_scale_w( a.i_width, a.scale );
+ a.i_height = spu_scale_h( a.i_height, a.scale );
+
+ a.scale = spu_scale_unit();
+ return a;
+}
+static spu_area_t spu_area_unscaled( spu_area_t a, spu_scale_t s )
+{
+ if( a.scale.w == s.w && a.scale.h == s.h )
+ return a;
+
+ a = spu_area_scaled( a );
+
+ a.i_x = spu_invscale_w( a.i_x, s );
+ a.i_y = spu_invscale_h( a.i_y, s );
+
+ a.i_width = spu_invscale_w( a.i_width, s );
+ a.i_height = spu_invscale_h( a.i_height, s );
+
+ a.scale = s;
+ return a;
+}
+static bool spu_area_overlap( spu_area_t a, spu_area_t b )
+{
+ const int i_dx = 0;
+ const int i_dy = 0;
+
+ a = spu_area_scaled( a );
+ b = spu_area_scaled( b );
+
+ return __MAX( a.i_x-i_dx, b.i_x ) < __MIN( a.i_x+a.i_width +i_dx, b.i_x+b.i_width ) &&
+ __MAX( a.i_y-i_dy, b.i_y ) < __MIN( a.i_y+a.i_height+i_dy, b.i_y+b.i_height );
+}
+
+/**
+ * Avoid area overlapping
+ */
+static void SpuAreaFixOverlap( spu_area_t *p_dst,
+ const spu_area_t *p_sub, int i_sub, int i_align )
+{
+ spu_area_t a = spu_area_scaled( *p_dst );
+ bool b_moved = false;
+ bool b_ok;
+
+ /* Check for overlap
+ * XXX It is not fast O(n^2) but we should not have a lot of region */
+ do
+ {
+ b_ok = true;
+ for( int i = 0; i < i_sub; i++ )
{
- while( p_subpic->p_region )
+ spu_area_t sub = spu_area_scaled( p_sub[i] );
+
+ if( !spu_area_overlap( a, sub ) )
+ continue;
+
+ if( i_align & SUBPICTURE_ALIGN_TOP )
+ {
+ /* We go down */
+ int i_y = sub.i_y + sub.i_height;
+ a.i_y = i_y;
+ b_moved = true;
+ }
+ else if( i_align & SUBPICTURE_ALIGN_BOTTOM )
+ {
+ /* We go up */
+ int i_y = sub.i_y - a.i_height;
+ a.i_y = i_y;
+ b_moved = true;
+ }
+ else
{
- subpicture_region_t *p_region = p_subpic->p_region;
- p_subpic->p_region = p_region->p_next;
- spu_DestroyRegion( p_spu, p_region );
+ /* TODO what to do in this case? */
+ //fprintf( stderr, "Overlap with unsupported alignment\n" );
+ break;
}
- if( p_subpic->pf_destroy ) p_subpic->pf_destroy( p_subpic );
- p_subpic->i_status = FREE_SUBPICTURE;
+ b_ok = false;
+ break;
}
+ } while( !b_ok );
+
+ if( b_moved )
+ *p_dst = spu_area_unscaled( a, p_dst->scale );
+}
+
+
+static void SpuAreaFitInside( spu_area_t *p_area, const spu_area_t *p_boundary )
+{
+ spu_area_t a = spu_area_scaled( *p_area );
+
+ const int i_error_x = (a.i_x + a.i_width) - p_boundary->i_width;
+ if( i_error_x > 0 )
+ a.i_x -= i_error_x;
+ if( a.i_x < 0 )
+ a.i_x = 0;
+
+ const int i_error_y = (a.i_y + a.i_height) - p_boundary->i_height;
+ if( i_error_y > 0 )
+ a.i_y -= i_error_y;
+ if( a.i_y < 0 )
+ a.i_y = 0;
+
+ *p_area = spu_area_unscaled( a, p_area->scale );
+}
+
+/**
+ * Place a region
+ */
+static void SpuRegionPlace( int *pi_x, int *pi_y,
+ const subpicture_t *p_subpic,
+ const subpicture_region_t *p_region )
+{
+ const int i_delta_x = p_region->i_x;
+ const int i_delta_y = p_region->i_y;
+ int i_x, i_y;
+
+ assert( p_region->i_x != INT_MAX && p_region->i_y != INT_MAX );
+ if( p_region->i_align & SUBPICTURE_ALIGN_TOP )
+ {
+ i_y = i_delta_y;
+ }
+ else if( p_region->i_align & SUBPICTURE_ALIGN_BOTTOM )
+ {
+ i_y = p_subpic->i_original_picture_height - p_region->fmt.i_height - i_delta_y;
+ }
+ else
+ {
+ i_y = p_subpic->i_original_picture_height / 2 - p_region->fmt.i_height / 2;
+ }
+
+ if( p_region->i_align & SUBPICTURE_ALIGN_LEFT )
+ {
+ i_x = i_delta_x;
+ }
+ else if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT )
+ {
+ i_x = p_subpic->i_original_picture_width - p_region->fmt.i_width - i_delta_x;
+ }
+ else
+ {
+ i_x = p_subpic->i_original_picture_width / 2 - p_region->fmt.i_width / 2;
}
- vlc_mutex_unlock( &p_spu->subpicture_lock );
+ if( p_subpic->b_absolute )
+ {
+ i_x = i_delta_x;
+ i_y = i_delta_y;
+ }
+
+ *pi_x = i_x;
+ *pi_y = i_y;
}
-/*****************************************************************************
- * spu_ControlDefault: default methods for the subpicture unit control.
- *****************************************************************************/
-static int spu_vaControlDefault( spu_t *p_spu, int i_query, va_list args )
+/**
+ * This function computes the current alpha value for a given region.
+ */
+static int SpuRegionAlpha( subpicture_t *p_subpic, subpicture_region_t *p_region )
{
- int *pi, i;
+ /* Compute alpha blend value */
+ int i_fade_alpha = 255;
+ if( p_subpic->b_fade )
+ {
+ mtime_t i_fade_start = ( p_subpic->i_stop +
+ p_subpic->i_start ) / 2;
+ mtime_t i_now = mdate();
+
+ if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start )
+ {
+ i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) /
+ ( p_subpic->i_stop - i_fade_start );
+ }
+ }
+ return i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025;
+}
- switch( i_query )
+/**
+ * It will render the provided region onto p_pic_dst.
+ */
+
+static void SpuRenderRegion( spu_t *p_spu,
+ picture_t *p_pic_dst, spu_area_t *p_area,
+ subpicture_t *p_subpic, subpicture_region_t *p_region,
+ const spu_scale_t scale_size,
+ const video_format_t *p_fmt,
+ const spu_area_t *p_subtitle_area, int i_subtitle_area,
+ mtime_t render_date )
+{
+ spu_private_t *p_sys = p_spu->p;
+
+ video_format_t fmt_original = p_region->fmt;
+ bool b_rerender_text = false;
+ bool b_restore_format = false;
+ int i_x_offset;
+ int i_y_offset;
+
+ video_format_t region_fmt;
+ picture_t *p_region_picture;
+
+ /* Invalidate area by default */
+ *p_area = spu_area_create( 0,0, 0,0, scale_size );
+
+ /* Render text region */
+ if( p_region->fmt.i_chroma == VLC_CODEC_TEXT )
{
- case SPU_CHANNEL_REGISTER:
- pi = (int *)va_arg( args, int * );
- if( pi ) *pi = p_spu->i_channel++;
- break;
-
- case SPU_CHANNEL_CLEAR:
- i = (int)va_arg( args, int );
- SpuClearChannel( p_spu, i );
- break;
-
- default:
- msg_Dbg( p_spu, "control query not supported" );
- return VLC_EGENERIC;
+ const int i_min_scale_ratio = SCALE_UNIT; /* FIXME what is the right value? (scale_size is not) */
+ SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region,
+ i_min_scale_ratio, render_date );
+ b_restore_format = b_rerender_text;
+
+ /* Check if the rendering has failed ... */
+ if( p_region->fmt.i_chroma == VLC_CODEC_TEXT )
+ goto exit;
}
- return VLC_SUCCESS;
+ /* Force palette if requested
+ * FIXME b_force_palette and b_force_crop are applied to all subpictures using palette
+ * instead of only the right one (being the dvd spu).
+ */
+ const bool b_using_palette = p_region->fmt.i_chroma == VLC_CODEC_YUVP;
+ const bool b_force_palette = b_using_palette && p_sys->b_force_palette;
+ const bool b_force_crop = b_force_palette && p_sys->b_force_crop;
+ bool b_changed_palette = false;
+
+
+ /* Compute the margin which is expressed in destination pixel unit
+ * The margin is applied only to subtitle and when no forced crop is
+ * requested (dvd menu) */
+ int i_margin_y = 0;
+ if( !b_force_crop && p_subpic->b_subtitle )
+ i_margin_y = spu_invscale_h( p_sys->i_margin, scale_size );
+
+ /* Place the picture
+ * We compute the position in the rendered size */
+ SpuRegionPlace( &i_x_offset, &i_y_offset,
+ p_subpic, p_region );
+
+ /* Save this position for subtitle overlap support
+ * it is really important that there are given without scale_size applied */
+ *p_area = spu_area_create( i_x_offset, i_y_offset,
+ p_region->fmt.i_width, p_region->fmt.i_height,
+ scale_size );
+
+ /* Handle overlapping subtitles when possible */
+ if( p_subpic->b_subtitle && !p_subpic->b_absolute )
+ {
+ SpuAreaFixOverlap( p_area, p_subtitle_area, i_subtitle_area,
+ p_region->i_align );
+ }
+
+ /* we copy the area: for the subtitle overlap support we want
+ * to only save the area without margin applied */
+ spu_area_t restrained = *p_area;
+
+ /* apply margin to subtitles and correct if they go over the picture edge */
+ if( p_subpic->b_subtitle )
+ restrained.i_y -= i_margin_y;
+
+ spu_area_t display = spu_area_create( 0, 0, p_fmt->i_width, p_fmt->i_height,
+ spu_scale_unit() );
+ SpuAreaFitInside( &restrained, &display );
+
+ /* Fix the position for the current scale_size */
+ i_x_offset = spu_scale_w( restrained.i_x, restrained.scale );
+ i_y_offset = spu_scale_h( restrained.i_y, restrained.scale );
+
+ /* */
+ if( b_force_palette )
+ {
+ video_palette_t *p_palette = p_region->fmt.p_palette;
+ video_palette_t palette;
+
+ /* We suppose DVD palette here */
+ palette.i_entries = 4;
+ for( int i = 0; i < 4; i++ )
+ for( int j = 0; j < 4; j++ )
+ palette.palette[i][j] = p_sys->palette[i][j];
+
+ if( p_palette->i_entries == palette.i_entries )
+ {
+ for( int i = 0; i < p_palette->i_entries; i++ )
+ for( int j = 0; j < 4; j++ )
+ b_changed_palette |= p_palette->palette[i][j] != palette.palette[i][j];
+ }
+ else
+ {
+ b_changed_palette = true;
+ }
+ *p_palette = palette;
+ }
+
+ /* */
+ region_fmt = p_region->fmt;
+ p_region_picture = p_region->p_picture;
+
+
+ /* Scale from rendered size to destination size */
+ if( p_sys->p_scale && p_sys->p_scale->p_module &&
+ ( !b_using_palette || ( p_sys->p_scale_yuvp && p_sys->p_scale_yuvp->p_module ) ) &&
+ ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_using_palette ) )
+ {
+ const unsigned i_dst_width = spu_scale_w( p_region->fmt.i_width, scale_size );
+ const unsigned i_dst_height = spu_scale_h( p_region->fmt.i_height, scale_size );
+
+ /* Destroy the cache if unusable */
+ if( p_region->p_private )
+ {
+ subpicture_region_private_t *p_private = p_region->p_private;
+ bool b_changed = false;
+
+ /* Check resize changes */
+ if( i_dst_width != p_private->fmt.i_width ||
+ i_dst_height != p_private->fmt.i_height )
+ b_changed = true;
+
+ /* Check forced palette changes */
+ if( b_changed_palette )
+ b_changed = true;
+
+ if( b_changed )
+ {
+ subpicture_region_private_Delete( p_private );
+ p_region->p_private = NULL;
+ }
+ }
+
+ /* Scale if needed into cache */
+ if( !p_region->p_private && i_dst_width > 0 && i_dst_height > 0 )
+ {
+ filter_t *p_scale = p_sys->p_scale;
+
+ picture_t *p_picture = p_region->p_picture;
+ picture_Hold( p_picture );
+
+ /* Convert YUVP to YUVA/RGBA first for better scaling quality */
+ if( b_using_palette )
+ {
+ filter_t *p_scale_yuvp = p_sys->p_scale_yuvp;
+
+ p_scale_yuvp->fmt_in.video = p_region->fmt;
+
+ /* TODO converting to RGBA for RGB video output is better */
+ p_scale_yuvp->fmt_out.video = p_region->fmt;
+ p_scale_yuvp->fmt_out.video.i_chroma = VLC_CODEC_YUVA;
+
+ p_picture = p_scale_yuvp->pf_video_filter( p_scale_yuvp, p_picture );
+ if( !p_picture )
+ {
+ /* Well we will try conversion+scaling */
+ msg_Warn( p_spu, "%4.4s to %4.4s conversion failed",
+ (const char*)&p_scale_yuvp->fmt_in.video.i_chroma,
+ (const char*)&p_scale_yuvp->fmt_out.video.i_chroma );
+ }
+ }
+
+ /* Conversion(except from YUVP)/Scaling */
+ if( p_picture &&
+ ( p_picture->format.i_width != i_dst_width ||
+ p_picture->format.i_height != i_dst_height ) )
+ {
+ p_scale->fmt_in.video = p_picture->format;
+ p_scale->fmt_out.video = p_picture->format;
+
+ p_scale->fmt_out.video.i_width = i_dst_width;
+ p_scale->fmt_out.video.i_height = i_dst_height;
+
+ p_scale->fmt_out.video.i_visible_width =
+ spu_scale_w( p_region->fmt.i_visible_width, scale_size );
+ p_scale->fmt_out.video.i_visible_height =
+ spu_scale_h( p_region->fmt.i_visible_height, scale_size );
+
+ p_picture = p_scale->pf_video_filter( p_scale, p_picture );
+ if( !p_picture )
+ msg_Err( p_spu, "scaling failed" );
+ }
+
+ /* */
+ if( p_picture )
+ {
+ 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 )
+ {
+ subpicture_region_private_Delete( p_region->p_private );
+ p_region->p_private = NULL;
+ }
+ }
+ else
+ {
+ picture_Release( p_picture );
+ }
+ }
+ }
+
+ /* And use the scaled picture */
+ if( p_region->p_private )
+ {
+ region_fmt = p_region->p_private->fmt;
+ p_region_picture = p_region->p_private->p_picture;
+ }
+ }
+
+ /* Force cropping if requested */
+ if( b_force_crop )
+ {
+ int i_crop_x = spu_scale_w( p_sys->i_crop_x, scale_size );
+ int i_crop_y = spu_scale_h( p_sys->i_crop_y, scale_size );
+ int i_crop_width = spu_scale_w( p_sys->i_crop_width, scale_size );
+ int i_crop_height= spu_scale_h( p_sys->i_crop_height,scale_size );
+
+ /* Find the intersection */
+ if( i_crop_x + i_crop_width <= i_x_offset ||
+ i_x_offset + (int)region_fmt.i_visible_width < i_crop_x ||
+ i_crop_y + i_crop_height <= i_y_offset ||
+ i_y_offset + (int)region_fmt.i_visible_height < i_crop_y )
+ {
+ /* No intersection */
+ region_fmt.i_visible_width =
+ region_fmt.i_visible_height = 0;
+ }
+ else
+ {
+ int i_x, i_y, i_x_end, i_y_end;
+ i_x = __MAX( i_crop_x, i_x_offset );
+ i_y = __MAX( i_crop_y, i_y_offset );
+ i_x_end = __MIN( i_crop_x + i_crop_width,
+ i_x_offset + (int)region_fmt.i_visible_width );
+ i_y_end = __MIN( i_crop_y + i_crop_height,
+ i_y_offset + (int)region_fmt.i_visible_height );
+
+ region_fmt.i_x_offset = i_x - i_x_offset;
+ region_fmt.i_y_offset = i_y - i_y_offset;
+ region_fmt.i_visible_width = i_x_end - i_x;
+ region_fmt.i_visible_height = i_y_end - i_y;
+
+ i_x_offset = __MAX( i_x, 0 );
+ i_y_offset = __MAX( i_y, 0 );
+ }
+ }
+
+ /* Update the blender */
+ if( filter_ConfigureBlend( p_spu->p->p_blend,
+ p_fmt->i_width, p_fmt->i_height,
+ ®ion_fmt ) ||
+ filter_Blend( p_spu->p->p_blend,
+ p_pic_dst, i_x_offset, i_y_offset,
+ p_region_picture, SpuRegionAlpha( p_subpic, p_region ) ) )
+ {
+ msg_Err( p_spu, "blending %4.4s to %4.4s failed",
+ (char *)&p_sys->p_blend->fmt_in.video.i_chroma,
+ (char *)&p_sys->p_blend->fmt_out.video.i_chroma );
+ }
+
+exit:
+ 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.
+ */
+ if( p_region->p_picture )
+ {
+ picture_Release( p_region->p_picture );
+ p_region->p_picture = NULL;
+ }
+ if( p_region->p_private )
+ {
+ subpicture_region_private_Delete( p_region->p_private );
+ p_region->p_private = NULL;
+ }
+ p_region->i_align &= ~SUBPICTURE_RENDERED;
+ }
+ if( b_restore_format )
+ p_region->fmt = fmt_original;
+}
+
+/**
+ * This function compares two 64 bits integers.
+ * It can be used by qsort.
+ */
+static int IntegerCmp( int64_t i0, int64_t i1 )
+{
+ return i0 < i1 ? -1 : i0 > i1 ? 1 : 0;
+}
+/**
+ * This function compares 2 subpictures using the following properties
+ * (ordered by priority)
+ * 1. absolute positionning
+ * 2. start time
+ * 3. creation order (per channel)
+ *
+ * It can be used by qsort.
+ *
+ * XXX spu_RenderSubpictures depends heavily on this order.
+ */
+static int SubpictureCmp( const void *s0, const void *s1 )
+{
+ subpicture_t *p_subpic0 = *(subpicture_t**)s0;
+ subpicture_t *p_subpic1 = *(subpicture_t**)s1;
+ int r;
+
+ r = IntegerCmp( !p_subpic0->b_absolute, !p_subpic1->b_absolute );
+ if( !r )
+ r = IntegerCmp( p_subpic0->i_start, p_subpic1->i_start );
+ if( !r )
+ r = IntegerCmp( p_subpic0->i_channel, p_subpic1->i_channel );
+ if( !r )
+ r = IntegerCmp( p_subpic0->i_order, p_subpic1->i_order );
+ return r;
}
/*****************************************************************************
*****************************************************************************/
static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object )
{
+ spu_private_t *p_sys = p_spu->p;
vlc_value_t val;
- p_spu->b_force_palette = VLC_FALSE;
- p_spu->b_force_crop = VLC_FALSE;
+ vlc_mutex_lock( &p_sys->lock );
- if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) return;
+ p_sys->b_force_palette = false;
+ p_sys->b_force_crop = false;
- p_spu->b_force_crop = VLC_TRUE;
- var_Get( p_object, "x-start", &val );
- p_spu->i_crop_x = val.i_int;
- var_Get( p_object, "y-start", &val );
- p_spu->i_crop_y = val.i_int;
- var_Get( p_object, "x-end", &val );
- p_spu->i_crop_width = val.i_int - p_spu->i_crop_x;
- var_Get( p_object, "y-end", &val );
- p_spu->i_crop_height = val.i_int - p_spu->i_crop_y;
+ if( var_Get( p_object, "highlight", &val ) || !val.b_bool )
+ {
+ vlc_mutex_unlock( &p_sys->lock );
+ return;
+ }
+
+ p_sys->b_force_crop = true;
+ p_sys->i_crop_x = var_GetInteger( p_object, "x-start" );
+ p_sys->i_crop_y = var_GetInteger( p_object, "y-start" );
+ p_sys->i_crop_width = var_GetInteger( p_object, "x-end" ) - p_sys->i_crop_x;
+ p_sys->i_crop_height = var_GetInteger( p_object, "y-end" ) - p_sys->i_crop_y;
if( var_Get( p_object, "menu-palette", &val ) == VLC_SUCCESS )
{
- memcpy( p_spu->palette, val.p_address, 16 );
- p_spu->b_force_palette = VLC_TRUE;
+ memcpy( p_sys->palette, val.p_address, 16 );
+ p_sys->b_force_palette = true;
}
+ vlc_mutex_unlock( &p_sys->lock );
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_palette );
+ p_sys->i_crop_x, p_sys->i_crop_y,
+ p_sys->i_crop_width, p_sys->i_crop_height,
+ p_sys->b_force_palette );
}
/*****************************************************************************
static int CropCallback( vlc_object_t *p_object, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(oldval); VLC_UNUSED(newval); VLC_UNUSED(psz_var);
+
UpdateSPU( (spu_t *)p_data, p_object );
return VLC_SUCCESS;
}
/*****************************************************************************
* Buffers allocation callbacks for the filters
*****************************************************************************/
+static int spu_get_attachments( filter_t *p_filter,
+ input_attachment_t ***ppp_attachment,
+ int *pi_attachment )
+{
+ spu_t *p_spu = p_filter->p_owner->p_spu;
+
+ int i_ret = VLC_EGENERIC;
+ if( p_spu->p->p_input )
+ i_ret = input_Control( (input_thread_t*)p_spu->p->p_input,
+ INPUT_GET_ATTACHMENTS,
+ ppp_attachment, pi_attachment );
+ return i_ret;
+}
+
static subpicture_t *sub_new_buffer( filter_t *p_filter )
{
filter_owner_sys_t *p_sys = p_filter->p_owner;
- subpicture_t *p_subpicture = spu_CreateSubpicture( p_sys->p_spu );
- if( p_subpicture ) p_subpicture->i_channel = p_sys->i_channel;
+
+ subpicture_t *p_subpicture = subpicture_New( NULL );
+ if( p_subpicture )
+ p_subpicture->i_channel = p_sys->i_channel;
return p_subpicture;
}
-
static void sub_del_buffer( filter_t *p_filter, subpicture_t *p_subpic )
{
- filter_owner_sys_t *p_sys = p_filter->p_owner;
- spu_DestroySubpicture( p_sys->p_spu, p_subpic );
+ VLC_UNUSED( p_filter );
+ subpicture_Delete( p_subpic );
}
-
-static subpicture_t *spu_new_buffer( filter_t *p_filter )
+static picture_t *spu_new_video_buffer( filter_t *p_filter )
{
- subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t));
- memset( p_subpic, 0, sizeof(subpicture_t) );
- p_subpic->b_absolute = VLC_TRUE;
+ const video_format_t *p_fmt = &p_filter->fmt_out.video;
- p_subpic->pf_create_region = __spu_CreateRegion;
- p_subpic->pf_make_region = __spu_MakeRegion;
- p_subpic->pf_destroy_region = __spu_DestroyRegion;
-
- return p_subpic;
+ VLC_UNUSED(p_filter);
+ return picture_NewFromFormat( p_fmt );
}
-
-static void spu_del_buffer( filter_t *p_filter, subpicture_t *p_subpic )
+static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_picture )
{
- while( p_subpic->p_region )
- {
- subpicture_region_t *p_region = p_subpic->p_region;
- p_subpic->p_region = p_region->p_next;
- p_subpic->pf_destroy_region( VLC_OBJECT(p_filter), p_region );
- }
-
- free( p_subpic );
+ VLC_UNUSED(p_filter);
+ picture_Release( p_picture );
}
-static picture_t *spu_new_video_buffer( filter_t *p_filter )
+static int SubFilterAllocationInit( filter_t *p_filter, void *p_data )
{
- picture_t *p_picture = malloc( sizeof(picture_t) );
-
- if( vout_AllocatePicture( p_filter, p_picture,
- p_filter->fmt_out.video.i_chroma,
- p_filter->fmt_out.video.i_width,
- p_filter->fmt_out.video.i_height,
- p_filter->fmt_out.video.i_aspect )
- != VLC_SUCCESS )
- {
- free( p_picture );
- return NULL;
- }
+ spu_t *p_spu = p_data;
+
+ filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) );
+ if( !p_sys )
+ return VLC_EGENERIC;
- p_picture->pf_release = RegionPictureRelease;
+ p_filter->pf_sub_buffer_new = sub_new_buffer;
+ p_filter->pf_sub_buffer_del = sub_del_buffer;
- return p_picture;
+ p_filter->p_owner = p_sys;
+ p_sys->i_channel = spu_RegisterChannel( p_spu );
+ p_sys->p_spu = p_spu;
+
+ return VLC_SUCCESS;
}
-static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_pic )
+static void SubFilterAllocationClean( filter_t *p_filter )
{
- if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
- if( p_pic ) free( p_pic );
+ filter_owner_sys_t *p_sys = p_filter->p_owner;
+
+ spu_ClearChannel( p_sys->p_spu, p_sys->i_channel );
+ free( p_filter->p_owner );
}
+
projects / vlc / blobdiff