From d5069d27ef90608f153721bfe6e80381b24567a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 31 May 2017 12:30:40 +0300 Subject: [PATCH] Revert "decodebin2: Set a time limit on "upstream" multiqueues" This reverts commit 07dc9ba0712c26be86f031fb6f77bee177cbb828. It causes timeouts in validate because queues run full before prerolling. --- gst/playback/gstdecodebin2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index 65346cfd62..b17f124f63 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -241,7 +241,7 @@ enum * as low as possible (try to aim for 5 buffers) */ #define AUTO_PLAY_SIZE_BYTES 2 * 1024 * 1024 #define AUTO_PLAY_SIZE_BUFFERS 5 -#define AUTO_PLAY_SIZE_TIME 5 * GST_SECOND +#define AUTO_PLAY_SIZE_TIME 0 #define DEFAULT_SUBTITLE_ENCODING NULL #define DEFAULT_USE_BUFFERING FALSE @@ -3732,7 +3732,7 @@ decodebin_set_queue_size_full (GstDecodeBin * dbin, GstElement * multiqueue, if ((max_buffers = dbin->max_size_buffers) == 0) max_buffers = AUTO_PLAY_SIZE_BUFFERS; /* this is a multiqueue with disabled buffering, don't limit max_time */ - if (use_buffering) + if (dbin->use_buffering) max_time = 0; else if ((max_time = dbin->max_size_time) == 0) max_time = AUTO_PLAY_SIZE_TIME; -- 2.34.1