vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Nov 3 22:43:24 2014 +0200| [d0dd307a4387599032e5219373bb6b5d4421c674] | committer: Rémi Denis-Courmont
Revert "vout: fix picture lock/unlock with private pool" This mostly reverts commit 6a6c23bf075ba70844f8e9b51991df74952d616f. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d0dd307a4387599032e5219373bb6b5d4421c674 --- include/vlc_picture_pool.h | 1 - src/misc/picture_pool.c | 5 ----- src/video_output/vout_wrapper.c | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/vlc_picture_pool.h b/include/vlc_picture_pool.h index 2b3718c..a0cf9f3 100644 --- a/include/vlc_picture_pool.h +++ b/include/vlc_picture_pool.h @@ -179,7 +179,6 @@ 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 2d52517..fdd9b8e 100644 --- a/src/misc/picture_pool.c +++ b/src/misc/picture_pool.c @@ -330,11 +330,6 @@ 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; -} - void picture_pool_Enum(picture_pool_t *pool, void (*cb)(void *, picture_t *), void *opaque) { diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c index 8b5174a..d172bcc 100644 --- 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_NeedsLocking(display_pool) - && picture_pool_GetSize(display_pool) >= reserved_picture + decoder_picture) { + if (allow_dr && + 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; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
