mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-13 09:45:27 +00:00
Code Issues 1 Projects Releases Wiki Activity

uridecodebin: use downloadbuffer for download buffering

Browse source 
Use the new downloadbuffer element to implement the download buffering
feature

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=680183
This commit is contained in:
Wim Taymans 2014-05-08 17:10:26 +02:00
parent 43ae5a17ce
commit 0e8b47443e
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst/playback/gsturidecodebin.c
View file

@ -1880,7 +1880,7 @@ type_found (GstElement * typefind, guint probability,
{ {
GstElement *src_elem, *dec_elem, *queue = NULL; GstElement *src_elem, *dec_elem, *queue = NULL;
GstStructure *s; GstStructure *s;
const gchar *media_type; const gchar *media_type, *elem_name;
gboolean do_download = FALSE; gboolean do_download = FALSE;
GST_DEBUG_OBJECT (decoder, "typefind found caps %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (decoder, "typefind found caps %" GST_PTR_FORMAT, caps);
@ -1905,13 +1905,15 @@ type_found (GstElement * typefind, guint probability,
if (decoder->is_adaptive) { if (decoder->is_adaptive) {
src_elem = typefind; src_elem = typefind;
} else { } else {
queue = gst_element_factory_make ("queue2", NULL); if (do_download) {
elem_name = "downloadbuffer";
} else {
elem_name = "queue2";
}
queue = gst_element_factory_make (elem_name, NULL);
if (!queue) if (!queue)
goto no_queue2; goto no_buffer_element;
g_object_set (queue, "use-buffering", TRUE, NULL);
g_object_set (queue, "ring-buffer-max-size", decoder->ring_buffer_max_size,
NULL);
decoder->queue = queue; decoder->queue = queue;
GST_DEBUG_OBJECT (decoder, "check media-type %s, %d", media_type, GST_DEBUG_OBJECT (decoder, "check media-type %s, %d", media_type,
@ -1939,12 +1941,15 @@ type_found (GstElement * typefind, guint probability,
g_free (filename); g_free (filename);
g_free (temp_template); g_free (temp_template);
} } else {
g_object_set (queue, "use-buffering", TRUE, NULL);
g_object_set (queue, "ring-buffer-max-size",
decoder->ring_buffer_max_size, NULL);
/* Disable max-size-buffers */ /* Disable max-size-buffers */
g_object_set (queue, "max-size-buffers", 0, NULL); g_object_set (queue, "max-size-buffers", 0, NULL);
}
/* If buffer size or duration are set, set them on the queue2 element */ /* If buffer size or duration are set, set them on the element */
if (decoder->buffer_size != -1) if (decoder->buffer_size != -1)
g_object_set (queue, "max-size-bytes", decoder->buffer_size, NULL); g_object_set (queue, "max-size-bytes", decoder->buffer_size, NULL);
if (decoder->buffer_duration != -1) if (decoder->buffer_duration != -1)
@ -1987,9 +1992,9 @@ could_not_link:
(NULL), ("Can't link typefind to decodebin element")); (NULL), ("Can't link typefind to decodebin element"));
return; return;
} }
no_queue2: no_buffer_element:
{ {
post_missing_plugin_error (GST_ELEMENT_CAST (decoder), "queue2"); post_missing_plugin_error (GST_ELEMENT_CAST (decoder), elem_name);
return; return;
} }
} }