mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 20:42:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpgstpay: Do not flush events for stream-start and avoid conflict between event and pending inline caps

Browse source
This commit is contained in:
Youness Alaoui 2013-07-25 21:03:34 -04:00 committed by Wim Taymans
parent 2d53289b6b
commit 9257409613
1 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
gst/rtp/gstrtpgstpay.c
View file

@ -328,6 +328,32 @@ gst_rtp_gst_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
return res;
}
static void
gst_rtp_gst_pay_send_event (GstRtpGSTPay * rtpgstpay, guint etype,
GstEvent * event)
{
const GstStructure *s;
gchar *estr;
guint elen;
GstBuffer *outbuf;
/* Create the standalone caps packet if an inlined caps was pending */
gst_rtp_gst_pay_create_from_adapter (rtpgstpay, GST_CLOCK_TIME_NONE);
s = gst_event_get_structure (event);
estr = gst_structure_to_string (s);
elen = strlen (estr);
outbuf = make_data_buffer (rtpgstpay, estr, elen);
GST_DEBUG_OBJECT (rtpgstpay, "sending event=%s", estr);
g_free (estr);
rtpgstpay->etype = etype;
gst_adapter_push (rtpgstpay->adapter, outbuf);
/* Create the event packet now to avoid conflict with data/caps packets */
gst_rtp_gst_pay_create_from_adapter (rtpgstpay, GST_CLOCK_TIME_NONE);
}
static gboolean
gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload, GstEvent * event)
{
@ -361,27 +387,15 @@ gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload, GstEvent * event)
break;
}
if (etype) {
const GstStructure *s;
gchar *estr;
guint elen;
GstBuffer *outbuf;
/* 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);
estr = gst_structure_to_string (s);
elen = strlen (estr);
outbuf = make_data_buffer (rtpgstpay, estr, elen);
g_free (estr);
rtpgstpay->etype = etype;
gst_adapter_push (rtpgstpay->adapter, outbuf);
/* flush the adapter immediately */
gst_rtp_gst_pay_flush (rtpgstpay, GST_CLOCK_TIME_NONE);
gst_rtp_gst_pay_send_event (rtpgstpay, etype, event);
/* Do not send stream-start right away since caps/new-segment were not yet
sent, so our data would be considered invalid */
if (etype != 4) {
/* flush the adapter immediately */
gst_rtp_gst_pay_flush (rtpgstpay, GST_CLOCK_TIME_NONE);
}
}
gst_event_unref (event);