vout: fix picture lock/unlock with private pool

diff --git a/include/vlc_picture_pool.h b/include/vlc_picture_pool.h
index ad8835efb325ddcaddf7cc19c927494407e99c04..72278c9ab4600516b248084c13f5fa20992fc188 100644 (file)
--- a/include/vlc_picture_pool.h
+++ b/include/vlc_picture_pool.h
@@ -133,6 +133,7 @@ VLC_USED;
  */
 VLC_API unsigned picture_pool_GetSize(const picture_pool_t *);
 
+bool picture_pool_NeedsLocking(const picture_pool_t *);
 
 #endif /* VLC_PICTURE_POOL_H */
 

diff --git a/src/misc/picture_pool.c b/src/misc/picture_pool.c
index e899f9eabbc5e46ea945822500a438a384c83dfc..15d07919aebd29ab3905bf61e79f0547e7a4016e 100644 (file)
--- a/src/misc/picture_pool.c
+++ b/src/misc/picture_pool.c
@@ -208,6 +208,8 @@ error:
 
 picture_pool_t *picture_pool_Reserve(picture_pool_t *master, unsigned count)
 {
+    assert(master->pic_unlock == NULL);
+
     picture_t *picture[count ? count : 1];
     unsigned i;
 
@@ -221,8 +223,6 @@ picture_pool_t *picture_pool_Reserve(picture_pool_t *master, unsigned count)
     if (!pool)
         goto error;
 
-    pool->pic_lock   = master->pic_lock;
-    pool->pic_unlock = master->pic_unlock;
     return pool;
 
 error:
@@ -330,3 +330,8 @@ unsigned picture_pool_GetSize(const picture_pool_t *pool)
 {
     return pool->picture_count;
 }
+
+bool picture_pool_NeedsLocking(const picture_pool_t *pool)
+{
+    return pool->pic_lock != NULL || pool->pic_unlock != NULL;
+}

diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index d172bcca0bfdacc9ebc5c7979a1f10850e7092c9..8b5174a235f245f975e9c4271dfb8661c69b0d53 100644 (file)
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -133,8 +133,8 @@ int vout_InitWrapper(vout_thread_t *vout)
     picture_pool_t *display_pool =
         vout_display_Pool(vd, allow_dr ? __MAX(VOUT_MAX_PICTURES,
                                                reserved_picture + decoder_picture) : 3);
-    if (allow_dr &&
-        picture_pool_GetSize(display_pool) >= reserved_picture + decoder_picture) {
+    if (allow_dr && !picture_pool_NeedsLocking(display_pool)
+     && picture_pool_GetSize(display_pool) >= reserved_picture + decoder_picture) {
         sys->dpb_size     = picture_pool_GetSize(display_pool) - reserved_picture;
         sys->decoder_pool = display_pool;
         sys->display_pool = display_pool;