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

wavparse: clean up adapter properly

Browse source 
Reflow code so we don't try to clear or re-use an already-freed adapter.
This commit is contained in:
Tim-Philipp Müller 2009-08-31 13:38:08 +01:00
parent d875e72b02
commit 4cf513da9b
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/wavparse/gstwavparse.c
View file

@ -2440,23 +2440,20 @@ gst_wavparse_sink_activate (GstPad * sinkpad)
GstWavParse *wav = GST_WAVPARSE (gst_pad_get_parent (sinkpad)); GstWavParse *wav = GST_WAVPARSE (gst_pad_get_parent (sinkpad));
gboolean res; gboolean res;
if (wav->adapter) if (wav->adapter) {
gst_adapter_clear (wav->adapter);
g_object_unref (wav->adapter); g_object_unref (wav->adapter);
wav->adapter = NULL;
}
if (gst_pad_check_pull_range (sinkpad)) { if (gst_pad_check_pull_range (sinkpad)) {
GST_DEBUG ("going to pull mode"); GST_DEBUG ("going to pull mode");
wav->streaming = FALSE; wav->streaming = FALSE;
if (wav->adapter) {
gst_adapter_clear (wav->adapter);
g_object_unref (wav->adapter);
}
wav->adapter = NULL;
res = gst_pad_activate_pull (sinkpad, TRUE); res = gst_pad_activate_pull (sinkpad, TRUE);
} else { } else {
GST_DEBUG ("going to push (streaming) mode"); GST_DEBUG ("going to push (streaming) mode");
wav->streaming = TRUE; wav->streaming = TRUE;
if (wav->adapter == NULL) wav->adapter = gst_adapter_new ();
wav->adapter = gst_adapter_new ();
res = gst_pad_activate_push (sinkpad, TRUE); res = gst_pad_activate_push (sinkpad, TRUE);
} }
gst_object_unref (wav); gst_object_unref (wav);