diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2009-03-27 11:20:02 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-12-31 00:53:49 +0000 |
| commit | 5a63373aa5fd8c8d837e708d169648e1ac541601 (patch) | |
| tree | c49da30cbddb27daa0fe2cb3f27d6543d4ea489b | |
| parent | 983ed52e920de41ae587a94356ffacd440c36982 (diff) | |
outputselector: reset state when going to READY
Reset the last-buffer, the pending pad and the segment when going to the READY
state.
Fixes #576712.
| -rw-r--r-- | plugins/elements/gstoutputselector.c | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/plugins/elements/gstoutputselector.c b/plugins/elements/gstoutputselector.c index 74191cb01d..32988af41e 100644 --- a/plugins/elements/gstoutputselector.c +++ b/plugins/elements/gstoutputselector.c @@ -158,10 +158,8 @@ gst_output_selector_init (GstOutputSelector * sel, } static void -gst_output_selector_dispose (GObject * object) +gst_output_selector_reset (GstOutputSelector * osel) { - GstOutputSelector *osel = GST_OUTPUT_SELECTOR (object); - if (osel->pending_srcpad != NULL) { gst_object_unref (osel->pending_srcpad); osel->pending_srcpad = NULL; @@ -170,6 +168,15 @@ gst_output_selector_dispose (GObject * object) gst_buffer_unref (osel->latest_buffer); osel->latest_buffer = NULL; } + gst_segment_init (&osel->segment, GST_FORMAT_UNDEFINED); +} + +static void +gst_output_selector_dispose (GObject * object) +{ + GstOutputSelector *osel = GST_OUTPUT_SELECTOR (object); + + gst_output_selector_reset (osel); G_OBJECT_CLASS (parent_class)->dispose (object); } @@ -379,7 +386,29 @@ static GstStateChangeReturn gst_output_selector_change_state (GstElement * element, GstStateChange transition) { - return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + GstOutputSelector *sel; + GstStateChangeReturn result; + + sel = GST_OUTPUT_SELECTOR (element); + + switch (transition) { + case GST_STATE_CHANGE_READY_TO_PAUSED: + break; + default: + break; + } + + result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + switch (transition) { + case GST_STATE_CHANGE_PAUSED_TO_READY: + gst_output_selector_reset (sel); + break; + default: + break; + } + + return result; } static gboolean @@ -412,7 +441,6 @@ gst_output_selector_handle_sink_event (GstPad * pad, GstEvent * event) /* Send newsegment to all src pads */ gst_pad_event_default (pad, event); - break; } case GST_EVENT_EOS: |