*/
VLC_API unsigned picture_pool_GetSize(const picture_pool_t *);
+bool picture_pool_NeedsLocking(const picture_pool_t *);
#endif /* VLC_PICTURE_POOL_H */
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;
if (!pool)
goto error;
- pool->pic_lock = master->pic_lock;
- pool->pic_unlock = master->pic_unlock;
return pool;
error:
{
return pool->picture_count;
}
+
+bool picture_pool_NeedsLocking(const picture_pool_t *pool)
+{
+ return pool->pic_lock != NULL || pool->pic_unlock != NULL;
+}
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;