[vlc-devel] [vlc-commits] macosx/vout: comment use of vout_window_ReportSize as it leads to fatal mutex locking errors in the core

[Steve Lhomme]

Hi,

On 2019-07-02 16:30, Felix Paul Kühne wrote:
> vlc | branch: master | Felix Paul Kühne <felix at feepk.net> | Tue Jul  2 16:29:13 2019 +0200| [adc359f6c9be9b5f232adadd8f7f4f1167c8e79a] | committer: Felix Paul Kühne
> 
> macosx/vout: comment use of vout_window_ReportSize as it leads to fatal mutex locking errors in the core
> 
> Commenting the function allows us to use the vout until the core is correctly fixed. This commit must be reverted before release.
> 
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=adc359f6c9be9b5f232adadd8f7f4f1167c8e79a
> ---
> 
>   modules/video_output/macosx.m | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
> index 12043a9141..de85879341 100644
> --- a/modules/video_output/macosx.m
> +++ b/modules/video_output/macosx.m
> @@ -246,7 +246,8 @@ static int Open (vout_display_t *vd, const vout_display_cfg_t *cfg,
>           vd->control = Control;
>   
>           /* */
> -        vout_window_ReportSize(sys->embed, fmt->i_visible_width, fmt->i_visible_height);
> +        // FIXME: this call leads to a fatal mutex locking error in vout_ChangeDisplaySize()
> +        // vout_window_ReportSize(sys->embed, fmt->i_visible_width, fmt->i_visible_height);

The ReportSize is sent by the "vout window" to tell when its size has 
been changed (by the user/system/etc). It should not be handled in the 
"vout display" module. In the case of OS X that would be in the 
VLCVoutView of VLCVideoOutputProvider.m or the VLCMinimalVoutWindow of 
intf.m.

>           return VLC_SUCCESS;
>   
> @@ -644,7 +645,8 @@ static void OpenglSwap (vlc_gl_t *gl)
>               sys->cfg.display.height = bounds.size.height;
>   
>               vout_display_PlacePicture(&place, &vd->source, &sys->cfg);
> -            vout_window_ReportSize(sys->embed, bounds.size.width, bounds.size.height);
> +            // FIXME: this call leads to a fatal mutex locking error in vout_ChangeDisplaySize()
> +            // vout_window_ReportSize(sys->embed, bounds.size.width, bounds.size.height);
>           }
>       }
>   
> 
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits
>