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

flxdec: Only send SEGMENT events after CAPS

Browse source 
I.e., don't just forward the event but delay it if we don't have caps on
the srcpad yet.
This commit is contained in:
Sebastian Dröge 2016-12-09 17:55:39 +02:00
parent a08e72547d
commit 524e43e118
2 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst/flx/gstflxdec.c
View file

@ -190,17 +190,27 @@ gst_flxdec_sink_event_handler (GstPad * pad, GstObject * parent,
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_SEGMENT: case GST_EVENT_SEGMENT:
{ {
GstSegment segment; gst_event_copy_segment (event, &flxdec->segment);
if (flxdec->segment.format != GST_FORMAT_TIME) {
gst_event_copy_segment (event, &segment);
if (segment.format != GST_FORMAT_TIME) {
GST_DEBUG_OBJECT (flxdec, "generating TIME segment"); GST_DEBUG_OBJECT (flxdec, "generating TIME segment");
gst_segment_init (&segment, GST_FORMAT_TIME); gst_segment_init (&flxdec->segment, GST_FORMAT_TIME);
gst_event_unref (event); gst_event_unref (event);
event = gst_event_new_segment (&segment); event = gst_event_new_segment (&flxdec->segment);
} }
/* fall-through */
if (gst_pad_has_current_caps (flxdec->srcpad)) {
ret = gst_pad_event_default (pad, parent, event);
} else {
flxdec->need_segment = TRUE;
gst_event_unref (event);
ret = TRUE;
} }
break;
}
case GST_EVENT_FLUSH_STOP:
gst_segment_init (&flxdec->segment, GST_FORMAT_UNDEFINED);
ret = gst_pad_event_default (pad, parent, event);
break;
default: default:
ret = gst_pad_event_default (pad, parent, event); ret = gst_pad_event_default (pad, parent, event);
break; break;
@ -784,6 +794,12 @@ gst_flxdec_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
gst_pad_set_caps (flxdec->srcpad, caps); gst_pad_set_caps (flxdec->srcpad, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
if (flxdec->need_segment) {
gst_pad_push_event (flxdec->srcpad,
gst_event_new_segment (&flxdec->segment));
flxdec->need_segment = FALSE;
}
/* zero means 8 */ /* zero means 8 */
if (flxh->depth == 0) if (flxh->depth == 0)
flxh->depth = 8; flxh->depth = 8;
@ -932,6 +948,8 @@ gst_flxdec_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
gst_adapter_clear (flxdec->adapter); gst_adapter_clear (flxdec->adapter);
flxdec->state = GST_FLXDEC_READ_HEADER; flxdec->state = GST_FLXDEC_READ_HEADER;
gst_segment_init (&flxdec->segment, GST_FORMAT_UNDEFINED);
flxdec->need_segment = TRUE;
break; break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break; break;

3
gst/flx/gstflxdec.h
View file

@ -43,6 +43,9 @@ struct _GstFlxDec {
GstPad *sinkpad, *srcpad; GstPad *sinkpad, *srcpad;
GstSegment segment;
gboolean need_segment;
gboolean active, new_meta; gboolean active, new_meta;
guint8 *delta_data, *frame_data; guint8 *delta_data, *frame_data;