/*****************************************************************************
* 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 <ass/ass.h>
+#if defined(WIN32)
+# include <vlc_charset.h>
+#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
{
vlc_object_t *p_libvlc;
- vlc_mutex_t *p_lock;
int i_refcount;
ass_library_t *p_library;
ass_renderer_t *p_renderer;
decoder_sys_t *p_dec_sys;
void *p_subs_data;
int i_subs_len;
- mtime_t i_stream_system_delta;
+ mtime_t i_pts;
};
typedef struct
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 vlc_mutex_t libass_lock = VLC_STATIC_MUTEX;
+
//#define DEBUG_REGION
/*****************************************************************************
decoder_sys_t *p_sys;
ass_track_t *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;
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( p_sys->p_ass->p_lock );
+ 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;
}
vlc_mutex_unlock( &p_sys->lock );
vlc_mutex_destroy( &p_sys->lock );
- vlc_mutex_lock( 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( p_sys->p_ass->p_lock );
+ vlc_mutex_unlock( &libass_lock );
AssHandleRelease( p_sys->p_ass );
free( p_sys );
return NULL;
}
- p_spu = p_dec->pf_spu_buffer_new( p_dec );
+ p_spu = decoder_NewSubpicture( p_dec );
if( !p_spu )
{
msg_Warn( p_dec, "can't get spu buffer" );
p_spu->p_sys = malloc( sizeof( subpicture_sys_t ));
if( !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;
}
if( !p_spu->p_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,
p_block->i_buffer );
- p_spu->p_sys->i_stream_system_delta =
- p_block->i_pts - decoder_GetDisplayDate( p_dec, p_block->i_pts );
+ p_spu->p_sys->i_pts = p_block->i_pts;
p_spu->i_start = p_block->i_pts;
p_spu->i_stop = p_block->i_pts + p_block->i_length;
p_spu->b_ephemer = true;
p_spu->b_absolute = true;
- vlc_mutex_lock( p_sys->p_ass->p_lock );
+ vlc_mutex_lock( &libass_lock );
if( p_sys->p_track )
{
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 );
+ vlc_mutex_unlock( &libass_lock );
p_spu->pf_pre_render = PreRender;
p_spu->pf_update_regions = UpdateRegions;
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_chroma = VLC_CODEC_RGBA;
fmt.i_width = fmt.i_visible_width;
fmt.i_height = fmt.i_visible_height;
fmt.i_bits_per_pixel = 0;
}
/* */
+ const mtime_t i_stream_date = p_subpic->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 + p_subpic->p_sys->i_stream_system_delta)/1000, &i_changed );
+ i_stream_date/1000, &i_changed );
if( !i_changed && !b_fmt_changed )
{
- vlc_mutex_unlock( p_ass->p_lock );
+ vlc_mutex_unlock( &libass_lock );
return;
}
if( i_region <= 0 )
{
- vlc_mutex_unlock( p_ass->p_lock );
+ vlc_mutex_unlock( &libass_lock );
return;
}
*pp_region_last = r;
pp_region_last = &r->p_next;
}
- vlc_mutex_unlock( p_ass->p_lock );
+ vlc_mutex_unlock( &libass_lock );
}
static rectangle_t r_create( int x0, int y0, int x1, int y1 )
static void SubpictureReleaseRegions( spu_t *p_spu, subpicture_t *p_subpic )
{
+ VLC_UNUSED( p_spu );
subpicture_region_ChainDelete( p_subpic->p_region );
p_subpic->p_region = NULL;
}
/* */
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;
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 */
}
free( pp_attachments );
- char *psz_font_dir = config_GetCacheDir();
+ char *psz_font_dir = NULL;
+
+#if defined(WIN32)
+ /* This makes Windows build of VLC hang */
+ const UINT uPath = GetSystemWindowsDirectoryW( NULL, 0 );
+ if( uPath > 0 )
+ {
+ wchar_t *psw_path = calloc( uPath + 1, sizeof(wchar_t) );
+ if( psw_path )
+ {
+ if( GetSystemWindowsDirectoryW( psw_path, uPath + 1 ) > 0 )
+ {
+ char *psz_tmp = FromWide( psw_path );
+ if( psz_tmp &&
+ asprintf( &psz_font_dir, "%s\\Fonts", psz_tmp ) < 0 )
+ psz_font_dir = NULL;
+ free( psz_tmp );
+ }
+ free( psw_path );
+ }
+ }
+#endif
+
+ if( !psz_font_dir )
+ psz_font_dir = config_GetCacheDir();
+
if( !psz_font_dir )
goto error;
+ msg_Dbg( p_dec, "Setting libass fontdir: %s", psz_font_dir );
ass_set_fonts_dir( p_library, psz_font_dir );
free( psz_font_dir );
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