mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 10:41:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

videodecoder: Rename queued list to output_queued for clarity.

Browse source 
Use g_list_free_full instead of g_list_foreach + g_list_free
This commit is contained in:
Jan Schmidt 2012-06-19 23:46:44 +10:00
parent 487e5348e0
commit c977aa2c01
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/video/gstvideodecoder.c
View file

@ -360,8 +360,8 @@ struct _GstVideoDecoderPrivate
GList *parse_gather; GList *parse_gather;
/* frames to be handled == decoded */ /* frames to be handled == decoded */
GList *decode; GList *decode;
/* collected output */ /* collected output - of buffer objects, not frames */
GList *queued; GList *output_queued;
/* FIXME : base_picture_number is never set */ /* FIXME : base_picture_number is never set */
guint64 base_picture_number; guint64 base_picture_number;
@ -1468,9 +1468,10 @@ gst_video_decoder_clear_queues (GstVideoDecoder * dec)
{ {
GstVideoDecoderPrivate *priv = dec->priv; GstVideoDecoderPrivate *priv = dec->priv;
g_list_foreach (priv->queued, (GFunc) gst_mini_object_unref, NULL); g_list_free_full (priv->output_queued,
g_list_free (priv->queued); (GDestroyNotify) gst_mini_object_unref);
priv->queued = NULL; priv->output_queued = NULL;
g_list_foreach (priv->gather, (GFunc) gst_mini_object_unref, NULL); g_list_foreach (priv->gather, (GFunc) gst_mini_object_unref, NULL);
g_list_free (priv->gather); g_list_free (priv->gather);
priv->gather = NULL; priv->gather = NULL;
@ -1700,16 +1701,11 @@ gst_video_decoder_flush_parse (GstVideoDecoder * dec)
} }
/* now send queued data downstream */ /* now send queued data downstream */
while (priv->queued) { walk = priv->output_queued;
GstBuffer *buf = GST_BUFFER_CAST (priv->queued->data); while (walk) {
GstBuffer *buf = GST_BUFFER_CAST (walk->data);
if (G_LIKELY (res == GST_FLOW_OK)) { if (G_LIKELY (res == GST_FLOW_OK)) {
GST_DEBUG_OBJECT (dec, "pushing buffer %p of size %" G_GSIZE_FORMAT ", "
"time %" GST_TIME_FORMAT ", dur %" GST_TIME_FORMAT, buf,
gst_buffer_get_size (buf), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)),
GST_TIME_ARGS (GST_BUFFER_DURATION (buf)));
/* should be already, but let's be sure */
buf = gst_buffer_make_writable (buf);
/* avoid stray DISCONT from forward processing, /* avoid stray DISCONT from forward processing,
* which have no meaning in reverse pushing */ * which have no meaning in reverse pushing */
GST_BUFFER_FLAG_UNSET (buf, GST_BUFFER_FLAG_DISCONT); GST_BUFFER_FLAG_UNSET (buf, GST_BUFFER_FLAG_DISCONT);
@ -1718,7 +1714,9 @@ gst_video_decoder_flush_parse (GstVideoDecoder * dec)
gst_buffer_unref (buf); gst_buffer_unref (buf);
} }
priv->queued = g_list_delete_link (priv->queued, priv->queued); priv->output_queued =
g_list_delete_link (priv->output_queued, priv->output_queued);
walk = priv->output_queued;
} }
return res; return res;
@ -2220,7 +2218,7 @@ gst_video_decoder_finish_frame (GstVideoDecoder * decoder,
priv->error_count--; priv->error_count--;
if (decoder->output_segment.rate < 0.0) { if (decoder->output_segment.rate < 0.0) {
GST_LOG_OBJECT (decoder, "queued buffer"); GST_LOG_OBJECT (decoder, "queued buffer");
priv->queued = g_list_prepend (priv->queued, output_buffer); priv->output_queued = g_list_prepend (priv->output_queued, output_buffer);
} else { } else {
ret = gst_pad_push (decoder->srcpad, output_buffer); ret = gst_pad_push (decoder->srcpad, output_buffer);
} }