X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Flibass.c;h=77e66bcb9b4351d95a20dc51d77f3581c9f4d43d;hb=314cd3825c7b20f77bab5fcc9909a7e700d88d3f;hp=9dd811c70b486c33f5ae89361a99e3ce604f4ab4;hpb=24cddfa0efa80557f538d6dbf08f9b0b4b4d52a4;p=vlc diff --git a/modules/codec/libass.c b/modules/codec/libass.c index 9dd811c70b..77e66bcb9b 100644 --- a/modules/codec/libass.c +++ b/modules/codec/libass.c @@ -37,8 +37,8 @@ #include #include #include -#include #include +#include #include @@ -46,6 +46,14 @@ # 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 *****************************************************************************/ @@ -65,19 +73,15 @@ 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; 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 ); @@ -86,6 +90,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; @@ -94,20 +100,30 @@ 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 ); -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; mtime_t i_pts; + + ASS_Image *p_img; }; typedef struct @@ -118,9 +134,8 @@ 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; @@ -133,7 +148,7 @@ 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_CODEC_SSA ) return VLC_EGENERIC; @@ -145,6 +160,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 ) { @@ -226,6 +242,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; } @@ -237,54 +254,58 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) return NULL; } - p_spu = decoder_NewSubpicture( 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 ) { - decoder_DeleteSubpicture( 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 ); 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->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; + 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 ); + 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 ); - 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; - - DecSysHold( p_sys ); + DecSysHold( p_sys ); /* Keep a reference for the returned subpicture */ block_Release( p_block ); @@ -294,74 +315,71 @@ static subpicture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /**************************************************************************** * ****************************************************************************/ -static void DestroySubpicture( subpicture_t *p_subpic ) -{ - DecSysRelease( p_subpic->p_sys->p_dec_sys ); - - free( p_subpic->p_sys->p_subs_data ); - free( p_subpic->p_sys ); -} - -static void PreRender( spu_t *p_spu, subpicture_t *p_subpic, - const video_format_t *p_fmt ) +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 ) { - 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 ) -{ - 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( &libass_lock ); - /* */ - fmt = *p_fmt; - fmt.i_chroma = VLC_CODEC_RGBA; - 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; - - 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->p_sys->i_pts + (i_ts - p_subpic->i_start); + 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_stream_date/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( &libass_lock ); - return; + 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 ) +{ + 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. @@ -371,7 +389,7 @@ static void UpdateRegions( spu_t *p_spu, subpicture_t *p_subpic, */ 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 ) { @@ -410,6 +428,15 @@ static void UpdateRegions( spu_t *p_spu, subpicture_t *p_subpic, pp_region_last = &r->p_next; } 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 ) @@ -417,7 +444,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 ); } @@ -438,28 +465,28 @@ 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( 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); - #ifdef DEBUG_REGION int64_t i_ck_start = mdate(); #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 ); @@ -487,7 +514,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 ); @@ -563,7 +590,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; @@ -578,26 +605,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]; + } + } } } } @@ -613,22 +655,14 @@ static void RegionDraw( subpicture_region_t *p_region, ass_image_t *p_img ) #endif } - -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_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 ); @@ -682,38 +716,6 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec ) } free( pp_attachments ); - 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 ); - ass_set_extract_fonts( p_library, true ); ass_set_style_overrides( p_library, NULL ); @@ -725,17 +727,42 @@ 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 +#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) ); @@ -779,4 +806,3 @@ static void AssHandleRelease( ass_handle_t *p_ass ) vlc_mutex_unlock( &libass_lock ); free( p_ass ); } -