mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 18:52:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

wavparse: don't remove srcpad

Browse source 
Don't remove the always srcpad in ready and make the element reusable.
This commit is contained in:
Wim Taymans 2011-12-19 10:48:54 +01:00
parent 9e27b122d9
commit 8e801dfe1e
1 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst/wavparse/gstwavparse.c
View file

@ -212,15 +212,6 @@ gst_wavparse_init (GstWavParse * wavparse)
gst_element_add_pad (GST_ELEMENT_CAST (wavparse), wavparse->srcpad); gst_element_add_pad (GST_ELEMENT_CAST (wavparse), wavparse->srcpad);
} }
static void
gst_wavparse_destroy_sourcepad (GstWavParse * wavparse)
{
if (wavparse->srcpad) {
gst_element_remove_pad (GST_ELEMENT_CAST (wavparse), wavparse->srcpad);
wavparse->srcpad = NULL;
}
}
/* Compute (value * nom) % denom, avoiding overflow. This can be used /* Compute (value * nom) % denom, avoiding overflow. This can be used
* to perform ceiling or rounding division together with * to perform ceiling or rounding division together with
* gst_util_uint64_scale[_int]. */ * gst_util_uint64_scale[_int]. */
@ -854,10 +845,8 @@ gst_wavparse_perform_seek (GstWavParse * wav, GstEvent * event)
* as it completes one iteration (and thus might block when the sink is * as it completes one iteration (and thus might block when the sink is
* blocking in preroll). */ * blocking in preroll). */
if (flush) { if (flush) {
if (wav->srcpad) { GST_DEBUG_OBJECT (wav, "sending flush start");
GST_DEBUG_OBJECT (wav, "sending flush start"); gst_pad_push_event (wav->srcpad, gst_event_new_flush_start ());
gst_pad_push_event (wav->srcpad, gst_event_new_flush_start ());
}
} else { } else {
gst_pad_pause_task (wav->sinkpad); gst_pad_pause_task (wav->sinkpad);
} }
@ -935,12 +924,10 @@ gst_wavparse_perform_seek (GstWavParse * wav, GstEvent * event)
wav->end_offset, GST_TIME_ARGS (seeksegment.start), GST_TIME_ARGS (stop)); wav->end_offset, GST_TIME_ARGS (seeksegment.start), GST_TIME_ARGS (stop));
/* prepare for streaming again */ /* prepare for streaming again */
if (wav->srcpad) { if (flush) {
if (flush) { /* if we sent a FLUSH_START, we now send a FLUSH_STOP */
/* if we sent a FLUSH_START, we now send a FLUSH_STOP */ GST_DEBUG_OBJECT (wav, "sending flush stop");
GST_DEBUG_OBJECT (wav, "sending flush stop"); gst_pad_push_event (wav->srcpad, gst_event_new_flush_stop (TRUE));
gst_pad_push_event (wav->srcpad, gst_event_new_flush_stop (TRUE));
}
} }
/* now we did the seek and can activate the new segment values */ /* now we did the seek and can activate the new segment values */
@ -2064,8 +2051,7 @@ pause:
gst_message_new_segment_done (GST_OBJECT_CAST (wav), gst_message_new_segment_done (GST_OBJECT_CAST (wav),
wav->segment.format, stop)); wav->segment.format, stop));
} else { } else {
if (wav->srcpad != NULL) gst_pad_push_event (wav->srcpad, gst_event_new_eos ());
gst_pad_push_event (wav->srcpad, gst_event_new_eos ());
} }
} else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED) { } else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED) {
/* for fatal errors we post an error message, post the error /* for fatal errors we post an error message, post the error
@ -2073,8 +2059,7 @@ pause:
GST_ELEMENT_ERROR (wav, STREAM, FAILED, GST_ELEMENT_ERROR (wav, STREAM, FAILED,
(_("Internal data flow error.")), (_("Internal data flow error.")),
("streaming task paused, reason %s (%d)", reason, ret)); ("streaming task paused, reason %s (%d)", reason, ret));
if (wav->srcpad != NULL) gst_pad_push_event (wav->srcpad, gst_event_new_eos ());
gst_pad_push_event (wav->srcpad, gst_event_new_eos ());
} }
return; return;
} }
@ -2629,7 +2614,6 @@ gst_wavparse_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_wavparse_destroy_sourcepad (wav);
gst_wavparse_reset (wav); gst_wavparse_reset (wav);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL: