/*****************************************************************************
* SSA/ASS subtitle decoder using libass.
*****************************************************************************
- * Copyright (C) 2008 the VideoLAN team
+ * Copyright (C) 2008-2009 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@videolan.org>
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_vout.h>
#include <vlc_codec.h>
-#include <vlc_osd.h>
#include <vlc_input.h>
+#include <vlc_dialog.h>
#include <ass/ass.h>
+#if defined(WIN32)
+# include <vlc_charset.h>
+#endif
+
+/* Compatibility with old libass */
+#if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00907010
+# define ASS_Renderer ass_renderer_t
+# define ASS_Library ass_library_t
+# define ASS_Track ass_track_t
+# define ASS_Image ass_image_t
+#endif
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static int Create ( vlc_object_t * );
static void Destroy( vlc_object_t * );
-vlc_module_begin();
- set_shortname( N_("Subtitles (advanced)"));
- set_description( N_("Subtitle renderers using libass") );
- set_capability( "decoder", 100 );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_SCODEC );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( N_("Subtitles (advanced)"))
+ set_description( N_("Subtitle renderers using libass") )
+ set_capability( "decoder", 100 )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_SCODEC )
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static subpicture_t *DecodeBlock( decoder_t *, block_t ** );
-static void DestroySubpicture( subpicture_t * );
-static void PreRender( video_format_t *, spu_t *, subpicture_t * );
-static void UpdateRegions( video_format_t *, spu_t *,
- subpicture_t *, mtime_t );
/* Yes libass sux with threads */
-typedef struct
+typedef struct
{
vlc_object_t *p_libvlc;
- vlc_mutex_t *p_lock;
int i_refcount;
- ass_library_t *p_library;
- ass_renderer_t *p_renderer;
+ ASS_Library *p_library;
+ ASS_Renderer *p_renderer;
video_format_t fmt;
} ass_handle_t;
-static ass_handle_t *AssHandleYield( decoder_t *p_dec );
+static ass_handle_t *AssHandleHold( decoder_t *p_dec );
static void AssHandleRelease( ass_handle_t * );
/* */
struct decoder_sys_t
{
+ mtime_t i_max_stop;
+
/* decoder_sys_t is shared between decoder and spu units */
vlc_mutex_t lock;
int i_refcount;
ass_handle_t *p_ass;
/* */
- ass_track_t *p_track;
-
- /* */
- subpicture_t *p_spu_final;
+ ASS_Track *p_track;
};
static void DecSysRelease( decoder_sys_t *p_sys );
-static void DecSysYield( decoder_sys_t *p_sys );
+static void DecSysHold( decoder_sys_t *p_sys );
-struct subpicture_sys_t
+/* */
+static int SubpictureValidate( subpicture_t *,
+ bool, const video_format_t *,
+ bool, const video_format_t *,
+ mtime_t );
+static void SubpictureUpdate( subpicture_t *,
+ const video_format_t *,
+ const video_format_t *,
+ mtime_t );
+static void SubpictureDestroy( subpicture_t * );
+
+struct subpicture_updater_sys_t
{
decoder_sys_t *p_dec_sys;
- void *p_subs_data;
- int i_subs_len;
+ void *p_subs_data;
+ int i_subs_len;
+ mtime_t i_pts;
+
+ ASS_Image *p_img;
};
typedef struct
int y1;
} rectangle_t;
-static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ass_image_t *p_img_list, int i_width, int i_height );
-static void SubpictureReleaseRegions( spu_t *p_spu, subpicture_t *p_subpic );
-static void RegionDraw( subpicture_region_t *p_region, ass_image_t *p_img );
+static int BuildRegions( rectangle_t *p_region, int i_max_region, ASS_Image *p_img_list, int i_width, int i_height );
+static void RegionDraw( subpicture_region_t *p_region, ASS_Image *p_img );
+
+static vlc_mutex_t libass_lock = VLC_STATIC_MUTEX;
//#define DEBUG_REGION
{
decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys;
- ass_track_t *p_track;
+ ASS_Track *p_track;
- if( p_dec->fmt_in.i_codec != VLC_FOURCC('s','s','a',' ') )
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_SSA )
return VLC_EGENERIC;
p_dec->pf_decode_sub = DecodeBlock;
return VLC_ENOMEM;
/* */
- vlc_mutex_init( &p_sys->lock );
- p_sys->i_refcount = 1;
-
- p_sys->p_ass = AssHandleYield( p_dec );
-
- /* load attachments */
- input_attachment_t **pp_attachments;
- int i_attachments;
-
- if( decoder_GetInputAttachments( p_dec, &pp_attachments, &i_attachments ))
+ p_sys->i_max_stop = VLC_TS_INVALID;
+ p_sys->p_ass = AssHandleHold( p_dec );
+ if( !p_sys->p_ass )
{
- i_attachments = 0;
- pp_attachments = NULL;
- }
- for( int k = 0; k < i_attachments; k++ )
- {
- input_attachment_t *p_attach = pp_attachments[k];
-
- if( !strcasecmp( p_attach->psz_mime, "application/x-truetype-font" ) )
- {
- msg_Dbg( p_dec, "adding embedded font %s\n", p_attach->psz_name );
-
- vlc_mutex_lock( p_sys->p_ass->p_lock );
- ass_add_font( p_sys->p_ass->p_library, p_attach->psz_name, p_attach->p_data, p_attach->i_data );
- vlc_mutex_unlock( p_sys->p_ass->p_lock );
- }
- vlc_input_attachment_Delete( p_attach );
+ free( p_sys );
+ return VLC_EGENERIC;
}
- free( pp_attachments );
+ vlc_mutex_init( &p_sys->lock );
+ p_sys->i_refcount = 1;
/* Add a track */
- vlc_mutex_lock( p_sys->p_ass->p_lock );
+ vlc_mutex_lock( &libass_lock );
p_sys->p_track = p_track = ass_new_track( p_sys->p_ass->p_library );
+ if( !p_track )
+ {
+ vlc_mutex_unlock( &libass_lock );
+ DecSysRelease( p_sys );
+ return VLC_EGENERIC;
+ }
ass_process_codec_private( p_track, p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra );
- vlc_mutex_unlock( p_sys->p_ass->p_lock );
+ vlc_mutex_unlock( &libass_lock );
+
+ p_dec->fmt_out.i_cat = SPU_ES;
+ p_dec->fmt_out.i_codec = VLC_CODEC_RGBA;
return VLC_SUCCESS;
}
DecSysRelease( p_dec->p_sys );
}
-static void DecSysYield( decoder_sys_t *p_sys )
+static void DecSysHold( decoder_sys_t *p_sys )
{
vlc_mutex_lock( &p_sys->lock );
p_sys->i_refcount++;
vlc_mutex_unlock( &p_sys->lock );
vlc_mutex_destroy( &p_sys->lock );
- vlc_mutex_lock( p_sys->p_ass->p_lock );
- ass_free_track( p_sys->p_track );
- vlc_mutex_unlock( p_sys->p_ass->p_lock );
+ vlc_mutex_lock( &libass_lock );
+ if( p_sys->p_track )
+ ass_free_track( p_sys->p_track );
+ vlc_mutex_unlock( &libass_lock );
AssHandleRelease( p_sys->p_ass );
free( p_sys );
subpicture_t *p_spu = NULL;
block_t *p_block;
- //msg_Dbg( p_dec, "DecodeBlock %p", (void *)pp_block);
if( !pp_block || *pp_block == NULL )
return NULL;
p_block = *pp_block;
- if( p_block->i_rate != 0 )
- p_block->i_length = p_block->i_length * p_block->i_rate / INPUT_RATE_DEFAULT;
+ if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+ {
+ p_sys->i_max_stop = VLC_TS_INVALID;
+ block_Release( p_block );
+ return NULL;
+ }
*pp_block = NULL;
if( p_block->i_buffer == 0 || p_block->p_buffer[0] == '\0' )
return NULL;
}
- p_spu = p_dec->pf_spu_buffer_new( p_dec );
- if( !p_spu )
+ subpicture_updater_sys_t *p_spu_sys = malloc( sizeof(*p_spu_sys) );
+ if( !p_spu_sys )
{
- msg_Warn( p_dec, "can't get spu buffer" );
block_Release( p_block );
return NULL;
}
- p_spu->p_sys = malloc( sizeof( subpicture_sys_t ));
- if( !p_spu->p_sys )
+ subpicture_updater_t updater = {
+ .pf_validate = SubpictureValidate,
+ .pf_update = SubpictureUpdate,
+ .pf_destroy = SubpictureDestroy,
+ .p_sys = p_spu_sys,
+ };
+ p_spu = decoder_NewSubpicture( p_dec, &updater );
+ if( !p_spu )
{
- p_dec->pf_spu_buffer_del( p_dec, p_spu );
+ msg_Warn( p_dec, "can't get spu buffer" );
+ free( p_spu_sys );
block_Release( p_block );
return NULL;
}
- p_spu->p_sys->i_subs_len = p_block->i_buffer;
- p_spu->p_sys->p_subs_data = malloc( p_block->i_buffer );
- if( !p_spu->p_sys->p_subs_data )
+ p_spu_sys->p_img = NULL;
+ p_spu_sys->p_dec_sys = p_sys;
+ p_spu_sys->i_subs_len = p_block->i_buffer;
+ p_spu_sys->p_subs_data = malloc( p_block->i_buffer );
+ p_spu_sys->i_pts = p_block->i_pts;
+ if( !p_spu_sys->p_subs_data )
{
- free( p_spu->p_sys );
- p_dec->pf_spu_buffer_del( p_dec, p_spu );
+ decoder_DeleteSubpicture( p_dec, p_spu );
block_Release( p_block );
return NULL;
}
- memcpy( p_spu->p_sys->p_subs_data, p_block->p_buffer,
+ memcpy( p_spu_sys->p_subs_data, p_block->p_buffer,
p_block->i_buffer );
- p_spu->i_x = 0;
- p_spu->i_y = 0;
p_spu->i_start = p_block->i_pts;
- p_spu->i_stop = p_block->i_pts + p_block->i_length;
+ p_spu->i_stop = __MAX( p_sys->i_max_stop, p_block->i_pts + p_block->i_length );
p_spu->b_ephemer = true;
p_spu->b_absolute = true;
- p_spu->b_pausable = true; /* ? */
- vlc_mutex_lock( p_sys->p_ass->p_lock );
- ass_process_chunk( p_sys->p_track, p_spu->p_sys->p_subs_data, p_spu->p_sys->i_subs_len,
- p_spu->i_start / 1000, (p_spu->i_stop-p_spu->i_start) / 1000 );
- vlc_mutex_unlock( p_sys->p_ass->p_lock );
+ p_sys->i_max_stop = p_spu->i_stop;
- p_spu->pf_pre_render = PreRender;
- p_spu->pf_update_regions = UpdateRegions;
- p_spu->pf_destroy = DestroySubpicture;
- p_spu->p_sys->p_dec_sys = p_sys;
+ vlc_mutex_lock( &libass_lock );
+ if( p_sys->p_track )
+ {
+ ass_process_chunk( p_sys->p_track, p_spu_sys->p_subs_data, p_spu_sys->i_subs_len,
+ p_block->i_pts / 1000, p_block->i_length / 1000 );
+ }
+ vlc_mutex_unlock( &libass_lock );
- DecSysYield( p_sys );
+ DecSysHold( p_sys ); /* Keep a reference for the returned subpicture */
block_Release( p_block );
/****************************************************************************
*
****************************************************************************/
-static void DestroySubpicture( subpicture_t *p_subpic )
+static int SubpictureValidate( subpicture_t *p_subpic,
+ bool b_fmt_src, const video_format_t *p_fmt_src,
+ bool b_fmt_dst, const video_format_t *p_fmt_dst,
+ mtime_t i_ts )
{
- DecSysRelease( p_subpic->p_sys->p_dec_sys );
-
- free( p_subpic->p_sys->p_subs_data );
- free( p_subpic->p_sys );
-}
-
-static void PreRender( video_format_t *p_fmt, spu_t *p_spu,
- subpicture_t *p_subpic )
-{
- decoder_sys_t *p_dec_sys = p_subpic->p_sys->p_dec_sys;
-
- p_dec_sys->p_spu_final = p_subpic;
- VLC_UNUSED(p_fmt);
- VLC_UNUSED(p_spu);
-}
-
-static void UpdateRegions( video_format_t *p_fmt, spu_t *p_spu,
- subpicture_t *p_subpic, mtime_t i_ts )
-{
- decoder_sys_t *p_sys = p_subpic->p_sys->p_dec_sys;
+ decoder_sys_t *p_sys = p_subpic->updater.p_sys->p_dec_sys;
ass_handle_t *p_ass = p_sys->p_ass;
- video_format_t fmt;
- bool b_fmt_changed;
-
- if( p_subpic != p_sys->p_spu_final )
- {
- SubpictureReleaseRegions( p_spu, p_subpic );
- return;
- }
-
- vlc_mutex_lock( p_ass->p_lock );
+ vlc_mutex_lock( &libass_lock );
- /* */
- fmt = *p_fmt;
- fmt.i_chroma = VLC_FOURCC('R','G','B','A');
- fmt.i_width = fmt.i_visible_width;
- fmt.i_height = fmt.i_visible_height;
+ /* FIXME why this mix of src/dst */
+ video_format_t fmt = *p_fmt_dst;
+ fmt.i_chroma = VLC_CODEC_RGBA;
fmt.i_bits_per_pixel = 0;
- fmt.i_x_offset = fmt.i_y_offset = 0;
- fmt.i_sar_num = 1;
- fmt.i_sar_den = 1;
-
- b_fmt_changed = memcmp( &fmt, &p_ass->fmt, sizeof(fmt) ) != 0;
- if( b_fmt_changed )
+ fmt.i_width =
+ fmt.i_visible_width = p_fmt_src->i_width;
+ fmt.i_height =
+ fmt.i_visible_height = p_fmt_src->i_height;
+ fmt.i_x_offset =
+ fmt.i_y_offset = 0;
+
+ if( b_fmt_src || b_fmt_dst )
{
ass_set_frame_size( p_ass->p_renderer, fmt.i_width, fmt.i_height );
+#if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000
+ ass_set_aspect_ratio( p_ass->p_renderer, 1.0, 1.0 ); // TODO ?
+#else
ass_set_aspect_ratio( p_ass->p_renderer, 1.0 ); // TODO ?
-
+#endif
p_ass->fmt = fmt;
}
/* */
+ const mtime_t i_stream_date = p_subpic->updater.p_sys->i_pts + (i_ts - p_subpic->i_start);
int i_changed;
- ass_image_t *p_img = ass_render_frame( p_ass->p_renderer, p_sys->p_track, i_ts/1000, &i_changed );
+ ASS_Image *p_img = ass_render_frame( p_ass->p_renderer, p_sys->p_track,
+ i_stream_date/1000, &i_changed );
- if( !i_changed && !b_fmt_changed )
+ if( !i_changed && !b_fmt_src && !b_fmt_dst &&
+ (p_img != NULL) == (p_subpic->p_region != NULL) )
{
- vlc_mutex_unlock( p_ass->p_lock );
- return;
+ vlc_mutex_unlock( &libass_lock );
+ return VLC_SUCCESS;
}
+ p_subpic->updater.p_sys->p_img = p_img;
+
+ /* The lock is released by SubpictureUpdate */
+ return VLC_EGENERIC;
+}
+
+static void SubpictureUpdate( subpicture_t *p_subpic,
+ const video_format_t *p_fmt_src,
+ const video_format_t *p_fmt_dst,
+ mtime_t i_ts )
+{
+ VLC_UNUSED( p_fmt_src ); VLC_UNUSED( p_fmt_dst ); VLC_UNUSED( i_ts );
+
+ decoder_sys_t *p_sys = p_subpic->updater.p_sys->p_dec_sys;
+ ass_handle_t *p_ass = p_sys->p_ass;
+
+ video_format_t fmt = p_ass->fmt;
+ ASS_Image *p_img = p_subpic->updater.p_sys->p_img;
+ //vlc_assert_locked( &libass_lock );
/* */
p_subpic->i_original_picture_height = fmt.i_height;
p_subpic->i_original_picture_width = fmt.i_width;
- SubpictureReleaseRegions( p_spu, p_subpic );
/* XXX to improve efficiency we merge regions that are close minimizing
* the lost surface.
*/
const int i_max_region = 4;
rectangle_t region[i_max_region];
- const int i_region = BuildRegions( p_spu, region, i_max_region, p_img, fmt.i_width, fmt.i_height );
+ const int i_region = BuildRegions( region, i_max_region, p_img, fmt.i_width, fmt.i_height );
if( i_region <= 0 )
{
- vlc_mutex_unlock( p_ass->p_lock );
+ vlc_mutex_unlock( &libass_lock );
return;
}
fmt_region.i_height =
fmt_region.i_visible_height = region[i].y1 - region[i].y0;
- pp_region[i] = r = p_subpic->pf_create_region( VLC_OBJECT(p_spu), &fmt_region );
+ pp_region[i] = r = subpicture_region_New( &fmt_region );
if( !r )
break;
r->i_x = region[i].x0;
*pp_region_last = r;
pp_region_last = &r->p_next;
}
- vlc_mutex_unlock( p_ass->p_lock );
+ vlc_mutex_unlock( &libass_lock );
+
+}
+static void SubpictureDestroy( subpicture_t *p_subpic )
+{
+ subpicture_updater_sys_t *p_sys = p_subpic->updater.p_sys;
+
+ DecSysRelease( p_sys->p_dec_sys );
+ free( p_sys->p_subs_data );
+ free( p_sys );
}
static rectangle_t r_create( int x0, int y0, int x1, int y1 )
rectangle_t r = { x0, y0, x1, y1 };
return r;
}
-static rectangle_t r_img( const ass_image_t *p_img )
+static rectangle_t r_img( const ASS_Image *p_img )
{
return r_create( p_img->dst_x, p_img->dst_y, p_img->dst_x+p_img->w, p_img->dst_y+p_img->h );
}
__MAX(a->y0-i_dy, b->y0) < __MIN( a->y1+i_dy, b->y1 );
}
-static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ass_image_t *p_img_list, int i_width, int i_height )
+static int BuildRegions( rectangle_t *p_region, int i_max_region, ASS_Image *p_img_list, int i_width, int i_height )
{
- ass_image_t *p_tmp;
+ ASS_Image *p_tmp;
int i_count;
#ifdef DEBUG_REGION
#endif
for( p_tmp = p_img_list, i_count = 0; p_tmp != NULL; p_tmp = p_tmp->next )
- i_count++;
+ if( p_tmp->w > 0 && p_tmp->h > 0 )
+ i_count++;
if( i_count <= 0 )
return 0;
- ass_image_t *pp_img[i_count]; // TODO move to context ?
- for( p_tmp = p_img_list, i_count = 0; p_tmp != NULL; p_tmp = p_tmp->next, i_count++ )
- pp_img[i_count] = p_tmp;
+ ASS_Image **pp_img = calloc( i_count, sizeof(*pp_img) );
+ if( !pp_img )
+ return 0;
+
+ for( p_tmp = p_img_list, i_count = 0; p_tmp != NULL; p_tmp = p_tmp->next )
+ if( p_tmp->w > 0 && p_tmp->h > 0 )
+ pp_img[i_count++] = p_tmp;
/* */
const int i_w_inc = __MAX( ( i_width + 49 ) / 50, 32 );
b_ok = false;
for( n = 0; n < i_count; n++ )
{
- ass_image_t *p_img = pp_img[n];
+ ASS_Image *p_img = pp_img[n];
if( !p_img )
continue;
rectangle_t r = r_img( p_img );
msg_Err( p_spu, "ASS: %d objects merged into %d region in %d micros", i_count, i_region, (int)(i_ck_time) );
#endif
+ free( pp_img );
+
return i_region;
}
-static void RegionDraw( subpicture_region_t *p_region, ass_image_t *p_img )
+static void RegionDraw( subpicture_region_t *p_region, ASS_Image *p_img )
{
- const plane_t *p = &p_region->picture.p[0];
+ const plane_t *p = &p_region->p_picture->p[0];
const int i_x = p_region->i_x;
const int i_y = p_region->i_y;
const int i_width = p_region->fmt.i_width;
p_img->dst_y < i_y || p_img->dst_y + p_img->h > i_y + i_height )
continue;
- const int r = (p_img->color >> 24)&0xff;
- const int g = (p_img->color >> 16)&0xff;
- const int b = (p_img->color >> 8)&0xff;
- const int a = (p_img->color )&0xff;
+ const unsigned r = (p_img->color >> 24)&0xff;
+ const unsigned g = (p_img->color >> 16)&0xff;
+ const unsigned b = (p_img->color >> 8)&0xff;
+ const unsigned a = (p_img->color )&0xff;
int x, y;
for( y = 0; y < p_img->h; y++ )
{
for( x = 0; x < p_img->w; x++ )
{
- const int alpha = p_img->bitmap[y*p_img->stride+x];
- const int an = (255 - a) * alpha / 255;
+ const unsigned alpha = p_img->bitmap[y*p_img->stride+x];
+ const unsigned an = (255 - a) * alpha / 255;
uint8_t *p_rgba = &p->p_pixels[(y+p_img->dst_y-i_y) * p->i_pitch + 4 * (x+p_img->dst_x-i_x)];
-#if 0
- p_rgba[0] = b;
- p_rgba[1] = g;
- p_rgba[2] = r;
- p_rgba[3] = an;
-#else
- // FIXME it is not right
- p_rgba[0] = ( p_rgba[0] * (255-an) + b * an ) / 255;
- p_rgba[1] = ( p_rgba[1] * (255-an) + g * an ) / 255;
- p_rgba[2] = ( p_rgba[2] * (255-an) + r * an ) / 255;
- p_rgba[3] = 255 - ( 255 - p_rgba[3] ) * ( 255 - an ) / 255;
-#endif
+ const unsigned ao = p_rgba[3];
+
+ /* Native endianness, but RGBA ordering */
+ if( ao == 0 )
+ {
+ /* Optimized but the else{} will produce the same result */
+ p_rgba[0] = r;
+ p_rgba[1] = g;
+ p_rgba[2] = b;
+ p_rgba[3] = an;
+ }
+ else
+ {
+ p_rgba[3] = 255 - ( 255 - p_rgba[3] ) * ( 255 - an ) / 255;
+ if( p_rgba[3] != 0 )
+ {
+ p_rgba[0] = ( p_rgba[0] * ao * (255-an) / 255 + r * an ) / p_rgba[3];
+ p_rgba[1] = ( p_rgba[1] * ao * (255-an) / 255 + g * an ) / p_rgba[3];
+ p_rgba[2] = ( p_rgba[2] * ao * (255-an) / 255 + b * an ) / p_rgba[3];
+ }
+ }
}
}
}
#endif
}
-
-static void SubpictureReleaseRegions( spu_t *p_spu, subpicture_t *p_subpic )
-{
- 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 );
- }
- p_subpic->p_region = NULL;
-}
-
/* */
-static ass_handle_t *AssHandleYield( decoder_t *p_dec )
+static ass_handle_t *AssHandleHold( decoder_t *p_dec )
{
- vlc_mutex_t *p_lock = var_AcquireMutex( "libass" );
- if( !p_lock )
- return NULL;
+ vlc_mutex_lock( &libass_lock );
ass_handle_t *p_ass = NULL;
- ass_library_t *p_library = NULL;
- ass_renderer_t *p_renderer = NULL;
+ ASS_Library *p_library = NULL;
+ ASS_Renderer *p_renderer = NULL;
vlc_value_t val;
var_Create( p_dec->p_libvlc, "libass-handle", VLC_VAR_ADDRESS );
p_ass->i_refcount++;
- vlc_mutex_unlock( p_lock );
+ vlc_mutex_unlock( &libass_lock );
return p_ass;
}
/* */
p_ass->p_libvlc = VLC_OBJECT(p_dec->p_libvlc);
- p_ass->p_lock = p_lock;
p_ass->i_refcount = 1;
/* Create libass library */
if( !p_library )
goto error;
- ass_set_fonts_dir( p_library, "/usr/share/fonts" ); // FIXME
+ /* load attachments */
+ input_attachment_t **pp_attachments;
+ int i_attachments;
+
+ if( decoder_GetInputAttachments( p_dec, &pp_attachments, &i_attachments ))
+ {
+ i_attachments = 0;
+ pp_attachments = NULL;
+ }
+ for( int k = 0; k < i_attachments; k++ )
+ {
+ input_attachment_t *p_attach = pp_attachments[k];
+
+ if( !strcasecmp( p_attach->psz_mime, "application/x-truetype-font" ) )
+ {
+ msg_Dbg( p_dec, "adding embedded font %s", p_attach->psz_name );
+
+ ass_add_font( p_ass->p_library, p_attach->psz_name, p_attach->p_data, p_attach->i_data );
+ }
+ vlc_input_attachment_Delete( p_attach );
+ }
+ free( pp_attachments );
+
ass_set_extract_fonts( p_library, true );
ass_set_style_overrides( p_library, NULL );
ass_set_use_margins( p_renderer, false);
//if( false )
// ass_set_margins( p_renderer, int t, int b, int l, int r);
- ass_set_hinting( p_renderer, ASS_HINTING_NATIVE ); // No idea
+ ass_set_hinting( p_renderer, ASS_HINTING_LIGHT );
ass_set_font_scale( p_renderer, 1.0 );
ass_set_line_spacing( p_renderer, 0.0 );
- const char *psz_font = "";//"/usr/src/videolan/vlc-libass.git/share/skins2/fonts/FreeSans.ttf"; // FIXME
- const char *psz_family = "";//"Arial"; // FIXME
+ const char *psz_font = NULL; /* We don't ship a default font with VLC */
+ const char *psz_family = "Arial"; /* Use Arial if we can't find anything more suitable */
+
#ifdef HAVE_FONTCONFIG
+#if defined(WIN32)
+ dialog_progress_bar_t *p_dialog = dialog_ProgressCreate( p_dec,
+ _("Building font cache"),
+ _( "Please wait while your font cache is rebuilt.\n"
+ "This should take less than a minute." ), NULL );
+ if( p_dialog )
+ dialog_ProgressSet( p_dialog, NULL, 0.2 );
+#endif
+#if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000
+ ass_set_fonts( p_renderer, psz_font, psz_family, true, NULL, 1 ); // setup default font/family
+#else
ass_set_fonts( p_renderer, psz_font, psz_family ); // setup default font/family
+#endif
+#ifdef WIN32
+ if( p_dialog )
+ {
+ dialog_ProgressSet( p_dialog, NULL, 1.0 );
+ dialog_ProgressDestroy( p_dialog );
+ p_dialog = NULL;
+ }
+#endif
#else
/* FIXME you HAVE to give him a font if no fontconfig */
+#if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000
+ ass_set_fonts( p_renderer, psz_font, psz_family, false, NULL, 1 );
+#else
ass_set_fonts_nofc( p_renderer, psz_font, psz_family );
+#endif
#endif
memset( &p_ass->fmt, 0, sizeof(p_ass->fmt) );
var_Set( p_dec->p_libvlc, "libass-handle", val );
/* */
- vlc_mutex_unlock( p_ass->p_lock );
+ vlc_mutex_unlock( &libass_lock );
return p_ass;
error:
if( p_library )
ass_library_done( p_library );
+ msg_Warn( p_dec, "Libass creation failed" );
+
free( p_ass );
- vlc_mutex_unlock( p_lock );
+ vlc_mutex_unlock( &libass_lock );
return NULL;
}
static void AssHandleRelease( ass_handle_t *p_ass )
{
- vlc_mutex_lock( p_ass->p_lock );
+ vlc_mutex_lock( &libass_lock );
p_ass->i_refcount--;
if( p_ass->i_refcount > 0 )
{
- vlc_mutex_unlock( p_ass->p_lock );
+ vlc_mutex_unlock( &libass_lock );
return;
}
val.p_address = NULL;
var_Set( p_ass->p_libvlc, "libass-handle", val );
- vlc_mutex_unlock( p_ass->p_lock );
+ vlc_mutex_unlock( &libass_lock );
free( p_ass );
}
-
projects / vlc / blobdiff