mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

urisourcebin: Fix adaptive demuxer's property checking and buffering setting

Browse source 
- Add adaptive demuxer's 'connection-speed' property checking
- Set adaptive demuxer q2 buffering property via urisrc use_buffering value

https://bugzilla.gnome.org/show_bug.cgi?id=772550
This commit is contained in:
Changbok Chea 2016-10-07 16:20:24 +09:00 committed by Jan Schmidt
parent 9041db4680
commit 14ce96a459
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/playback/gsturisourcebin.c
View file

@ -968,7 +968,6 @@ pending_pad_blocked (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
if (caps == NULL) if (caps == NULL)
caps = gst_pad_query_caps (pad, NULL); caps = gst_pad_query_caps (pad, NULL);
/* FIXME: Don't do buffering if use_buffering is FALSE */
slot = get_output_slot (urisrc, FALSE, TRUE, caps); slot = get_output_slot (urisrc, FALSE, TRUE, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
@ -1176,11 +1175,11 @@ get_output_slot (GstURISourceBin * urisrc, gboolean do_download,
} else { } else {
if (is_adaptive) { if (is_adaptive) {
GST_LOG_OBJECT (urisrc, "Adding queue for adaptive streaming stream"); GST_LOG_OBJECT (urisrc, "Adding queue for adaptive streaming stream");
g_object_set (queue, "use-buffering", TRUE, "use-tags-bitrate", TRUE, g_object_set (queue, "use-buffering", urisrc->use_buffering,
"use-rate-estimate", FALSE, NULL); "use-tags-bitrate", TRUE, "use-rate-estimate", FALSE, NULL);
} else { } else {
GST_LOG_OBJECT (urisrc, "Adding queue for buffering"); GST_LOG_OBJECT (urisrc, "Adding queue for buffering");
g_object_set (queue, "use-buffering", TRUE, NULL); g_object_set (queue, "use-buffering", urisrc->use_buffering, NULL);
} }
g_object_set (queue, "ring-buffer-max-size", g_object_set (queue, "ring-buffer-max-size",
urisrc->ring_buffer_max_size, NULL); urisrc->ring_buffer_max_size, NULL);
@ -1768,6 +1767,7 @@ make_demuxer (GstURISourceBin * urisrc, GstCaps * caps)
{ {
GList *factories, *eligible, *cur; GList *factories, *eligible, *cur;
GstElement *demuxer = NULL; GstElement *demuxer = NULL;
GParamSpec *pspec;
GST_LOG_OBJECT (urisrc, "making new adaptive demuxer"); GST_LOG_OBJECT (urisrc, "making new adaptive demuxer");
@ -1814,9 +1814,11 @@ make_demuxer (GstURISourceBin * urisrc, GstCaps * caps)
"pad-removed", G_CALLBACK (pad_removed_cb), urisrc); "pad-removed", G_CALLBACK (pad_removed_cb), urisrc);
/* Propagate connection-speed property */ /* Propagate connection-speed property */
/* FIXME: Check the property exists on the demuxer */ pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (demuxer),
g_object_set (demuxer, "connection-speed");
"connection-speed", urisrc->connection_speed / 1000, NULL); if (pspec != NULL)
g_object_set (demuxer,
"connection-speed", urisrc->connection_speed / 1000, NULL);
return demuxer; return demuxer;