Commit fea2b345 authored by Laurent Aimar's avatar Laurent Aimar

Removed useless pre render callback in ssa decoder.

parent 5cb92e06
...@@ -67,7 +67,6 @@ vlc_module_end () ...@@ -67,7 +67,6 @@ vlc_module_end ()
*****************************************************************************/ *****************************************************************************/
static subpicture_t *DecodeBlock( decoder_t *, block_t ** ); static subpicture_t *DecodeBlock( decoder_t *, block_t ** );
static void DestroySubpicture( subpicture_t * ); static void DestroySubpicture( subpicture_t * );
static void PreRender( spu_t *, subpicture_t *, const video_format_t * );
static void UpdateRegions( spu_t *, static void UpdateRegions( spu_t *,
subpicture_t *, const video_format_t *, mtime_t ); subpicture_t *, const video_format_t *, mtime_t );
...@@ -98,9 +97,6 @@ struct decoder_sys_t ...@@ -98,9 +97,6 @@ struct decoder_sys_t
/* */ /* */
ass_track_t *p_track; ass_track_t *p_track;
/* */
subpicture_t *p_spu_final;
}; };
static void DecSysRelease( decoder_sys_t *p_sys ); static void DecSysRelease( decoder_sys_t *p_sys );
static void DecSysHold( decoder_sys_t *p_sys ); static void DecSysHold( decoder_sys_t *p_sys );
...@@ -286,7 +282,6 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -286,7 +282,6 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
} }
vlc_mutex_unlock( &libass_lock ); vlc_mutex_unlock( &libass_lock );
p_spu->pf_pre_render = PreRender;
p_spu->pf_update_regions = UpdateRegions; p_spu->pf_update_regions = UpdateRegions;
p_spu->pf_destroy = DestroySubpicture; p_spu->pf_destroy = DestroySubpicture;
p_spu->p_sys->p_dec_sys = p_sys; p_spu->p_sys->p_dec_sys = p_sys;
...@@ -309,16 +304,6 @@ static void DestroySubpicture( subpicture_t *p_subpic ) ...@@ -309,16 +304,6 @@ static void DestroySubpicture( subpicture_t *p_subpic )
free( p_subpic->p_sys ); free( p_subpic->p_sys );
} }
static void PreRender( spu_t *p_spu, subpicture_t *p_subpic,
const video_format_t *p_fmt )
{
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( spu_t *p_spu, subpicture_t *p_subpic, static void UpdateRegions( spu_t *p_spu, subpicture_t *p_subpic,
const video_format_t *p_fmt, mtime_t i_ts ) const video_format_t *p_fmt, mtime_t i_ts )
{ {
...@@ -328,12 +313,6 @@ static void UpdateRegions( spu_t *p_spu, subpicture_t *p_subpic, ...@@ -328,12 +313,6 @@ static void UpdateRegions( spu_t *p_spu, subpicture_t *p_subpic,
video_format_t fmt; video_format_t fmt;
bool b_fmt_changed; bool b_fmt_changed;
if( p_subpic != p_sys->p_spu_final )
{
SubpictureReleaseRegions( p_spu, p_subpic );
return;
}
vlc_mutex_lock( &libass_lock ); vlc_mutex_lock( &libass_lock );
/* */ /* */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment