mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpgstpay: reset on FLUSH_STOP

Browse source 
Clear the adapter and pending buffer list on FLUSH_STOP.
This commit is contained in:
Wim Taymans 2013-08-21 09:55:20 +02:00
parent 2e8955df39
commit ae9239aac7
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst/rtp/gstrtpgstpay.c
View file

@ -152,6 +152,19 @@ gst_rtp_gst_pay_init (GstRtpGSTPay * rtpgstpay)
rtpgstpay->config_interval = DEFAULT_CONFIG_INTERVAL; rtpgstpay->config_interval = DEFAULT_CONFIG_INTERVAL;
} }
static void
gst_rtp_gst_pay_reset (GstRtpGSTPay * rtpgstpay)
{
rtpgstpay->last_config = GST_CLOCK_TIME_NONE;
gst_adapter_clear (rtpgstpay->adapter);
rtpgstpay->flags &= 0x70;
rtpgstpay->etype = 0;
if (rtpgstpay->pending_buffers)
g_list_free_full (rtpgstpay->pending_buffers,
(GDestroyNotify) gst_buffer_list_unref);
rtpgstpay->pending_buffers = NULL;
}
static void static void
gst_rtp_gst_pay_finalize (GObject * obj) gst_rtp_gst_pay_finalize (GObject * obj)
{ {
@ -159,11 +172,9 @@ gst_rtp_gst_pay_finalize (GObject * obj)
rtpgstpay = GST_RTP_GST_PAY (obj); rtpgstpay = GST_RTP_GST_PAY (obj);
gst_rtp_gst_pay_reset (rtpgstpay);
g_object_unref (rtpgstpay->adapter); g_object_unref (rtpgstpay->adapter);
if (rtpgstpay->pending_buffers)
g_list_free_full (rtpgstpay->pending_buffers,
(GDestroyNotify) gst_buffer_list_unref);
rtpgstpay->pending_buffers = NULL;
if (rtpgstpay->taglist) if (rtpgstpay->taglist)
gst_tag_list_unref (rtpgstpay->taglist); gst_tag_list_unref (rtpgstpay->taglist);
rtpgstpay->taglist = NULL; rtpgstpay->taglist = NULL;
@ -443,7 +454,7 @@ gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload, GstEvent * event)
{ {
gboolean ret; gboolean ret;
GstRtpGSTPay *rtpgstpay; GstRtpGSTPay *rtpgstpay;
guint etype; guint etype = 0;
rtpgstpay = GST_RTP_GST_PAY (payload); rtpgstpay = GST_RTP_GST_PAY (payload);
@ -452,6 +463,9 @@ gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload, GstEvent * event)
gst_event_ref (event)); gst_event_ref (event));
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_FLUSH_STOP:
gst_rtp_gst_pay_reset (rtpgstpay);
break;
case GST_EVENT_TAG:{ case GST_EVENT_TAG:{
GstTagList *tags; GstTagList *tags;
@ -494,7 +508,6 @@ gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload, GstEvent * event)
break; break;
} }
default: default:
etype = 0;
GST_LOG_OBJECT (rtpgstpay, "no event for %s", GST_LOG_OBJECT (rtpgstpay, "no event for %s",
GST_EVENT_TYPE_NAME (event)); GST_EVENT_TYPE_NAME (event));
break; break;