mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-08-04 12:45:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstpay: fix for 1.0 events

Browse source 
Caps events are sometimes not followed by a buffer but by an event. Flush any
pending caps before we make a packet with the event.
Chain up to the parent event handler before we attempt to push RTP packets, it
might be a segment event.
This commit is contained in:
Wim Taymans 2012-11-01 18:42:39 +00:00
parent 05232c55a5
commit d6fd0ebd04
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst/rtp/gstrtpgstpay.c
View file

@ -284,7 +284,7 @@ gst_rtp_gst_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
outbuf = make_data_buffer (rtpgstpay, capsstr, capslen); outbuf = make_data_buffer (rtpgstpay, capsstr, capslen);
g_free (capsstr); g_free (capsstr);
/* store in adapter, we don't flush yet, buffer will follow */ /* store in adapter, we don't flush yet, buffer might follow */
rtpgstpay->flags = (1 << 7) | (rtpgstpay->current_CV << 4); rtpgstpay->flags = (1 << 7) | (rtpgstpay->current_CV << 4);
rtpgstpay->next_CV = (rtpgstpay->next_CV + 1) & 0x7; rtpgstpay->next_CV = (rtpgstpay->next_CV + 1) & 0x7;
gst_adapter_push (rtpgstpay->adapter, outbuf); gst_adapter_push (rtpgstpay->adapter, outbuf);
@ -303,30 +303,41 @@ gst_rtp_gst_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
static gboolean static gboolean
gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload, GstEvent * event) gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload, GstEvent * event)
{ {
gboolean ret;
GstRtpGSTPay *rtpgstpay; GstRtpGSTPay *rtpgstpay;
guint etype;
rtpgstpay = GST_RTP_GST_PAY (payload); rtpgstpay = GST_RTP_GST_PAY (payload);
ret = GST_RTP_BASE_PAYLOAD_CLASS (parent_class)->sink_event (payload, event);
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_TAG: case GST_EVENT_TAG:
rtpgstpay->etype = 1; etype = 1;
break; break;
case GST_EVENT_CUSTOM_DOWNSTREAM: case GST_EVENT_CUSTOM_DOWNSTREAM:
rtpgstpay->etype = 2; etype = 2;
break; break;
case GST_EVENT_CUSTOM_BOTH: case GST_EVENT_CUSTOM_BOTH:
rtpgstpay->etype = 2; etype = 2;
break; break;
default: default:
etype = 0;
GST_LOG_OBJECT (rtpgstpay, "no event for %s",
GST_EVENT_TYPE_NAME (event));
break; break;
} }
if (rtpgstpay->etype) { if (etype) {
const GstStructure *s; const GstStructure *s;
gchar *estr; gchar *estr;
guint elen; guint elen;
GstBuffer *outbuf; GstBuffer *outbuf;
GST_DEBUG_OBJECT (rtpgstpay, "make event type %d", rtpgstpay->etype); /* make sure the adapter is flushed */
gst_rtp_gst_pay_flush (rtpgstpay, GST_CLOCK_TIME_NONE);
GST_DEBUG_OBJECT (rtpgstpay, "make event type %d for %s",
etype, GST_EVENT_TYPE_NAME (event));
s = gst_event_get_structure (event); s = gst_event_get_structure (event);
estr = gst_structure_to_string (s); estr = gst_structure_to_string (s);
@ -334,12 +345,13 @@ gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload, GstEvent * event)
outbuf = make_data_buffer (rtpgstpay, estr, elen); outbuf = make_data_buffer (rtpgstpay, estr, elen);
g_free (estr); g_free (estr);
rtpgstpay->etype = etype;
gst_adapter_push (rtpgstpay->adapter, outbuf); gst_adapter_push (rtpgstpay->adapter, outbuf);
/* flush the adapter immediately */ /* flush the adapter immediately */
gst_rtp_gst_pay_flush (rtpgstpay, GST_CLOCK_TIME_NONE); gst_rtp_gst_pay_flush (rtpgstpay, GST_CLOCK_TIME_NONE);
} }
return GST_RTP_BASE_PAYLOAD_CLASS (parent_class)->sink_event (payload, event); return ret;
} }
static GstFlowReturn static GstFlowReturn