<html><head></head><body>Hi,<br><br>Ok. We should probably remove picture_pool_Reserve() later.<br><br><div class="gmail_quote">Le 17 août 2020 16:33:01 GMT+02:00, Steve Lhomme <robux4@ycbcr.xyz> 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"><hr> src/video_output/video_output.c | 3 +--<br> src/video_output/vout_private.h | 1 -<br> src/video_output/vout_wrapper.c | 30 +++++-------------------------<br> 3 files changed, 6 insertions(+), 28 deletions(-)<br><br>diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c<br>index 09aaa10e98a..def6875cea0 100644<br>--- a/src/video_output/video_output.c<br>+++ b/src/video_output/video_output.c<br>@@ -1703,7 +1703,6 @@ static int vout_Start(vout_thread_sys_t *vout, vlc_video_context *vctx, const vo<br> <br> sys->decoder_fifo = picture_fifo_New();<br> sys->private.display_pool = NULL;<br>- sys->private.private_pool = NULL;<br> <br> sys->filter.configuration = NULL;<br> video_format_Copy(&sys->filter.src_fmt, &sys->original);<br>@@ -1784,7 +1783,7 @@ static int vout_Start(vout_thread_sys_t *vout, vlc_video_context *vctx, const vo<br> vout_SetDisplayAspect(sys->display, num, den);<br> vlc_mutex_unlock(&sys->display_lock);<br> <br>- assert(sys->private.display_pool != NULL && sys->private.private_pool != NULL);<br>+ assert(sys->private.display_pool != NULL);<br> <br> sys->displayed.current = NULL;<br> sys->displayed.next = NULL;<br>diff --git a/src/video_output/vout_private.h b/src/video_output/vout_private.h<br>index 261dcc30fe4..cb4c0bde6a8 100644<br>--- a/src/video_output/vout_private.h<br>+++ b/src/video_output/vout_private.h<br>@@ -43,7 +43,6 @@ struct vout_thread_private_t<br> vlc_tick_t date;<br> } interlacing;<br> <br>- picture_pool_t *private_pool;<br> picture_pool_t *display_pool;<br> };<br> <br>diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c<br>index 6445f99b7a2..6e751f4c238 100644<br>--- a/src/video_output/vout_wrapper.c<br>+++ b/src/video_output/vout_wrapper.c<br>@@ -79,39 +79,20 @@ vout_display_t *vout_OpenWrapper(vout_thread_t *vout, vout_thread_private_t *sys<br> if (vd == NULL)<br> return NULL;<br> <br>- sys->display_pool = NULL;<br>-<br>- const unsigned private_picture = 4; /* XXX 3 for filter, 1 for SPU */<br> const unsigned kept_picture = 1; /* last displayed picture */<br> const unsigned reserved_picture = DISPLAY_PICTURE_COUNT +<br>- private_picture +<br> kept_picture;<br> <br>- picture_pool_t *display_pool = vout_GetPool(vd, reserved_picture);<br>- if (display_pool == NULL)<br>+ sys->display_pool = vout_GetPool(vd, reserved_picture);<br>+ if (sys->display_pool == NULL)<br> goto error;<br> <br> #ifndef NDEBUG<br>- if ( picture_pool_GetSize(display_pool) < reserved_picture )<br>+ if ( picture_pool_GetSize(sys->display_pool) < reserved_picture )<br> msg_Warn(vout, "Not enough display buffers in the pool, requested %u got %u",<br>- reserved_picture, picture_pool_GetSize(display_pool));<br>+ reserved_picture, picture_pool_GetSize(sys->display_pool));<br> #endif<br> <br>- if (!vout_IsDisplayFiltered(vd) &&<br>- picture_pool_GetSize(display_pool) >= reserved_picture) {<br>- sys->private_pool = picture_pool_Reserve(display_pool, private_picture);<br>- } else {<br>- sys->private_pool =<br>- picture_pool_NewFromFormat(&vd->source,<br>- __MAX(VOUT_MAX_PICTURES,<br>- reserved_picture - DISPLAY_PICTURE_COUNT));<br>- }<br>- if (sys->private_pool == NULL) {<br>- picture_pool_Release(display_pool);<br>- goto error;<br>- }<br>- sys->display_pool = display_pool;<br>-<br> #ifdef _WIN32<br> var_Create(vout, "video-wallpaper", VLC_VAR_BOOL|VLC_VAR_DOINHERIT);<br> var_AddCallback(vout, "video-wallpaper", Forward, vd);<br>@@ -130,9 +111,8 @@ error:<br> *****************************************************************************/<br> void vout_CloseWrapper(vout_thread_t *vout, vout_thread_private_t *sys, vout_display_t *vd)<br> {<br>- assert(sys->display_pool && sys->private_pool);<br>+ assert(sys->display_pool);<br> <br>- picture_pool_Release(sys->private_pool);<br> sys->display_pool = NULL;<br> <br> #ifdef _WIN32</pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>