X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fcodec%2Flibass.c;h=ae86e998d999f25cb9013a0c302a11bbd2a36dd8;hb=d4f950b3285f5afa3f77f35096d7a5d073b9f296;hp=fd4e1601b3a9d682f60a901c8fb6b50bab73ab06;hpb=f6cc8a39507a630bb20c865b81039eafa72834b6;p=vlc diff --git a/modules/codec/libass.c b/modules/codec/libass.c index fd4e1601b3..ae86e998d9 100644 --- a/modules/codec/libass.c +++ b/modules/codec/libass.c @@ -1,7 +1,7 @@ /***************************************************************************** * SSA/ASS subtitle decoder using libass. ***************************************************************************** - * Copyright (C) 2008 the VideoLAN team + * Copyright (C) 2008-2009 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -36,46 +36,56 @@ #include #include -#include #include #include #include +#include #include +#if defined(WIN32) +# include +#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( spu_t *, subpicture_t *, const video_format_t * ); static void UpdateRegions( spu_t *, subpicture_t *, const video_format_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 *AssHandleHold( decoder_t *p_dec ); @@ -84,6 +94,8 @@ 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; @@ -92,10 +104,7 @@ struct decoder_sys_t 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 DecSysHold( decoder_sys_t *p_sys ); @@ -105,7 +114,7 @@ struct subpicture_sys_t 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 @@ -116,9 +125,11 @@ 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 int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ASS_Image *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 void RegionDraw( subpicture_region_t *p_region, ASS_Image *p_img ); + +static vlc_mutex_t libass_lock = VLC_STATIC_MUTEX; //#define DEBUG_REGION @@ -129,9 +140,9 @@ static int Create( vlc_object_t *p_this ) { 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; @@ -141,6 +152,7 @@ static int Create( vlc_object_t *p_this ) return VLC_ENOMEM; /* */ + p_sys->i_max_stop = VLC_TS_INVALID; p_sys->p_ass = AssHandleHold( p_dec ); if( !p_sys->p_ass ) { @@ -151,16 +163,19 @@ static int Create( vlc_object_t *p_this ) 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; } @@ -194,10 +209,10 @@ static void DecSysRelease( decoder_sys_t *p_sys ) 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 ); @@ -219,6 +234,7 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_block = *pp_block; 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; } @@ -230,7 +246,7 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) 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" ); @@ -241,7 +257,7 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) 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; } @@ -251,29 +267,29 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) 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->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; - vlc_mutex_lock( p_sys->p_ass->p_lock ); + p_sys->i_max_stop = p_spu->i_stop; + + 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 ); + p_block->i_pts / 1000, p_block->i_length / 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; @@ -296,16 +312,6 @@ static void DestroySubpicture( subpicture_t *p_subpic ) 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, const video_format_t *p_fmt, mtime_t i_ts ) { @@ -315,17 +321,11 @@ static void UpdateRegions( spu_t *p_spu, subpicture_t *p_subpic, 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_chroma = VLC_CODEC_RGBA; fmt.i_width = fmt.i_visible_width; fmt.i_height = fmt.i_visible_height; fmt.i_bits_per_pixel = 0; @@ -335,19 +335,25 @@ static void UpdateRegions( spu_t *p_spu, subpicture_t *p_subpic, if( b_fmt_changed ) { ass_set_frame_size( p_ass->p_renderer, fmt.i_width, fmt.i_height ); - ass_set_aspect_ratio( p_ass->p_renderer, 1.0 ); // TODO ? +#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->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 ); + 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_changed && + (p_img != NULL) == (p_subpic->p_region != NULL) ) { - vlc_mutex_unlock( p_ass->p_lock ); + vlc_mutex_unlock( &libass_lock ); return; } @@ -368,7 +374,7 @@ static void UpdateRegions( spu_t *p_spu, subpicture_t *p_subpic, if( i_region <= 0 ) { - vlc_mutex_unlock( p_ass->p_lock ); + vlc_mutex_unlock( &libass_lock ); return; } @@ -402,7 +408,7 @@ static void UpdateRegions( spu_t *p_spu, subpicture_t *p_subpic, *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 ) @@ -410,7 +416,7 @@ 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 ); } @@ -431,9 +437,9 @@ static bool r_overlap( const rectangle_t *a, const rectangle_t *b, int i_dx, int __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( spu_t *p_spu, 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; VLC_UNUSED(p_spu); @@ -443,16 +449,18 @@ static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_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 = calloc( i_count, sizeof(*pp_img) ); + 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, i_count++ ) - pp_img[i_count] = p_tmp; + 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 ); @@ -480,7 +488,7 @@ static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, 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 ); @@ -556,7 +564,7 @@ static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, 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->p_picture->p[0]; const int i_x = p_region->i_x; @@ -571,26 +579,41 @@ static void RegionDraw( subpicture_region_t *p_region, ass_image_t *p_img ) 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)]; + const unsigned ao = p_rgba[3]; /* Native endianness, but RGBA ordering */ - p_rgba[0] = ( p_rgba[0] * (255-an) + r * an ) / 255; - p_rgba[1] = ( p_rgba[1] * (255-an) + g * an ) / 255; - p_rgba[2] = ( p_rgba[2] * (255-an) + b * an ) / 255; - p_rgba[3] = 255 - ( 255 - p_rgba[3] ) * ( 255 - an ) / 255; + 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]; + } + } } } } @@ -609,6 +632,7 @@ static void RegionDraw( subpicture_region_t *p_region, ass_image_t *p_img ) 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; } @@ -616,13 +640,11 @@ static void SubpictureReleaseRegions( spu_t *p_spu, subpicture_t *p_subpic ) /* */ 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 ); @@ -635,7 +657,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec ) p_ass->i_refcount++; - vlc_mutex_unlock( p_lock ); + vlc_mutex_unlock( &libass_lock ); return p_ass; } @@ -646,7 +668,6 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec ) /* */ p_ass->p_libvlc = VLC_OBJECT(p_dec->p_libvlc); - p_ass->p_lock = p_lock; p_ass->i_refcount = 1; /* Create libass library */ @@ -677,11 +698,45 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec ) } free( pp_attachments ); - char *psz_font_dir = config_GetCacheDir(); + char *psz_font_dir = NULL; + + +#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 ); + /* 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_GetUserDir( VLC_CACHE_DIR ); + 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 ); +#ifdef WIN32 + if( p_dialog ) + dialog_ProgressSet( p_dialog, NULL, 0.1 ); +#endif ass_set_extract_fonts( p_library, true ); ass_set_style_overrides( p_library, NULL ); @@ -694,17 +749,34 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec ) 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 = 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 +#ifdef WIN32 + 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 ); +#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) ); @@ -713,7 +785,11 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec ) var_Set( p_dec->p_libvlc, "libass-handle", val ); /* */ - vlc_mutex_unlock( p_ass->p_lock ); + vlc_mutex_unlock( &libass_lock ); +#ifdef WIN32 + if( p_dialog ) + dialog_ProgressDestroy( p_dialog ); +#endif return p_ass; error: @@ -722,17 +798,19 @@ 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; } @@ -743,7 +821,6 @@ static void AssHandleRelease( ass_handle_t *p_ass ) 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 ); } -