mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

kateenc: Delay segment event until we have caps

Browse source
This commit is contained in:
Sebastian Dröge 2013-05-15 10:12:09 +02:00
parent d997c5db0e
commit 9e2aee01a8
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ext/kate/gstkateenc.c
View file

@ -629,6 +629,10 @@ gst_kate_enc_send_headers (GstKateEnc * ke)
gst_pad_set_caps (ke->srcpad, caps); gst_pad_set_caps (ke->srcpad, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
if (ke->pending_segment)
gst_pad_push_event (ke->srcpad, ke->pending_segment);
ke->pending_segment = NULL;
GST_LOG_OBJECT (ke, "pushing headers"); GST_LOG_OBJECT (ke, "pushing headers");
item = headers; item = headers;
while (item) { while (item) {
@ -1091,6 +1095,7 @@ gst_kate_enc_change_state (GstElement * element, GstStateChange transition)
ke->last_timestamp = 0; ke->last_timestamp = 0;
ke->latest_end_time = 0; ke->latest_end_time = 0;
} }
gst_event_replace (&ke->pending_segment, NULL);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
@ -1222,16 +1227,23 @@ gst_kate_enc_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
gst_event_unref (event); gst_event_unref (event);
break; break;
} }
case GST_EVENT_SEGMENT: case GST_EVENT_SEGMENT: {
GstSegment seg;
GST_LOG_OBJECT (ke, "Got newsegment event"); GST_LOG_OBJECT (ke, "Got newsegment event");
gst_event_copy_segment (event, &seg);
if (!ke->headers_sent) {
gst_event_replace (&ke->pending_segment, event);
event = NULL;
}
if (ke->initialized) { if (ke->initialized) {
GST_LOG_OBJECT (ke, "ensuring all headers are in"); GST_LOG_OBJECT (ke, "ensuring all headers are in");
if (gst_kate_enc_flush_headers (ke) != GST_FLOW_OK) { if (gst_kate_enc_flush_headers (ke) != GST_FLOW_OK) {
GST_WARNING_OBJECT (ke, "Failed to flush headers"); GST_WARNING_OBJECT (ke, "Failed to flush headers");
} else { } else {
GstSegment seg;
gst_event_copy_segment (event, &seg);
if (seg.format != GST_FORMAT_TIME if (seg.format != GST_FORMAT_TIME
|| !GST_CLOCK_TIME_IS_VALID (seg.start)) { || !GST_CLOCK_TIME_IS_VALID (seg.start)) {
GST_WARNING_OBJECT (ke, GST_WARNING_OBJECT (ke,
@ -1269,9 +1281,12 @@ gst_kate_enc_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
} }
} }
} }
ret = gst_pad_push_event (ke->srcpad, event); if (event)
ret = gst_pad_push_event (ke->srcpad, event);
else
ret = TRUE;
break; break;
}
case GST_EVENT_CUSTOM_DOWNSTREAM: case GST_EVENT_CUSTOM_DOWNSTREAM:
GST_LOG_OBJECT (ke, "Got custom downstream event"); GST_LOG_OBJECT (ke, "Got custom downstream event");
/* adapted from the dvdsubdec element */ /* adapted from the dvdsubdec element */

2
ext/kate/gstkateenc.h
View file

@ -81,6 +81,8 @@ struct _GstKateEnc
GstClockTime last_timestamp; GstClockTime last_timestamp;
GstClockTime latest_end_time; GstClockTime latest_end_time;
GstEvent *pending_segment;
gboolean headers_sent; gboolean headers_sent;
gboolean initialized; gboolean initialized;
gboolean delayed_spu; gboolean delayed_spu;