From 41117606dd84002fc94045f9e6969a5ab12939b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 20 Feb 2014 15:38:48 +0100 Subject: [PATCH] decodebin: During pre-rolling always use the auto-preroll limits on multiqueues Even if we're buffering in the multiqueues. --- gst/playback/gstdecodebin2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index d835d87..3906b79 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -3174,11 +3174,11 @@ decodebin_set_queue_size (GstDecodeBin * dbin, GstElement * multiqueue, if (preroll || use_buffering) { /* takes queue limits, initially we only queue up up to the max bytes limit, * with a default of 2MB. we use the same values for buffering mode. */ - if ((max_bytes = dbin->max_size_bytes) == 0) + if (preroll || (max_bytes = dbin->max_size_bytes) == 0) max_bytes = AUTO_PREROLL_SIZE_BYTES; - if ((max_buffers = dbin->max_size_buffers) == 0) + if (preroll || (max_buffers = dbin->max_size_buffers) == 0) max_buffers = AUTO_PREROLL_SIZE_BUFFERS; - if ((max_time = dbin->max_size_time) == 0) + if (preroll || (max_time = dbin->max_size_time) == 0) max_time = seekable ? AUTO_PREROLL_SEEKABLE_SIZE_TIME : AUTO_PREROLL_NOT_SEEKABLE_SIZE_TIME; } else { -- 2.7.4