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;
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 * );
/* */
subpicture_t *p_spu_final;
};
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
{
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;
};
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
/*****************************************************************************
return VLC_ENOMEM;
/* */
- p_sys->p_ass = AssHandleYield( p_dec );
+ p_sys->p_ass = AssHandleHold( p_dec );
if( !p_sys->p_ass )
{
free( p_sys );
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 );
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 );
+ 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 );
p_block = *pp_block;
if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
- msg_Dbg( p_dec, "Resetting libass track after time discontinuity" );
- /* We need to reset our tracks for the time discontinuity to be
- * handled */
- vlc_mutex_lock( p_sys->p_ass->p_lock );
- if( p_sys->p_track )
- ass_free_track( p_sys->p_track );
-
- p_sys->p_track = ass_new_track( p_sys->p_ass->p_library );
- if( p_sys->p_track )
- ass_process_codec_private( p_sys->p_track,
- p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra );
- vlc_mutex_unlock( p_sys->p_ass->p_lock );
-
block_Release( p_block );
return NULL;
}
- if( p_block->i_rate != 0 )
- p_block->i_length = p_block->i_length * p_block->i_rate / INPUT_RATE_DEFAULT;
*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 );
+ 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_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;
p_spu->pf_destroy = DestroySubpicture;
p_spu->p_sys->p_dec_sys = p_sys;
- DecSysYield( p_sys );
+ DecSysHold( p_sys );
block_Release( p_block );
return;
}
- vlc_mutex_lock( p_ass->p_lock );
+ vlc_mutex_lock( &libass_lock );
/* */
fmt = *p_fmt;
}
/* */
+ 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/1000, &i_changed );
+ ass_image_t *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 )
{
- 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;
}
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 rectangle_t r_create( int x0, int y0, int x1, int y1 )
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 );
- }
+ subpicture_region_ChainDelete( p_subpic->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;
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 */
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:
ass_library_done( p_library );
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 );
}