mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 04:05:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

appsrc: Some minor fixes and cleanup

Browse source
This commit is contained in:
Sebastian Dröge 2014-08-06 10:07:42 +02:00
parent 251c63c4ab
commit 8fc307fae0
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gst-libs/gst/app/gstappsrc.c
View file

@ -531,12 +531,13 @@ gst_app_src_init (GstAppSrc * appsrc)
static void static void
gst_app_src_flush_queued (GstAppSrc * src) gst_app_src_flush_queued (GstAppSrc * src)
{ {
GstMiniObject *caps_or_buffer; GstMiniObject *obj;
GstAppSrcPrivate *priv = src->priv; GstAppSrcPrivate *priv = src->priv;
while ((caps_or_buffer = g_queue_pop_head (priv->queue))) { while (!g_queue_is_empty (priv->queue)) {
if (caps_or_buffer) { obj = g_queue_pop_head (priv->queue);
gst_mini_object_unref (caps_or_buffer); if (obj) {
gst_mini_object_unref (obj);
} }
} }
@ -1066,11 +1067,10 @@ gst_app_src_create (GstBaseSrc * bsrc, guint64 offset, guint size,
/* return data as long as we have some */ /* return data as long as we have some */
if (!g_queue_is_empty (priv->queue)) { if (!g_queue_is_empty (priv->queue)) {
guint buf_size; guint buf_size;
GstMiniObject *caps_or_buffer = g_queue_pop_head (priv->queue); GstMiniObject *obj = g_queue_pop_head (priv->queue);
if (!GST_IS_BUFFER (caps_or_buffer)) { if (!GST_IS_BUFFER (obj)) {
GstCaps *next_caps = GST_CAPS (obj);
GstCaps *next_caps = caps_or_buffer;
gboolean caps_changed = TRUE; gboolean caps_changed = TRUE;
if (next_caps && priv->current_caps) if (next_caps && priv->current_caps)
@ -1093,10 +1093,12 @@ gst_app_src_create (GstBaseSrc * bsrc, guint64 offset, guint size,
*- check queue has data */ *- check queue has data */
if (G_UNLIKELY (priv->flushing)) if (G_UNLIKELY (priv->flushing))
goto flushing; goto flushing;
/* Contiue checks caps and queue */
/* Continue checks caps and queue */
continue; continue;
} }
*buf = GST_BUFFER (caps_or_buffer);
*buf = GST_BUFFER (obj);
buf_size = gst_buffer_get_size (*buf); buf_size = gst_buffer_get_size (*buf);
GST_DEBUG_OBJECT (appsrc, "we have buffer %p of size %u", *buf, buf_size); GST_DEBUG_OBJECT (appsrc, "we have buffer %p of size %u", *buf, buf_size);
@ -1195,13 +1197,9 @@ gst_app_src_set_caps (GstAppSrc * appsrc, const GstCaps * caps)
GST_OBJECT_LOCK (appsrc); GST_OBJECT_LOCK (appsrc);
GST_DEBUG_OBJECT (appsrc, "setting caps to %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (appsrc, "setting caps to %" GST_PTR_FORMAT, caps);
if (caps)
new_caps = gst_caps_copy (caps);
else
new_caps = NULL;
new_caps = caps ? gst_caps_copy (caps) : NULL;
g_queue_push_tail (priv->queue, new_caps); g_queue_push_tail (priv->queue, new_caps);
gst_caps_replace (&priv->last_caps, new_caps); gst_caps_replace (&priv->last_caps, new_caps);
GST_OBJECT_UNLOCK (appsrc); GST_OBJECT_UNLOCK (appsrc);