<html><head></head><body>I already looked at it. It's still used to set a display configuration if the window size is not yet known.<br><br>We should probably require vout window to report a size up-front.<br><br><div class="gmail_quote">Le 10 décembre 2019 12:06:38 GMT+02:00, Thomas Guillem <thomas@gllm.fr> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail"><br><br>On Mon, Dec 9, 2019, at 20:44, Remi Denis-Courmont wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;">Le 2019-12-09 19:12, Thomas Guillem a écrit :<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;">This fixes the window size that was ignored when the size was updated <br>from the<br>open callback of the window plugin.<br><br>Fixes #22674<hr> src/video_output/video_output.c | 12 ++++++++++++<br> src/video_output/vout_internal.h | 2 ++<br> 2 files changed, 14 insertions(+)<br><br>diff --git a/src/video_output/video_output.c <br>b/src/video_output/video_output.c<br>index 659ede546ba..225e97318ad 100644<br>--- a/src/video_output/video_output.c<br>+++ b/src/video_output/video_output.c<br>@@ -425,6 +425,10 @@ void vout_ChangeDisplaySize(vout_thread_t *vout,<br><br> /* DO NOT call this outside the vout window callbacks */<br> vlc_mutex_lock(&sys->display_lock);<br>+<br>+ sys->display_default_width = width;<br>+ sys->display_default_height = height;<br>+<br> if (sys->display != NULL)<br> vout_display_SetSize(sys->display, width, height);<br> vlc_mutex_unlock(&sys->display_lock);<br>@@ -1606,6 +1610,13 @@ static int vout_Start(vout_thread_t *vout,<br>vlc_video_context *vctx, const vout_c<br> vlc_mutex_lock(&sys->display_lock);<br> vlc_mutex_unlock(&sys->window_lock);<br><br>+ /* Setup the initial size of the window, if not already forced by<br>the user */<br>+ if (dcfg.display.width == 0 && dcfg.display.height == 0)<br>+ {<br>+ dcfg.display.width = sys->display_default_width;<br>+ dcfg.display.height = sys->display_default_height;<br>+ }<br>+<br></blockquote>AFAICT, this makes most of vout_display_GetDefaultDisplaySize() either <br>dead or no-op code - which is suspicious, albeit not necessarily wrong.<br></blockquote><br>I'll have a look. I didn't know this function existed.<br><br>> <br><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;"><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;"> sys->display = vout_OpenWrapper(vout, sys->splitter_name, &dcfg, <br>vctx);<br> if (sys->display == NULL) {<br> vlc_mutex_unlock(&sys->display_lock);<br>@@ -1945,6 +1956,7 @@ vout_thread_t *vout_Create(vlc_object_t *object)<br><br> /* Display */<br> sys->display = NULL;<br>+ sys->display_default_width = sys->display_default_height = 0;<br> vlc_mutex_init(&sys->display_lock);<br><br> /* Window */<br>diff --git a/src/video_output/vout_internal.h <br>b/src/video_output/vout_internal.h<br>index 0ca81871fee..8ed3fdca4e0 100644<br>--- a/src/video_output/vout_internal.h<br>+++ b/src/video_output/vout_internal.h<br>@@ -182,6 +182,8 @@ struct vout_thread_sys_t<br> /* Video output display */<br> vout_display_cfg_t display_cfg;<br> vout_display_t *display;<br>+ unsigned display_default_width;<br>+ unsigned display_default_height;<br></blockquote>Those are pretty bad/confusing names, IMO. They're the actual window <br>size, not some default setting.<br></blockquote><br>OK.<br><br>> <br><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;"><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;"> vlc_mutex_t display_lock;<br><br> picture_pool_t *private_pool;<br></blockquote> -- <br> Rémi Denis-Courmont<br><br></blockquote><hr>vlc-devel mailing list<br>To unsubscribe or modify your subscription options:<br><a href="https://mailman.videolan.org/listinfo/vlc-devel">https://mailman.videolan.org/listinfo/vlc-devel</a></pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>