X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvout_subpictures.c;h=723df0de363d0e931dfe6fa1edb4d9348a0c30f8;hb=de587c237065de4696d9d035d0504cdf34990d87;hp=45e6a4b0e9fc7cd63170f2372900daf39e4ba9bb;hpb=f8a7b336e817e964e989519af4e1fe22df7e4861;p=vlc diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index 45e6a4b0e9..723df0de36 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -73,6 +73,15 @@ enum { SCALE_SIZE }; +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 ); +} + /** * Creates the subpicture unit * @@ -92,6 +101,7 @@ spu_t *__spu_Create( vlc_object_t *p_this ) p_spu->p_blend = NULL; p_spu->p_text = NULL; p_spu->p_scale = NULL; + p_spu->p_scale_yuvp = NULL; p_spu->pf_control = spu_vaControlDefault; /* Register the default subpicture channel */ @@ -162,31 +172,16 @@ void spu_Destroy( spu_t *p_spu ) } if( p_spu->p_blend ) - { - if( p_spu->p_blend->p_module ) - module_Unneed( p_spu->p_blend, p_spu->p_blend->p_module ); - - vlc_object_detach( p_spu->p_blend ); - vlc_object_release( p_spu->p_blend ); - } + FilterRelease( p_spu->p_blend ); if( p_spu->p_text ) - { - if( p_spu->p_text->p_module ) - module_Unneed( p_spu->p_text, p_spu->p_text->p_module ); + FilterRelease( p_spu->p_text ); - vlc_object_detach( p_spu->p_text ); - vlc_object_release( p_spu->p_text ); - } + if( p_spu->p_scale_yuvp ) + FilterRelease( p_spu->p_scale_yuvp ); if( p_spu->p_scale ) - { - if( p_spu->p_scale->p_module ) - module_Unneed( p_spu->p_scale, p_spu->p_scale->p_module ); - - vlc_object_detach( p_spu->p_scale ); - vlc_object_release( p_spu->p_scale ); - } + FilterRelease( p_spu->p_scale ); filter_chain_Delete( p_spu->p_chain ); @@ -230,6 +225,8 @@ 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; } subpicture_region_t *__spu_CreateRegion( vlc_object_t *p_this, video_format_t *p_fmt ) @@ -488,14 +485,14 @@ static void SpuRenderCreateBlend( spu_t *p_spu, vlc_fourcc_t i_chroma, int i_asp /* */ vlc_object_attach( p_blend, p_spu ); } -static void SpuRenderUpdateBlend( spu_t *p_spu, const video_format_t *p_vfmt ) +static void SpuRenderUpdateBlend( spu_t *p_spu, int i_out_width, int i_out_height, const video_format_t *p_in_fmt ) { filter_t *p_blend = p_spu->p_blend; assert( p_blend ); /* */ - if( p_blend->p_module && p_blend->fmt_in.video.i_chroma != p_vfmt->i_chroma ) + if( p_blend->p_module && p_blend->fmt_in.video.i_chroma != p_in_fmt->i_chroma ) { /* The chroma is not the same, we need to reload the blend module * XXX to match the old behaviour just test !p_blend->fmt_in.video.i_chroma */ @@ -504,7 +501,13 @@ static void SpuRenderUpdateBlend( spu_t *p_spu, const video_format_t *p_vfmt ) } /* */ - p_blend->fmt_in.video = *p_vfmt; + p_blend->fmt_in.video = *p_in_fmt; + + /* */ + p_blend->fmt_out.video.i_width = + p_blend->fmt_out.video.i_visible_width = i_out_width; + p_blend->fmt_out.video.i_height = + p_blend->fmt_out.video.i_visible_height = i_out_height; /* */ if( !p_blend->p_module ) @@ -549,39 +552,44 @@ static void SpuRenderCreateAndLoadText( spu_t *p_spu, int i_width, int i_height p_text->p_module = module_Need( p_text, "text renderer", NULL, false ); } -static void SpuRenderCreateAndLoadScale( spu_t *p_spu ) +static filter_t *CreateAndLoadScale( vlc_object_t *p_obj, vlc_fourcc_t i_chroma ) { - /* FIXME: We'll also be using it for YUVA and RGBA blending ... */ - const vlc_fourcc_t i_dummy_chroma = VLC_FOURCC('Y','U','V','P'); - filter_t *p_scale; - assert( !p_spu->p_scale ); - - p_spu->p_scale = - p_scale = vlc_custom_create( p_spu, sizeof(filter_t), - VLC_OBJECT_GENERIC, "scale" ); + p_scale = vlc_custom_create( p_obj, sizeof(filter_t), + VLC_OBJECT_GENERIC, "scale" ); if( !p_scale ) - return; + return NULL; es_format_Init( &p_scale->fmt_in, VIDEO_ES, 0 ); - p_scale->fmt_in.video.i_chroma = i_dummy_chroma; + p_scale->fmt_in.video.i_chroma = i_chroma; p_scale->fmt_in.video.i_width = p_scale->fmt_in.video.i_height = 32; es_format_Init( &p_scale->fmt_out, VIDEO_ES, 0 ); - p_scale->fmt_out.video.i_chroma = i_dummy_chroma; + p_scale->fmt_out.video.i_chroma = i_chroma; p_scale->fmt_out.video.i_width = p_scale->fmt_out.video.i_height = 16; p_scale->pf_vout_buffer_new = spu_new_video_buffer; p_scale->pf_vout_buffer_del = spu_del_video_buffer; - vlc_object_attach( p_scale, p_spu ); - p_scale->p_module = module_Need( p_spu->p_scale, "video filter2", 0, 0 ); + vlc_object_attach( p_scale, p_obj ); + p_scale->p_module = module_Need( p_scale, "video filter2", 0, 0 ); + + return p_scale; +} + +static void SpuRenderCreateAndLoadScale( spu_t *p_spu ) +{ + /* FIXME: We'll also be using it for YUVA and RGBA blending ... */ + + assert( !p_spu->p_scale ); + assert( !p_spu->p_scale_yuvp ); + p_spu->p_scale = CreateAndLoadScale( VLC_OBJECT(p_spu), VLC_FOURCC('Y','U','V','A') ); + p_spu->p_scale_yuvp = p_spu->p_scale_yuvp = CreateAndLoadScale( VLC_OBJECT(p_spu), VLC_FOURCC('Y','U','V','P') ); } -//__MIN(i_scale_width_orig, i_scale_height_orig) ); static void SpuRenderText( spu_t *p_spu, bool *pb_rerender_text, subpicture_t *p_subpic, subpicture_region_t *p_region, int i_min_scale_ratio ) { @@ -652,23 +660,30 @@ static void SpuRenderRegion( spu_t *p_spu, const int pi_scale_height[SCALE_SIZE], const video_format_t *p_fmt ) { - video_format_t orig_fmt; + video_format_t fmt_original; bool b_rerender_text; + bool b_restore_format = false; 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; - orig_fmt = p_region->fmt; + vlc_assert_locked( &p_spu->subpicture_lock ); + + fmt_original = p_region->fmt; 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) ); + b_restore_format = b_rerender_text; - /* From now on, we can only process non text data */ - if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') ) - goto exit; + /* Check if the rendering has failed ... */ + if( p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T') ) + goto exit; + } if( p_region->i_align & SUBPICTURE_RENDERED ) { @@ -687,80 +702,102 @@ static void SpuRenderRegion( spu_t *p_spu, 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 */ - if( p_spu->b_force_palette && - p_region->fmt.i_chroma == VLC_FOURCC('Y','U','V','P') ) + /* 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). + */ + const bool b_using_palette = p_region->fmt.i_chroma == VLC_FOURCC('Y','U','V','P'); + const bool b_force_palette = b_using_palette && p_spu->b_force_palette; + const bool b_force_crop = b_force_palette && p_spu->b_force_crop; + + if( b_force_palette ) { /* It looks so wrong I won't comment * p_palette->palette is [256][4] with a int i_entries * p_spu->palette is [4][4] * */ - memcpy( p_region->fmt.p_palette->palette, p_spu->palette, 16 ); + p_region->fmt.p_palette->i_entries = 4; + memcpy( p_region->fmt.p_palette->palette, p_spu->palette, 4*sizeof(uint32_t) ); } - /* Scale SPU if necessary */ - if( p_region->p_cache ) + if( b_using_palette ) + p_scale = p_spu->p_scale_yuvp; + else + 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 ) ) ) { - if( pi_scale_width[ i_scale_idx ] * p_region->fmt.i_width / 1000 != - p_region->p_cache->fmt.i_width || - pi_scale_height[ i_scale_idx ] * p_region->fmt.i_height / 1000 != - p_region->p_cache->fmt.i_height ) + 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; + + /* Destroy if cache is unusable */ + if( p_region->p_cache ) { - p_subpic->pf_destroy_region( VLC_OBJECT(p_spu), - p_region->p_cache ); - p_region->p_cache = NULL; + if( p_region->p_cache->fmt.i_width != i_dst_width || + p_region->p_cache->fmt.i_height != i_dst_height || + b_force_palette ) + { + p_subpic->pf_destroy_region( VLC_OBJECT(p_spu), + p_region->p_cache ); + p_region->p_cache = NULL; + } } - } - if( p_spu->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 ) ) ) - { + /* Scale if needed into cache */ if( !p_region->p_cache ) { picture_t *p_pic; - p_spu->p_scale->fmt_in.video = p_region->fmt; - p_spu->p_scale->fmt_out.video = p_region->fmt; + p_scale->fmt_in.video = p_region->fmt; + p_scale->fmt_out.video = p_region->fmt; p_region->p_cache = p_subpic->pf_create_region( VLC_OBJECT(p_spu), - &p_spu->p_scale->fmt_out.video ); - if( p_spu->p_scale->fmt_out.video.p_palette ) - *p_spu->p_scale->fmt_out.video.p_palette = - *p_region->fmt.p_palette; + &p_scale->fmt_out.video ); p_region->p_cache->p_next = p_region->p_next; + if( p_scale->fmt_out.video.p_palette ) + *p_scale->fmt_out.video.p_palette = + *p_region->fmt.p_palette; + vout_CopyPicture( p_spu, &p_region->p_cache->picture, &p_region->picture ); - p_spu->p_scale->fmt_out.video.i_width = - p_region->fmt.i_width * pi_scale_width[ i_scale_idx ] / 1000; - p_spu->p_scale->fmt_out.video.i_visible_width = + p_scale->fmt_out.video.i_width = i_dst_width; + 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; - p_spu->p_scale->fmt_out.video.i_height = - p_region->fmt.i_height * pi_scale_height[ i_scale_idx ] / 1000; - p_spu->p_scale->fmt_out.video.i_visible_height = + p_scale->fmt_out.video.i_visible_height = p_region->fmt.i_visible_height * pi_scale_height[ i_scale_idx ] / 1000; - p_region->p_cache->fmt = p_spu->p_scale->fmt_out.video; + + 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_align = p_region->i_align; p_region->p_cache->i_alpha = p_region->i_alpha; - p_pic = p_spu->p_scale->pf_video_filter( - p_spu->p_scale, &p_region->p_cache->picture ); + p_pic = NULL; + if( p_scale->p_module ) + 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 ) { - picture_t p_pic_tmp = p_region->p_cache->picture; p_region->p_cache->picture = *p_pic; - *p_pic = p_pic_tmp; free( p_pic ); } } + /* And use the scaled picture */ if( p_region->p_cache ) + { p_region = p_region->p_cache; + fmt_original = p_region->fmt; + } } if( p_region->i_align & SUBPICTURE_ALIGN_BOTTOM ) @@ -799,7 +836,7 @@ static void SpuRenderRegion( spu_t *p_spu, i_x_offset = __MAX( i_x_offset, 0 ); i_y_offset = __MAX( i_y_offset, 0 ); - if( p_spu->i_margin != 0 && !p_spu->b_force_crop ) + 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; @@ -813,26 +850,10 @@ static void SpuRenderRegion( spu_t *p_spu, i_y_offset -= ( p_spu->i_margin * i_inv_scale_y / 1000 + i_diff ); } - i_fade_alpha = 255; - if( p_subpic->b_fade ) - { - mtime_t i_fade_start = ( p_subpic->i_stop + - p_subpic->i_start ) / 2; - mtime_t i_now = mdate(); - if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start ) - { - i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) / - ( p_subpic->i_stop - i_fade_start ); - } - } - - /* */ - SpuRenderUpdateBlend( p_spu, &p_region->fmt ); - /* Force cropping if requested */ - if( p_spu->b_force_crop ) + if( b_force_crop ) { - video_format_t *p_fmt = &p_spu->p_blend->fmt_in.video; + 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 @@ -869,16 +890,28 @@ static void SpuRenderRegion( spu_t *p_spu, i_x_offset = i_x; i_y_offset = i_y; } + b_restore_format = true; } i_x_offset = __MAX( i_x_offset, 0 ); i_y_offset = __MAX( i_y_offset, 0 ); - /* Update the output picture size */ - p_spu->p_blend->fmt_out.video.i_width = - p_spu->p_blend->fmt_out.video.i_visible_width = p_fmt->i_width; - p_spu->p_blend->fmt_out.video.i_height = - p_spu->p_blend->fmt_out.video.i_visible_height = p_fmt->i_height; + /* Compute alpha blend value */ + i_fade_alpha = 255; + if( p_subpic->b_fade ) + { + mtime_t i_fade_start = ( p_subpic->i_stop + + p_subpic->i_start ) / 2; + mtime_t i_now = mdate(); + if( i_now >= i_fade_start && p_subpic->i_stop > i_fade_start ) + { + i_fade_alpha = 255 * ( p_subpic->i_stop - i_now ) / + ( p_subpic->i_stop - i_fade_start ); + } + } + + /* Update the blender */ + SpuRenderUpdateBlend( p_spu, p_fmt->i_width, p_fmt->i_height, &p_region->fmt ); if( p_spu->p_blend->p_module ) { @@ -903,9 +936,10 @@ exit: */ p_region->picture.pf_release( &p_region->picture ); memset( &p_region->picture, 0, sizeof( picture_t ) ); - p_region->fmt = orig_fmt; p_region->i_align &= ~SUBPICTURE_RENDERED; } + if( b_restore_format ) + p_region->fmt = fmt_original; } void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, @@ -925,9 +959,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, p_subpic_v = p_subpic_v->p_next ) { if( p_subpic_v->pf_pre_render ) - { - p_subpic_v->pf_pre_render( p_fmt, p_spu, p_subpic_v, mdate() ); - } + p_subpic_v->pf_pre_render( p_fmt, p_spu, p_subpic_v ); } if( i_scale_width_orig <= 0 ) @@ -954,6 +986,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, 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; } @@ -963,11 +996,6 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, 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) */ @@ -977,7 +1005,7 @@ 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, mdate() ); } /* */ @@ -1017,52 +1045,54 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, 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) ) + 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_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_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_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_spu->p_text->fmt_out.video.i_visible_height = p_fmt->i_height; } } - /* */ + /* 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 + { + /* 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; + } - pi_scale_width[ SCALE_DEFAULT ] = i_scale_width_orig; - pi_scale_height[ SCALE_DEFAULT ] = i_scale_height_orig; + /* XXX for default: + * scale[] allows to pass from native (either video or original) size to output size */ - /* If we have an explicit size plane to render to, then turn off - * the fontsize rescaling. - */ - if( (p_subpic->i_original_picture_height > 0) && - (p_subpic->i_original_picture_width > 0) ) + if( p_subpic->i_original_picture_height > 0 && + p_subpic->i_original_picture_width > 0 ) { -#if 1 - /* FIXME That seems so wrong */ - i_scale_width_orig = 1000; - i_scale_height_orig = 1000; -#else - /* It is probably that :*/ - pi_scale_width[ SCALE_DEFAULT ] = i_scale_width_orig * i_source_video_width / p_subpic->i_original_picture_width; - pi_scale_height[ SCALE_DEFAULT ] = i_scale_height_orig * i_source_video_height / p_subpic->i_original_picture_height; -#endif + 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; } for( k = 0; k < SCALE_SIZE ; k++ ) @@ -1071,8 +1101,8 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, * 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) ) + 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; @@ -1082,27 +1112,31 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, } /* Set default subpicture aspect ratio */ - if( p_region->fmt.i_aspect && ( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den ) ) - { - p_region->fmt.i_sar_den = p_region->fmt.i_aspect; - p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR; - } if( !p_region->fmt.i_sar_num || !p_region->fmt.i_sar_den ) { - p_region->fmt.i_sar_den = p_fmt->i_sar_den; - p_region->fmt.i_sar_num = p_fmt->i_sar_num; + if( p_region->fmt.i_aspect != 0 ) + { + p_region->fmt.i_sar_den = p_region->fmt.i_aspect; + p_region->fmt.i_sar_num = VOUT_ASPECT_FACTOR; + } + else + { + p_region->fmt.i_sar_den = p_fmt->i_sar_den; + p_region->fmt.i_sar_num = p_fmt->i_sar_num; + } } /* 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 ) ) { - for( k = 0; k < SCALE_SIZE ; k++ ) + for( k = 0; k < SCALE_SIZE; k++ ) { - pi_scale_width[ k ] = pi_scale_width[ 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; + + pi_subpic_x[k] = p_subpic->i_x * pi_scale_width[ k ] / 1000; } } @@ -1111,7 +1145,7 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt, { bool b_scale_used = false; - for( k = 0; k < SCALE_SIZE ; k++ ) + 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]; @@ -1311,10 +1345,16 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) { vlc_value_t val; + vlc_mutex_lock( &p_spu->subpicture_lock ); + p_spu->b_force_palette = false; p_spu->b_force_crop = false; - if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) return; + if( var_Get( p_object, "highlight", &val ) || !val.b_bool ) + { + vlc_mutex_unlock( &p_spu->subpicture_lock ); + return; + } p_spu->b_force_crop = true; var_Get( p_object, "x-start", &val ); @@ -1331,6 +1371,7 @@ static void UpdateSPU( spu_t *p_spu, vlc_object_t *p_object ) memcpy( p_spu->palette, val.p_address, 16 ); p_spu->b_force_palette = true; } + vlc_mutex_unlock( &p_spu->subpicture_lock ); msg_Dbg( p_object, "crop: %i,%i,%i,%i, palette forced: %i", p_spu->i_crop_x, p_spu->i_crop_y,