X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_subpictures.c;h=5cff7dfb2656038198cd8a6d655e97fa9364944e;hb=ef801bc9edd2b821983be8269b75a308782f2841;hp=8e4f3da5517cdfa6322d2d316be05765486360db;hpb=19f12af17bb9df1e4e728f6901bff34466761774;p=vlc diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index 8e4f3da551..5cff7dfb26 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -59,28 +59,20 @@ static int spu_ParseChain( spu_t * ); static int SubFilterCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -static int sub_filter_allocation_init( filter_t *, void * ); -static void sub_filter_allocation_clear( filter_t * ); +static int SubFilterAllocationInit( filter_t *, void * ); +static void SubFilterAllocationClean( filter_t * ); struct filter_owner_sys_t { spu_t *p_spu; int i_channel; }; -enum { - SCALE_DEFAULT, - SCALE_TEXT, - SCALE_SIZE -}; +#define SCALE_UNIT (1000) -static void FilterRelease( filter_t *p_filter ) -{ - if( p_filter->p_module ) - module_Unneed( p_filter, p_filter->p_module ); - - vlc_object_detach( p_filter ); - vlc_object_release( p_filter ); -} +/* */ +static void SpuRenderCreateAndLoadText( spu_t *p_spu ); +static void SpuRenderCreateAndLoadScale( spu_t *p_spu ); +static void FilterRelease( filter_t *p_filter ); /** * Creates the subpicture unit @@ -112,9 +104,14 @@ spu_t *__spu_Create( vlc_object_t *p_this ) vlc_object_attach( p_spu, p_this ); p_spu->p_chain = filter_chain_New( p_spu, "sub filter", false, - sub_filter_allocation_init, - sub_filter_allocation_clear, + SubFilterAllocationInit, + SubFilterAllocationClean, p_spu ); + + /* Load text and scale module */ + SpuRenderCreateAndLoadText( p_spu ); + SpuRenderCreateAndLoadScale( p_spu ); + return p_spu; } @@ -216,46 +213,51 @@ void spu_Attach( spu_t *p_spu, vlc_object_t *p_this, bool b_attach ) } } + +/* */ +static void RegionPictureRelease( picture_t *p_pic ) +{ + free( p_pic->p_data_orig ); + /* We use pf_release nullity to know if the picture has already been released. */ + p_pic->pf_release = NULL; +} + /** * Create a subpicture region * * \param p_this vlc_object_t * \param p_fmt the format that this subpicture region should have */ -static void RegionPictureRelease( picture_t *p_pic ) -{ - free( p_pic->p_data_orig ); -} subpicture_region_t *__spu_CreateRegion( vlc_object_t *p_this, video_format_t *p_fmt ) { - subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) ); - if( !p_region ) return NULL; + subpicture_region_t *p_region = calloc( 1, sizeof(*p_region ) ); + if( !p_region ) + return NULL; + + /* FIXME is that *really* wanted? */ + if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') ) + p_fmt->p_palette = calloc( 1, sizeof(video_palette_t) ); + else + p_fmt->p_palette = NULL; /* XXX and that above all? */ - memset( p_region, 0, sizeof(subpicture_region_t) ); + p_region->fmt = *p_fmt; p_region->i_alpha = 0xff; p_region->p_next = NULL; p_region->p_cache = NULL; - p_region->fmt = *p_fmt; p_region->psz_text = NULL; p_region->p_style = NULL; - if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') ) - p_fmt->p_palette = p_region->fmt.p_palette = - malloc( sizeof(video_palette_t) ); - else p_fmt->p_palette = p_region->fmt.p_palette = NULL; - - p_region->picture.p_data_orig = NULL; - - if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') ) return p_region; + if( p_fmt->i_chroma == VLC_FOURCC('T','E','X','T') ) + return p_region; vout_AllocatePicture( p_this, &p_region->picture, p_fmt->i_chroma, p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect ); if( !p_region->picture.i_planes ) { - free( p_region ); free( p_fmt->p_palette ); + free( p_region ); return NULL; } @@ -264,39 +266,6 @@ subpicture_region_t *__spu_CreateRegion( vlc_object_t *p_this, return p_region; } -/** - * Make a subpicture region from an existing picture_t - * - * \param p_this vlc_object_t - * \param p_fmt the format that this subpicture region should have - * \param p_pic a pointer to the picture creating the region (not freed) - */ -subpicture_region_t *__spu_MakeRegion( vlc_object_t *p_this, - video_format_t *p_fmt, - picture_t *p_pic ) -{ - subpicture_region_t *p_region = malloc( sizeof(subpicture_region_t) ); - (void)p_this; - if( !p_region ) return NULL; - memset( p_region, 0, sizeof(subpicture_region_t) ); - p_region->i_alpha = 0xff; - p_region->p_next = 0; - p_region->p_cache = 0; - p_region->fmt = *p_fmt; - p_region->psz_text = 0; - p_region->p_style = NULL; - - if( p_fmt->i_chroma == VLC_FOURCC('Y','U','V','P') ) - p_fmt->p_palette = p_region->fmt.p_palette = - malloc( sizeof(video_palette_t) ); - else p_fmt->p_palette = p_region->fmt.p_palette = NULL; - - memcpy( &p_region->picture, p_pic, sizeof(picture_t) ); - p_region->picture.pf_release = RegionPictureRelease; - - return p_region; -} - /** * Destroy a subpicture region * @@ -305,11 +274,14 @@ subpicture_region_t *__spu_MakeRegion( vlc_object_t *p_this, */ void __spu_DestroyRegion( vlc_object_t *p_this, subpicture_region_t *p_region ) { - if( !p_region ) return; - if( p_region->picture.pf_release ) - p_region->picture.pf_release( &p_region->picture ); + if( !p_region ) + return; + + picture_Release( &p_region->picture ); + free( p_region->fmt.p_palette ); - if( p_region->p_cache ) __spu_DestroyRegion( p_this, p_region->p_cache ); + if( p_region->p_cache ) + __spu_DestroyRegion( p_this, p_region->p_cache ); free( p_region->psz_text ); free( p_region->psz_html ); @@ -390,8 +362,8 @@ subpicture_t *spu_CreateSubpicture( spu_t *p_spu ) memset( p_subpic, 0, sizeof(subpicture_t) ); p_subpic->i_status = RESERVED_SUBPICTURE; p_subpic->b_absolute = true; - p_subpic->b_pausable = false; p_subpic->b_fade = false; + p_subpic->b_subtitle = false; p_subpic->i_alpha = 0xFF; p_subpic->p_region = NULL; p_subpic->pf_render = NULL; @@ -400,7 +372,6 @@ subpicture_t *spu_CreateSubpicture( spu_t *p_spu ) vlc_mutex_unlock( &p_spu->subpicture_lock ); p_subpic->pf_create_region = __spu_CreateRegion; - p_subpic->pf_make_region = __spu_MakeRegion; p_subpic->pf_destroy_region = __spu_DestroyRegion; return p_subpic; @@ -456,6 +427,15 @@ void spu_DestroySubpicture( spu_t *p_spu, subpicture_t *p_subpic ) ***************************************************************************** * This function renders all sub picture units in the list. *****************************************************************************/ +static void FilterRelease( filter_t *p_filter ) +{ + if( p_filter->p_module ) + module_Unneed( p_filter, p_filter->p_module ); + + vlc_object_detach( p_filter ); + vlc_object_release( p_filter ); +} + static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_aspect ) { filter_t *p_blend; @@ -511,7 +491,7 @@ static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_heigh if( !p_blend->p_module ) p_blend->p_module = module_Need( p_blend, "video blending", 0, 0 ); } -static void SpuRenderCreateAndLoadText( spu_t *p_spu, int i_width, int i_height ) +static void SpuRenderCreateAndLoadText( spu_t *p_spu ) { filter_t *p_text; @@ -527,9 +507,9 @@ static void SpuRenderCreateAndLoadText( spu_t *p_spu, int i_width, int i_height es_format_Init( &p_text->fmt_out, VIDEO_ES, 0 ); p_text->fmt_out.video.i_width = - p_text->fmt_out.video.i_visible_width = i_width; + p_text->fmt_out.video.i_visible_width = 32; p_text->fmt_out.video.i_height = - p_text->fmt_out.video.i_visible_height = i_height; + p_text->fmt_out.video.i_visible_height = 32; p_text->pf_sub_buffer_new = spu_new_buffer; p_text->pf_sub_buffer_del = spu_del_buffer; @@ -577,7 +557,6 @@ static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, vlc_fourcc_t i_chroma return p_scale; } - static void SpuRenderCreateAndLoadScale( spu_t *p_spu ) { /* FIXME: We'll also be using it for YUVA and RGBA blending ... */ @@ -649,13 +628,94 @@ exit: p_region->i_align |= SUBPICTURE_RENDERED; } +/** + * A few scale functions helpers. + */ +typedef struct +{ + int w; + int h; +} spu_scale_t; + +static spu_scale_t spu_scale_create( int w, int h ) +{ + spu_scale_t s = { .w = w, .h = h }; + if( s.w <= 0 ) + s.w = SCALE_UNIT; + if( s.h <= 0 ) + s.h = SCALE_UNIT; + return s; +} +static spu_scale_t spu_scale_createq( int wn, int wd, int hn, int hd ) +{ + return spu_scale_create( wn * SCALE_UNIT / wd, + hn * SCALE_UNIT / hd ); +} +static int spu_scale_w( int v, const spu_scale_t s ) +{ + return v * s.w / SCALE_UNIT; +} +static int spu_scale_h( int v, const spu_scale_t s ) +{ + return v * s.h / SCALE_UNIT; +} + +/** + * Place a region + */ +static void SpuRegionPlace( int *pi_x, int *pi_y, + const video_format_t *p_fmt, + const subpicture_t *p_subpic, + const subpicture_region_t *p_region ) +{ + int i_delta_x = p_region->i_x; + int i_delta_y = p_region->i_y; + int i_x, i_y; + + if( p_region->i_align & SUBPICTURE_ALIGN_TOP ) + { + i_y = i_delta_y; + } + else if( p_region->i_align & SUBPICTURE_ALIGN_BOTTOM ) + { + i_y = p_fmt->i_height - p_region->fmt.i_height - i_delta_y; + } + else + { + i_y = p_fmt->i_height / 2 - p_region->fmt.i_height / 2; + } + + if( p_region->i_align & SUBPICTURE_ALIGN_LEFT ) + { + i_x = i_delta_x; + } + else if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT ) + { + i_x = p_fmt->i_width - p_region->fmt.i_width - i_delta_x; + } + else + { + i_x = p_fmt->i_width / 2 - p_region->fmt.i_width / 2; + } + + if( p_subpic->b_absolute ) + { + i_x = i_delta_x; + i_y = i_delta_y; + } + if( i_x < 0 ) + i_x = 0; + if( i_y < 0 ) + i_y = 0; + + *pi_x = i_x; + *pi_y = i_y; +} + static void SpuRenderRegion( spu_t *p_spu, - picture_t *p_pic_dst, picture_t *p_pic_src, + picture_t *p_pic_dst, subpicture_t *p_subpic, subpicture_region_t *p_region, - const int i_scale_width_orig, const int i_scale_height_orig, - const int pi_subpic_x[SCALE_SIZE], - const int pi_scale_width[SCALE_SIZE], - const int pi_scale_height[SCALE_SIZE], + const spu_scale_t scale_size, const video_format_t *p_fmt ) { video_format_t fmt_original; @@ -664,9 +724,6 @@ static void SpuRenderRegion( spu_t *p_spu, int i_fade_alpha; int i_x_offset; int i_y_offset; - int i_scale_idx; - int i_inv_scale_x; - int i_inv_scale_y; filter_t *p_scale; vlc_assert_locked( &p_spu->subpicture_lock ); @@ -675,7 +732,7 @@ static void SpuRenderRegion( spu_t *p_spu, b_rerender_text = false; if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') ) { - SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, __MIN(i_scale_width_orig, i_scale_height_orig) ); + SpuRenderText( p_spu, &b_rerender_text, p_subpic, p_region, SCALE_UNIT ); b_restore_format = b_rerender_text; /* Check if the rendering has failed ... */ @@ -683,23 +740,6 @@ static void SpuRenderRegion( spu_t *p_spu, goto exit; } - if( p_region->i_align & SUBPICTURE_RENDERED ) - { - /* We are using a region which come from rendered text */ - i_scale_idx = SCALE_TEXT; - i_inv_scale_x = i_scale_width_orig; - i_inv_scale_y = i_scale_height_orig; - } - else - { - i_scale_idx = SCALE_DEFAULT; - i_inv_scale_x = 1000; - i_inv_scale_y = 1000; - } - - i_x_offset = (p_region->i_x + pi_subpic_x[ i_scale_idx ]) * i_inv_scale_x / 1000; - i_y_offset = (p_region->i_y + p_subpic->i_y) * i_inv_scale_y / 1000; - /* Force palette if requested * FIXME b_force_palette and b_force_crop are applied to all subpictures using palette * instead of only the right one (being the dvd spu). @@ -724,12 +764,10 @@ static void SpuRenderRegion( spu_t *p_spu, p_scale = p_spu->p_scale; if( p_scale && - ( ( pi_scale_width[i_scale_idx] > 0 && pi_scale_width[i_scale_idx] != 1000 ) || - ( pi_scale_height[i_scale_idx] > 0 && pi_scale_height[i_scale_idx] != 1000 ) || - ( b_force_palette ) ) ) + ( scale_size.w != SCALE_UNIT || scale_size.h != SCALE_UNIT || b_force_palette ) ) { - const unsigned i_dst_width = p_region->fmt.i_width * pi_scale_width[i_scale_idx] / 1000; - const unsigned i_dst_height = p_region->fmt.i_height * pi_scale_height[i_scale_idx] / 1000; + const unsigned i_dst_width = spu_scale_w( p_region->fmt.i_width, scale_size ); + const unsigned i_dst_height = spu_scale_h( p_region->fmt.i_height, scale_size ); /* Destroy if cache is unusable */ if( p_region->p_cache ) @@ -768,13 +806,13 @@ static void SpuRenderRegion( spu_t *p_spu, p_scale->fmt_out.video.i_height = i_dst_height; p_scale->fmt_out.video.i_visible_width = - p_region->fmt.i_visible_width * pi_scale_width[ i_scale_idx ] / 1000; + spu_scale_w( p_region->fmt.i_visible_width, scale_size ); p_scale->fmt_out.video.i_visible_height = - p_region->fmt.i_visible_height * pi_scale_height[ i_scale_idx ] / 1000; + spu_scale_h( p_region->fmt.i_visible_height, scale_size ); p_region->p_cache->fmt = p_scale->fmt_out.video; - p_region->p_cache->i_x = p_region->i_x * pi_scale_width[ i_scale_idx ] / 1000; - p_region->p_cache->i_y = p_region->i_y * pi_scale_height[ i_scale_idx ] / 1000; + p_region->p_cache->i_x = spu_scale_w( p_region->i_x, scale_size ); + p_region->p_cache->i_y = spu_scale_h( p_region->i_y, scale_size ); p_region->p_cache->i_align = p_region->i_align; p_region->p_cache->i_alpha = p_region->i_alpha; @@ -783,11 +821,18 @@ static void SpuRenderRegion( spu_t *p_spu, p_pic = p_scale->pf_video_filter( p_scale, &p_region->p_cache->picture ); else msg_Err( p_spu, "scaling failed (module not loaded)" ); + if( p_pic ) { p_region->p_cache->picture = *p_pic; free( p_pic ); } + else + { + p_subpic->pf_destroy_region( VLC_OBJECT(p_spu), + p_region->p_cache ); + p_region->p_cache = NULL; + } } /* And use the scaled picture */ @@ -798,46 +843,14 @@ static void SpuRenderRegion( spu_t *p_spu, } } - if( p_region->i_align & SUBPICTURE_ALIGN_BOTTOM ) - { - i_y_offset = p_fmt->i_height - p_region->fmt.i_height - - (p_subpic->i_y + p_region->i_y) * i_inv_scale_y / 1000; - } - else if ( !(p_region->i_align & SUBPICTURE_ALIGN_TOP) ) - { - i_y_offset = p_fmt->i_height / 2 - p_region->fmt.i_height / 2; - } - - if( p_region->i_align & SUBPICTURE_ALIGN_RIGHT ) - { - i_x_offset = p_fmt->i_width - p_region->fmt.i_width - - (pi_subpic_x[ i_scale_idx ] + p_region->i_x) - * i_inv_scale_x / 1000; - } - else if ( !(p_region->i_align & SUBPICTURE_ALIGN_LEFT) ) - { - i_x_offset = p_fmt->i_width / 2 - p_region->fmt.i_width / 2; - } - - if( p_subpic->b_absolute ) - { - i_x_offset = (p_region->i_x + - pi_subpic_x[ i_scale_idx ] * - pi_scale_width[ i_scale_idx ] / 1000) - * i_inv_scale_x / 1000; - i_y_offset = (p_region->i_y + - p_subpic->i_y * pi_scale_height[ i_scale_idx ] / 1000) - * i_inv_scale_y / 1000; - - } - - i_x_offset = __MAX( i_x_offset, 0 ); - i_y_offset = __MAX( i_y_offset, 0 ); + /* */ + SpuRegionPlace( &i_x_offset, &i_y_offset, + p_fmt, p_subpic, p_region ); if( p_spu->i_margin != 0 && !b_force_crop ) { int i_diff = 0; - int i_low = (i_y_offset - p_spu->i_margin) * i_inv_scale_y / 1000; + int i_low = i_y_offset - p_spu->i_margin; int i_high = i_low + p_region->fmt.i_height; /* crop extra margin to keep within bounds */ @@ -845,21 +858,17 @@ static void SpuRenderRegion( spu_t *p_spu, i_diff = i_low; if( i_high > (int)p_fmt->i_height ) i_diff = i_high - p_fmt->i_height; - i_y_offset -= ( p_spu->i_margin * i_inv_scale_y / 1000 + i_diff ); + i_y_offset -= p_spu->i_margin + i_diff; } /* Force cropping if requested */ if( b_force_crop ) { video_format_t *p_fmt = &p_region->fmt; - int i_crop_x = p_spu->i_crop_x * pi_scale_width[ i_scale_idx ] / 1000 - * i_inv_scale_x / 1000; - int i_crop_y = p_spu->i_crop_y * pi_scale_height[ i_scale_idx ] / 1000 - * i_inv_scale_y / 1000; - int i_crop_width = p_spu->i_crop_width * pi_scale_width[ i_scale_idx ] / 1000 - * i_inv_scale_x / 1000; - int i_crop_height = p_spu->i_crop_height * pi_scale_height[ i_scale_idx ] / 1000 - * i_inv_scale_y / 1000; + int i_crop_x = spu_scale_w( p_spu->i_crop_x, scale_size ); + int i_crop_y = spu_scale_h( p_spu->i_crop_y, scale_size ); + int i_crop_width = spu_scale_w( p_spu->i_crop_width, scale_size ); + int i_crop_height= spu_scale_h( p_spu->i_crop_height,scale_size ); /* Find the intersection */ if( i_crop_x + i_crop_width <= i_x_offset || @@ -914,7 +923,7 @@ static void SpuRenderRegion( spu_t *p_spu, if( p_spu->p_blend->p_module ) { p_spu->p_blend->pf_video_blend( p_spu->p_blend, p_pic_dst, - p_pic_src, &p_region->picture, i_x_offset, i_y_offset, + &p_region->picture, i_x_offset, i_y_offset, i_fade_alpha * p_subpic->i_alpha * p_region->i_alpha / 65025 ); } else @@ -940,67 +949,41 @@ exit: p_region->fmt = fmt_original; } -void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, - picture_t *p_pic_dst, picture_t *p_pic_src, - subpicture_t *p_subpic, - int i_scale_width_orig, int i_scale_height_orig ) +void spu_RenderSubpictures( spu_t *p_spu, + picture_t *p_pic_dst, video_format_t *p_fmt_dst, + subpicture_t *p_subpic_list, + const video_format_t *p_fmt_src ) { + video_format_t *p_fmt = p_fmt_dst; + const mtime_t i_current_date = mdate(); int i_source_video_width; int i_source_video_height; - subpicture_t *p_subpic_v; + subpicture_t *p_subpic; /* Get lock */ vlc_mutex_lock( &p_spu->subpicture_lock ); - for( p_subpic_v = p_subpic; - p_subpic_v != NULL && p_subpic_v->i_status != FREE_SUBPICTURE; - p_subpic_v = p_subpic_v->p_next ) + /* Be sure we have at least 1 picture to process */ + if( !p_subpic_list || p_subpic_list->i_status == FREE_SUBPICTURE ) { - if( p_subpic_v->pf_pre_render ) - { - p_subpic_v->pf_pre_render( p_fmt, p_spu, p_subpic_v, mdate() ); - } + vlc_mutex_unlock( &p_spu->subpicture_lock ); + return; } - if( i_scale_width_orig <= 0 ) - i_scale_width_orig = 1000; - if( i_scale_height_orig <= 0 ) - i_scale_height_orig = 1000; + i_source_video_width = p_fmt_src->i_width; + i_source_video_height = p_fmt_src->i_height; - i_source_video_width = p_fmt->i_width * 1000 / i_scale_width_orig; - i_source_video_height = p_fmt->i_height * 1000 / i_scale_height_orig; - - /* Check i_status again to make sure spudec hasn't destroyed the subpic */ - for( ; ( p_subpic != NULL ) && ( p_subpic->i_status != FREE_SUBPICTURE ); p_subpic = p_subpic->p_next ) + /* */ + for( p_subpic = p_subpic_list; + p_subpic != NULL && p_subpic->i_status != FREE_SUBPICTURE; /* Check again status (as we where unlocked) */ + p_subpic = p_subpic->p_next ) { - subpicture_region_t *p_region; - int pi_scale_width[ SCALE_SIZE ]; - int pi_scale_height[ SCALE_SIZE ]; - int pi_subpic_x[ SCALE_SIZE ]; - int k; - - /* If the source video and subtitles stream agree on the size of - * the video then disregard all further references to the subtitle - * stream. - */ - if( ( i_source_video_height == p_subpic->i_original_picture_height ) && - ( i_source_video_width == p_subpic->i_original_picture_width ) ) - { - /* FIXME this looks wrong */ - p_subpic->i_original_picture_height = 0; - p_subpic->i_original_picture_width = 0; - } - - for( k = 0; k < SCALE_SIZE ; k++ ) - pi_subpic_x[ k ] = p_subpic->i_x; + /* */ + if( p_subpic->pf_pre_render ) + p_subpic->pf_pre_render( p_fmt, p_spu, p_subpic ); if( p_subpic->pf_update_regions ) { - /* FIXME that part look like crap too if there is more than 1 region */ - - if( p_subpic->p_region ) - spu_DestroyRegion( p_spu, p_subpic->p_region ); - /* TODO do not reverse the scaling that was done before calling * spu_RenderSubpictures, just pass it along (or do it inside * spu_RenderSubpictures) */ @@ -1010,113 +993,60 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, fmt_org.i_height = fmt_org.i_visible_height = i_source_video_height; - p_subpic->p_region = p_subpic->pf_update_regions( &fmt_org, p_spu, p_subpic, mdate() ); + p_subpic->pf_update_regions( &fmt_org, p_spu, p_subpic, i_current_date ); } + } - /* */ - p_region = p_subpic->p_region; - if( !p_region ) - continue; - - /* Create the blending module */ - if( !p_spu->p_blend ) - SpuRenderCreateBlend( p_spu, p_fmt->i_chroma, p_fmt->i_aspect ); + /* Create the blending module */ + if( !p_spu->p_blend ) + SpuRenderCreateBlend( p_spu, p_fmt->i_chroma, p_fmt->i_aspect ); - /* Load the text rendering module; it is possible there is a - * text region somewhere in the subpicture other than the first - * element in the region list, so just load it anyway as we'll - * probably want it sooner or later. */ - if( !p_spu->p_text ) - SpuRenderCreateAndLoadText( p_spu, p_fmt->i_width, p_fmt->i_height ); + /* */ + for( p_subpic = p_subpic_list; ; p_subpic = p_subpic->p_next ) + { + subpicture_region_t *p_region; - if( p_spu->p_text ) - { - subpicture_region_t *p_text_region = p_subpic->p_region; - - /* Only overwrite the size fields if the region is still in - * pre-rendered TEXT format. We have to traverse the subregion - * list because if more than one subregion is present, the text - * region isn't guarentteed to be the first in the list, and - * only text regions use this flag. All of this effort assists - * with the rescaling of text that has been rendered at native - * resolution, rather than video resolution. - */ - while( p_text_region && - p_text_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') ) - { - p_text_region = p_text_region->p_next; - } + if( !p_subpic || p_subpic->i_status == FREE_SUBPICTURE ) + break; - if( p_text_region && - ( ( p_text_region->i_align & SUBPICTURE_RENDERED ) == 0 ) ) - { - if( p_subpic->i_original_picture_height > 0 && - p_subpic->i_original_picture_width > 0 ) - { - p_spu->p_text->fmt_out.video.i_width = - p_spu->p_text->fmt_out.video.i_visible_width = - p_subpic->i_original_picture_width; - p_spu->p_text->fmt_out.video.i_height = - p_spu->p_text->fmt_out.video.i_visible_height = - p_subpic->i_original_picture_height; - } - else - { - p_spu->p_text->fmt_out.video.i_width = - p_spu->p_text->fmt_out.video.i_visible_width = - p_fmt->i_width; - p_spu->p_text->fmt_out.video.i_height = - p_spu->p_text->fmt_out.video.i_visible_height = - p_fmt->i_height; - } - } + if( !p_subpic->p_region ) + continue; - /* XXX for text: - * scale[] allows to pass from rendered size (by text module) to video output size */ - pi_scale_width[SCALE_TEXT] = p_fmt->i_width * 1000 / - p_spu->p_text->fmt_out.video.i_width; - pi_scale_height[SCALE_TEXT]= p_fmt->i_height * 1000 / - p_spu->p_text->fmt_out.video.i_height; - } - else + /* FIXME when possible use a better rendering size than source size + * (max of display size and source size for example) FIXME */ + int i_render_width = p_subpic->i_original_picture_width; + int i_render_height = p_subpic->i_original_picture_height; + if( !i_render_width || !i_render_height ) { - /* Just set a value to avoid using invalid memory while looping over the array */ - pi_scale_width[SCALE_TEXT] = - pi_scale_height[SCALE_TEXT]= 1000; - } + if( i_render_width != 0 || i_render_height != 0 ) + msg_Err( p_spu, "unsupported original picture size %dx%d", + i_render_width, i_render_height ); - /* XXX for default: - * scale[] allows to pass from native (either video or original) size to output size */ - - if( p_subpic->i_original_picture_height > 0 && - p_subpic->i_original_picture_width > 0 ) - { - pi_scale_width[SCALE_DEFAULT] = p_fmt->i_width * 1000 / p_subpic->i_original_picture_width; - pi_scale_height[SCALE_DEFAULT] = p_fmt->i_height * 1000 / p_subpic->i_original_picture_height; - } - else - { - pi_scale_width[ SCALE_DEFAULT ] = i_scale_width_orig; - pi_scale_height[ SCALE_DEFAULT ] = i_scale_height_orig; + i_render_width = i_source_video_width; + i_render_height = i_source_video_height; } - for( k = 0; k < SCALE_SIZE ; k++ ) + if( p_spu->p_text ) { - /* Case of both width and height being specified has been dealt - * with above by instead rendering to an output pane of the - * explicit dimensions specified - we don't need to scale it. - */ - if( p_subpic->i_original_picture_height > 0 && - p_subpic->i_original_picture_width <= 0 ) - { - pi_scale_height[ k ] = pi_scale_height[ k ] * i_source_video_height / - p_subpic->i_original_picture_height; - pi_scale_width[ k ] = pi_scale_width[ k ] * i_source_video_height / - p_subpic->i_original_picture_height; - } + p_spu->p_text->fmt_out.video.i_width = + p_spu->p_text->fmt_out.video.i_visible_width = i_render_width; + + p_spu->p_text->fmt_out.video.i_height = + p_spu->p_text->fmt_out.video.i_visible_height = i_render_height; } - /* Set default subpicture aspect ratio */ + /* Compute scaling from picture to source size */ + spu_scale_t scale = spu_scale_createq( i_source_video_width, i_render_width, + i_source_video_height, i_render_height ); + + /* Update scaling from source size to display size(p_fmt) */ + scale.w = scale.w * p_fmt->i_width / i_source_video_width; + scale.h = scale.h * p_fmt->i_height / i_source_video_height; + + /* Set default subpicture aspect ratio + * FIXME if we only handle 1 aspect ratio per picture, why is it set per + * region ? */ + p_region = p_subpic->p_region; if( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den ) { if( p_region->fmt.i_aspect != 0 ) @@ -1132,41 +1062,26 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, } /* Take care of the aspect ratio */ - if( ( p_region->fmt.i_sar_num * p_fmt->i_sar_den ) != - ( p_region->fmt.i_sar_den * p_fmt->i_sar_num ) ) + if( p_region->fmt.i_sar_num * p_fmt->i_sar_den != + p_region->fmt.i_sar_den * p_fmt->i_sar_num ) { - for( k = 0; k < SCALE_SIZE; k++ ) - { - pi_scale_width[k] = pi_scale_width[ k ] * - (int64_t)p_region->fmt.i_sar_num * p_fmt->i_sar_den / - p_region->fmt.i_sar_den / p_fmt->i_sar_num; - - pi_subpic_x[k] = p_subpic->i_x * pi_scale_width[ k ] / 1000; - } + /* FIXME FIXME what about region->i_x/i_y ? */ + scale.w = scale.w * + (int64_t)p_region->fmt.i_sar_num * p_fmt->i_sar_den / + p_region->fmt.i_sar_den / p_fmt->i_sar_num; } - /* Load the scaling module when needed */ - if( !p_spu->p_scale ) + /* Render all regions */ + for( p_region = p_subpic->p_region; p_region != NULL; p_region = p_region->p_next ) { - bool b_scale_used = false; - - for( k = 0; k < SCALE_SIZE; k++ ) - { - const int i_scale_w = pi_scale_width[k]; - const int i_scale_h = pi_scale_height[k]; - if( ( i_scale_w > 0 && i_scale_w != 1000 ) || ( i_scale_h > 0 && i_scale_h != 1000 ) ) - b_scale_used = true; - } + /* Check scale validity */ + if( scale.w <= 0 || scale.h <= 0 ) + continue; - if( b_scale_used ) - SpuRenderCreateAndLoadScale( p_spu ); + /* */ + SpuRenderRegion( p_spu, p_pic_dst, p_subpic, p_region, + scale, p_fmt ); } - - for( ; p_region != NULL; p_region = p_region->p_next ) - SpuRenderRegion( p_spu, p_pic_dst, p_pic_src, - p_subpic, p_region, i_scale_width_orig, i_scale_height_orig, - pi_subpic_x, pi_scale_width, pi_scale_height, - p_fmt ); } vlc_mutex_unlock( &p_spu->subpicture_lock ); @@ -1184,12 +1099,10 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, * more difficult to guess if a subpicture has to be rendered or not. *****************************************************************************/ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, - bool b_paused ) + bool b_paused, bool b_subtitle_only ) { - int i_index, i_channel; + int i_channel; subpicture_t *p_subpic = NULL; - subpicture_t *p_ephemer; - mtime_t ephemer_date; /* Run subpicture filters */ filter_chain_SubFilter( p_spu->p_chain, display_date ); @@ -1198,32 +1111,33 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, * ends with NULL since p_subpic was initialized to NULL. */ for( i_channel = 0; i_channel < p_spu->i_channel; i_channel++ ) { - p_ephemer = 0; - ephemer_date = 0; + subpicture_t *p_ephemer = NULL; + mtime_t ephemer_date = 0; + int i_index; for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ ) { - if( p_spu->p_subpicture[i_index].i_channel != i_channel || - p_spu->p_subpicture[i_index].i_status != READY_SUBPICTURE ) + subpicture_t *p_current = &p_spu->p_subpicture[i_index]; + + if( p_current->i_channel != i_channel || + p_current->i_status != READY_SUBPICTURE || + ( b_subtitle_only && !p_current->b_subtitle ) ) { continue; } if( display_date && - display_date < p_spu->p_subpicture[i_index].i_start ) + display_date < p_current->i_start ) { /* Too early, come back next monday */ continue; } - if( p_spu->p_subpicture[i_index].i_start > ephemer_date ) - ephemer_date = p_spu->p_subpicture[i_index].i_start; + if( p_current->i_start > ephemer_date ) + ephemer_date = p_current->i_start; - if( display_date > p_spu->p_subpicture[i_index].i_stop && - ( !p_spu->p_subpicture[i_index].b_ephemer || - p_spu->p_subpicture[i_index].i_stop > - p_spu->p_subpicture[i_index].i_start ) && - !( p_spu->p_subpicture[i_index].b_pausable && - b_paused ) ) + if( display_date > p_current->i_stop && + ( !p_current->b_ephemer || p_current->i_stop > p_current->i_start ) && + !( p_current->b_subtitle && b_paused ) ) /* XXX Assume that subtitle are pausable */ { /* Too late, destroy the subpic */ spu_DestroySubpicture( p_spu, &p_spu->p_subpicture[i_index] ); @@ -1231,16 +1145,16 @@ subpicture_t *spu_SortSubpictures( spu_t *p_spu, mtime_t display_date, } /* If this is an ephemer subpic, add it to our list */ - if( p_spu->p_subpicture[i_index].b_ephemer ) + if( p_current->b_ephemer ) { - p_spu->p_subpicture[i_index].p_next = p_ephemer; - p_ephemer = &p_spu->p_subpicture[i_index]; + p_current->p_next = p_ephemer; + p_ephemer = p_current; continue; } - p_spu->p_subpicture[i_index].p_next = p_subpic; - p_subpic = &p_spu->p_subpicture[i_index]; + p_current->p_next = p_subpic; + p_subpic = p_current; } /* If we found ephemer subpictures, check if they have to be @@ -1320,7 +1234,10 @@ static int spu_vaControlDefault( spu_t *p_spu, int i_query, va_list args ) { case SPU_CHANNEL_REGISTER: pi = (int *)va_arg( args, int * ); - if( pi ) *pi = p_spu->i_channel++; + vlc_mutex_lock( &p_spu->subpicture_lock ); + if( pi ) + *pi = p_spu->i_channel++; + vlc_mutex_unlock( &p_spu->subpicture_lock ); break; case SPU_CHANNEL_CLEAR: @@ -1416,16 +1333,17 @@ static void sub_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) static subpicture_t *spu_new_buffer( filter_t *p_filter ) { - (void)p_filter; - subpicture_t *p_subpic = (subpicture_t *)malloc(sizeof(subpicture_t)); - if( !p_subpic ) return NULL; - memset( p_subpic, 0, sizeof(subpicture_t) ); + subpicture_t *p_subpic = calloc( 1, sizeof(subpicture_t) ); + if( !p_subpic ) + return NULL; + p_subpic->b_absolute = true; + p_subpic->i_alpha = 0xFF; p_subpic->pf_create_region = __spu_CreateRegion; - p_subpic->pf_make_region = __spu_MakeRegion; p_subpic->pf_destroy_region = __spu_DestroyRegion; + VLC_UNUSED(p_filter); return p_subpic; } @@ -1443,41 +1361,27 @@ static void spu_del_buffer( filter_t *p_filter, subpicture_t *p_subpic ) static picture_t *spu_new_video_buffer( filter_t *p_filter ) { - picture_t *p_picture = malloc( sizeof(picture_t) ); - if( !p_picture ) return NULL; - if( vout_AllocatePicture( p_filter, p_picture, - p_filter->fmt_out.video.i_chroma, - p_filter->fmt_out.video.i_width, - p_filter->fmt_out.video.i_height, - p_filter->fmt_out.video.i_aspect ) - != VLC_SUCCESS ) - { - free( p_picture ); - return NULL; - } + const video_format_t *p_fmt = &p_filter->fmt_out.video; - p_picture->pf_release = RegionPictureRelease; - - return p_picture; + VLC_UNUSED(p_filter); + return picture_New( p_fmt->i_chroma, + p_fmt->i_width, p_fmt->i_height, p_fmt->i_aspect ); } -static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_pic ) +static void spu_del_video_buffer( filter_t *p_filter, picture_t *p_picture ) { - (void)p_filter; - if( p_pic ) - { - free( p_pic->p_data_orig ); - free( p_pic ); - } + VLC_UNUSED(p_filter); + picture_Release( p_picture ); } static int SubFilterCallback( vlc_object_t *p_object, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + spu_t *p_spu = p_data; + VLC_UNUSED(p_object); VLC_UNUSED(oldval); VLC_UNUSED(newval); VLC_UNUSED(psz_var); - spu_t *p_spu = (spu_t *)p_data; vlc_mutex_lock( &p_spu->subpicture_lock ); filter_chain_Reset( p_spu->p_chain, NULL, NULL ); spu_ParseChain( p_spu ); @@ -1485,16 +1389,17 @@ static int SubFilterCallback( vlc_object_t *p_object, char const *psz_var, return VLC_SUCCESS; } -static int sub_filter_allocation_init( filter_t *p_filter, void *p_data ) +static int SubFilterAllocationInit( filter_t *p_filter, void *p_data ) { - spu_t *p_spu = (spu_t *)p_data; + spu_t *p_spu = p_data; + + filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) ); + if( !p_sys ) + return VLC_EGENERIC; p_filter->pf_sub_buffer_new = sub_new_buffer; p_filter->pf_sub_buffer_del = sub_del_buffer; - filter_owner_sys_t *p_sys = malloc( sizeof(filter_owner_sys_t) ); - if( !p_sys ) return VLC_EGENERIC; - p_filter->p_owner = p_sys; spu_Control( p_spu, SPU_CHANNEL_REGISTER, &p_sys->i_channel ); p_sys->p_spu = p_spu; @@ -1502,9 +1407,11 @@ static int sub_filter_allocation_init( filter_t *p_filter, void *p_data ) return VLC_SUCCESS; } -static void sub_filter_allocation_clear( filter_t *p_filter ) +static void SubFilterAllocationClean( filter_t *p_filter ) { filter_owner_sys_t *p_sys = p_filter->p_owner; + SpuClearChannel( p_sys->p_spu, p_sys->i_channel, true ); free( p_filter->p_owner ); } +