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

adaptivedemux: minor clean-up

Browse source 
No need for a foreach callback function that's just a few
lines of code and is only used once, just do the event
pushing inline.

https://bugzilla.gnome.org/show_bug.cgi?id=705991
This commit is contained in:
Tim-Philipp Müller 2015-07-18 21:18:23 +01:00
parent 71a1e3669a
commit b4fe1b516b
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -657,17 +657,6 @@ gst_adaptive_demux_set_stream_struct_size (GstAdaptiveDemux * demux,
demux->stream_struct_size = struct_size; demux->stream_struct_size = struct_size;
} }
static void
gst_adaptive_demux_send_event (gpointer data, gpointer userdata)
{
GstEvent *event = (GstEvent *) data;
GstPad *pad = (GstPad *) userdata;
if (!gst_pad_push_event (pad, event)) {
GST_ERROR_OBJECT (pad, "Failed to send pending event");
}
}
static gboolean static gboolean
gst_adaptive_demux_expose_stream (GstAdaptiveDemux * demux, gst_adaptive_demux_expose_stream (GstAdaptiveDemux * demux,
GstAdaptiveDemuxStream * stream) GstAdaptiveDemuxStream * stream)
@ -1470,13 +1459,15 @@ gst_adaptive_demux_stream_push_buffer (GstAdaptiveDemuxStream * stream,
gst_pad_push_event (stream->pad, gst_event_new_tag (stream->pending_tags)); gst_pad_push_event (stream->pad, gst_event_new_tag (stream->pending_tags));
stream->pending_tags = NULL; stream->pending_tags = NULL;
} }
if (G_UNLIKELY (stream->pending_events)) { while (stream->pending_events != NULL) {
g_list_foreach (stream->pending_events, gst_adaptive_demux_send_event, GstEvent *event = stream->pending_events->data;
stream->pad);
g_list_free (stream->pending_events);
stream->pending_events = NULL;
}
if (!gst_pad_push_event (stream->pad, event))
GST_ERROR_OBJECT (stream->pad, "Failed to send pending event");
stream->pending_events =
g_list_delete_link (stream->pending_events, stream->pending_events);
}
ret = gst_pad_push (stream->pad, buffer); ret = gst_pad_push (stream->pad, buffer);
GST_LOG_OBJECT (stream->pad, "Push result: %d %s", ret, GST_LOG_OBJECT (stream->pad, "Push result: %d %s", ret,