[vlc-commits] commit: Fixed the value of the dpb size that we got after requesting the vout display pool . (Laurent Aimar )
git at videolan.org
git at videolan.org
Fri Jun 11 00:24:02 CEST 2010
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Jun 10 23:22:01 2010 +0200| [8871e919ee6eafac14101475a0654d0ab53a5167] | committer: Laurent Aimar
Fixed the value of the dpb size that we got after requesting the vout display pool.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8871e919ee6eafac14101475a0654d0ab53a5167
---
src/video_output/vout_wrapper.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index 0022eeb..3c2c3f4 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -132,7 +132,7 @@ int vout_InitWrapper(vout_thread_t *vout)
reserved_picture + decoder_picture) : 3);
if (allow_dr &&
picture_pool_GetSize(display_pool) >= reserved_picture + decoder_picture) {
- sys->dpb_size = picture_pool_GetSize(display_pool) - reserved_picture - kept_picture;
+ sys->dpb_size = picture_pool_GetSize(display_pool) - reserved_picture;
sys->decoder_pool = display_pool;
sys->display_pool = display_pool;
sys->is_decoder_pool_slow = vd->info.is_slow;
@@ -140,12 +140,12 @@ int vout_InitWrapper(vout_thread_t *vout)
sys->decoder_pool =
picture_pool_NewFromFormat(&source,
__MAX(VOUT_MAX_PICTURES,
- private_picture + kept_picture + decoder_picture));
+ reserved_picture + decoder_picture));
if (allow_dr) {
msg_Warn(vout, "Not enough direct buffers, using system memory");
sys->dpb_size = 0;
} else {
- sys->dpb_size = picture_pool_GetSize(display_pool) - private_picture - kept_picture;
+ sys->dpb_size = picture_pool_GetSize(sys->decoder_pool) - reserved_picture;
}
if (sys->display.use_dr)
sys->display_pool = display_pool;
More information about the vlc-commits
mailing list