mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

capsfilter: Send all events that should happen after CAPS after the CAPS event

Browse source
This commit is contained in:
Sebastian Dröge 2013-05-09 09:32:49 +02:00
parent c86f42bc88
commit 98f6b75cd3
2 changed files with 58 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
plugins/elements/gstcapsfilter.c
View file

@ -85,6 +85,7 @@ static GstFlowReturn gst_capsfilter_prepare_buf (GstBaseTransform * trans,
GstBuffer * input, GstBuffer ** buf); GstBuffer * input, GstBuffer ** buf);
static gboolean gst_capsfilter_sink_event (GstBaseTransform * trans, static gboolean gst_capsfilter_sink_event (GstBaseTransform * trans,
GstEvent * event); GstEvent * event);
static gboolean gst_capsfilter_stop (GstBaseTransform * trans);
static void static void
gst_capsfilter_class_init (GstCapsFilterClass * klass) gst_capsfilter_class_init (GstCapsFilterClass * klass)
@ -124,6 +125,7 @@ gst_capsfilter_class_init (GstCapsFilterClass * klass)
trans_class->prepare_output_buffer = trans_class->prepare_output_buffer =
GST_DEBUG_FUNCPTR (gst_capsfilter_prepare_buf); GST_DEBUG_FUNCPTR (gst_capsfilter_prepare_buf);
trans_class->sink_event = GST_DEBUG_FUNCPTR (gst_capsfilter_sink_event); trans_class->sink_event = GST_DEBUG_FUNCPTR (gst_capsfilter_sink_event);
trans_class->stop = GST_DEBUG_FUNCPTR (gst_capsfilter_stop);
} }
static void static void
@ -196,7 +198,8 @@ gst_capsfilter_dispose (GObject * object)
GstCapsFilter *filter = GST_CAPSFILTER (object); GstCapsFilter *filter = GST_CAPSFILTER (object);
gst_caps_replace (&filter->filter_caps, NULL); gst_caps_replace (&filter->filter_caps, NULL);
gst_event_replace (&filter->pending_segment, NULL); g_list_free_full (filter->pending_events, (GDestroyNotify) gst_event_unref);
filter->pending_events = NULL;
G_OBJECT_CLASS (parent_class)->dispose (object); G_OBJECT_CLASS (parent_class)->dispose (object);
} }
@ -294,13 +297,11 @@ gst_capsfilter_prepare_buf (GstBaseTransform * trans, GstBuffer * input,
/* No caps. See if the output pad only supports fixed caps */ /* No caps. See if the output pad only supports fixed caps */
GstCapsFilter *filter = GST_CAPSFILTER (trans); GstCapsFilter *filter = GST_CAPSFILTER (trans);
GstCaps *out_caps; GstCaps *out_caps;
GstEvent *pending_segment = filter->pending_segment; GList *pending_events = filter->pending_events;
GST_LOG_OBJECT (trans, "Input pad does not have caps"); GST_LOG_OBJECT (trans, "Input pad does not have caps");
filter->pending_segment = NULL; filter->pending_events = NULL;
g_return_val_if_fail (pending_segment != NULL || trans->have_segment,
GST_FLOW_ERROR);
out_caps = gst_pad_get_current_caps (trans->srcpad); out_caps = gst_pad_get_current_caps (trans->srcpad);
if (out_caps == NULL) { if (out_caps == NULL) {
@ -318,9 +319,14 @@ gst_capsfilter_prepare_buf (GstBaseTransform * trans, GstBuffer * input,
if (!gst_pad_set_caps (trans->srcpad, out_caps)) if (!gst_pad_set_caps (trans->srcpad, out_caps))
ret = GST_FLOW_NOT_NEGOTIATED; ret = GST_FLOW_NOT_NEGOTIATED;
if (pending_segment) if (pending_events) {
GST_BASE_TRANSFORM_CLASS (parent_class)->sink_event (trans, GList *l;
pending_segment);
for (l = g_list_last (pending_events); l; l = l->prev) {
GST_BASE_TRANSFORM_CLASS (parent_class)->sink_event (trans, l->data);
}
g_list_free (pending_events);
}
gst_caps_unref (out_caps); gst_caps_unref (out_caps);
} else { } else {
@ -335,7 +341,7 @@ gst_capsfilter_prepare_buf (GstBaseTransform * trans, GstBuffer * input,
("Output caps are unfixed: %s", caps_str)); ("Output caps are unfixed: %s", caps_str));
g_free (caps_str); g_free (caps_str);
gst_event_unref (pending_segment); g_list_free_full (pending_events, (GDestroyNotify) pending_events);
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
} }
@ -348,15 +354,53 @@ gst_capsfilter_prepare_buf (GstBaseTransform * trans, GstBuffer * input,
static gboolean static gboolean
gst_capsfilter_sink_event (GstBaseTransform * trans, GstEvent * event) gst_capsfilter_sink_event (GstBaseTransform * trans, GstEvent * event)
{ {
if (GST_EVENT_TYPE (event) != GST_EVENT_SEGMENT) GstCapsFilter *filter = GST_CAPSFILTER (trans);
if (GST_EVENT_TYPE (event) == GST_EVENT_FLUSH_STOP) {
GList *l;
for (l = filter->pending_events; l;) {
if (GST_EVENT_TYPE (l->data) == GST_EVENT_SEGMENT) {
gst_event_unref (l->data);
l = g_list_delete_link (l, l);
} else {
l = l->next;
}
}
}
if (!GST_EVENT_IS_STICKY (event) || GST_EVENT_TYPE (event) < GST_EVENT_CAPS)
goto done; goto done;
if (!gst_pad_has_current_caps (trans->sinkpad)) { /* If we get EOS before any buffers, just push all pending events */
GST_LOG_OBJECT (trans, "Got segment without caps, queue segment event"); if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) {
gst_event_replace (&GST_CAPSFILTER (trans)->pending_segment, event); GList *l;
for (l = g_list_last (filter->pending_events); l; l = l->prev) {
GST_BASE_TRANSFORM_CLASS (parent_class)->sink_event (trans, l->data);
}
g_list_free (filter->pending_events);
filter->pending_events = NULL;
} else if (!gst_pad_has_current_caps (trans->sinkpad)) {
GST_LOG_OBJECT (trans, "Got %s event before caps, queueing",
GST_EVENT_TYPE_NAME (event));
filter->pending_events = g_list_prepend (filter->pending_events, event);
return TRUE; return TRUE;
} }
done: done:
return GST_BASE_TRANSFORM_CLASS (parent_class)->sink_event (trans, event); return GST_BASE_TRANSFORM_CLASS (parent_class)->sink_event (trans, event);
} }
static gboolean
gst_capsfilter_stop (GstBaseTransform * trans)
{
GstCapsFilter *filter = GST_CAPSFILTER (trans);
g_list_free_full (filter->pending_events, (GDestroyNotify) gst_event_unref);
filter->pending_events = NULL;
return TRUE;
}

2
plugins/elements/gstcapsfilter.h
View file

@ -53,7 +53,7 @@ struct _GstCapsFilter {
GstBaseTransform trans; GstBaseTransform trans;
GstCaps *filter_caps; GstCaps *filter_caps;
GstEvent *pending_segment; GList *pending_events;
}; };
struct _GstCapsFilterClass { struct _GstCapsFilterClass {