[vlc-commits] vout: warn when we get less display pictures than requested
Steve Lhomme
git at videolan.org
Tue Apr 28 09:45:13 CEST 2015
vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Tue Apr 21 06:55:44 2015 +0000| [7871ce366604de8b9cbcec2e937baa16482f7d04] | committer: Jean-Baptiste Kempf
vout: warn when we get less display pictures than requested
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7871ce366604de8b9cbcec2e937baa16482f7d04
---
src/video_output/vout_wrapper.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index d172bcc..dbaae78 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -130,9 +130,15 @@ int vout_InitWrapper(vout_thread_t *vout)
const unsigned reserved_picture = DISPLAY_PICTURE_COUNT +
private_picture +
kept_picture;
- picture_pool_t *display_pool =
- vout_display_Pool(vd, allow_dr ? __MAX(VOUT_MAX_PICTURES,
- reserved_picture + decoder_picture) : 3);
+ const unsigned display_pool_size = allow_dr ? __MAX(VOUT_MAX_PICTURES,
+ reserved_picture + decoder_picture) : 3;
+ picture_pool_t *display_pool = vout_display_Pool(vd, display_pool_size);
+#ifndef NDEBUG
+ if ( picture_pool_GetSize(display_pool) < display_pool_size )
+ msg_Warn(vout, "Not enough display buffers in the pool, requested %d got %d",
+ display_pool_size, picture_pool_GetSize(display_pool));
+#endif
+
if (allow_dr &&
picture_pool_GetSize(display_pool) >= reserved_picture + decoder_picture) {
sys->dpb_size = picture_pool_GetSize(display_pool) - reserved_picture;
More information about the vlc-commits
mailing list