From cf1d116b19802d6bde8ae4589d5dd64ecb924945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Fri, 28 Aug 2015 20:33:40 -0400 Subject: [PATCH] pcapparse: Reset state on flush and state changes https://bugzilla.gnome.org/show_bug.cgi?id=753152 --- gst/pcapparse/gstpcapparse.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c index 11a443e210..23eaff374b 100644 --- a/gst/pcapparse/gstpcapparse.c +++ b/gst/pcapparse/gstpcapparse.c @@ -36,7 +36,6 @@ */ /* TODO: - * - React on state-change and update state accordingly. * - Implement support for timestamping the buffers. */ @@ -604,9 +603,6 @@ out: if (list) gst_buffer_list_unref (list); - if (ret != GST_FLOW_OK) - gst_pcap_parse_reset (self); - return ret; } @@ -621,10 +617,33 @@ gst_pcap_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) /* Drop it, we'll replace it with our own */ gst_event_unref (event); break; + case GST_EVENT_FLUSH_STOP: + gst_pcap_parse_reset (self); + break; default: ret = gst_pad_push_event (self->src_pad, event); break; } + return ret; +} + +static GstStateChangeReturn +gst_pcap_parse_change_state (GstElement * element, GstStateChange transition) +{ + GstPcapParse *self = GST_PCAP_PARSE (element); + GstStateChangeReturn ret; + + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + switch (transition) { + case GST_STATE_CHANGE_PAUSED_TO_READY: + gst_pcap_parse_reset (element); + break; + default: + break; + } + + return ret; }