mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 21:48:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

bugfix: destroy bufferstreams after they're reset, not before

Browse source 
Original commit message from CVS:
bugfix: destroy bufferstreams after they're reset, not before
This commit is contained in:
Benjamin Otte 2003-03-22 02:17:08 +00:00
parent d681473539
commit a773e79446
1 changed files with 82 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
ext/alsa/gstalsa.c
View file

@ -49,7 +49,6 @@
} \ } \
}G_STMT_END }G_STMT_END
#endif #endif
/* elementfactory information */ /* elementfactory information */
static GstElementDetails gst_alsa_sink_details = { static GstElementDetails gst_alsa_sink_details = {
"Alsa Sink", "Alsa Sink",
@ -107,11 +106,11 @@ static void gst_alsa_xrun_recovery (GstAlsa *this);
static gboolean gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr); static gboolean gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr);
/* alsa setup / start / stop functions */ /* alsa setup / start / stop functions */
static gboolean gst_alsa_set_hw_params (GstAlsa *this); static gboolean gst_alsa_set_hw_params (GstAlsa *this, GstAlsaFormat *format);
static gboolean gst_alsa_set_sw_params (GstAlsa *this); static gboolean gst_alsa_set_sw_params (GstAlsa *this);
static gboolean gst_alsa_open_audio (GstAlsa *this); static gboolean gst_alsa_open_audio (GstAlsa *this);
static gboolean gst_alsa_start_audio (GstAlsa *this); static gboolean gst_alsa_start_audio (GstAlsa *this, GstAlsaFormat *format);
static gboolean gst_alsa_drain_audio (GstAlsa *this); static gboolean gst_alsa_drain_audio (GstAlsa *this);
static gboolean gst_alsa_stop_audio (GstAlsa *this); static gboolean gst_alsa_stop_audio (GstAlsa *this);
static gboolean gst_alsa_close_audio (GstAlsa *this); static gboolean gst_alsa_close_audio (GstAlsa *this);
@ -320,12 +319,12 @@ gst_alsa_dispose (GObject *object)
gint i; gint i;
GstAlsa *this = GST_ALSA (object); GstAlsa *this = GST_ALSA (object);
G_OBJECT_CLASS (parent_class)->dispose (object);
for (i = 0; i < ((GstElement *) this)->numpads; i++) { for (i = 0; i < ((GstElement *) this)->numpads; i++) {
if (this->pads[i].bs) if (this->pads[i].bs)
gst_bytestream_destroy (this->pads[i].bs); gst_bytestream_destroy (this->pads[i].bs);
} }
G_OBJECT_CLASS (parent_class)->dispose (object);
} }
static void static void
gst_alsa_set_property (GObject *object, guint prop_id, const GValue *value, gst_alsa_set_property (GObject *object, guint prop_id, const GValue *value,
@ -385,7 +384,7 @@ gst_alsa_set_property (GObject *object, guint prop_id, const GValue *value,
if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) { if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) {
gst_alsa_stop_audio (this); gst_alsa_stop_audio (this);
gst_alsa_start_audio (this); gst_alsa_start_audio (this, NULL);
} }
} }
@ -815,15 +814,16 @@ gst_alsa_link (GstPad *pad, GstCaps *caps)
} }
GST_FLAG_UNSET (this, GST_ALSA_CAPS_NEGO); GST_FLAG_UNSET (this, GST_ALSA_CAPS_NEGO);
g_free (this->format);
this->format = format;
/* sync the params */ /* sync the params */
if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this); if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);
if (GST_FLAG_IS_SET (this, GST_ALSA_OPEN)) gst_alsa_close_audio (this); if (GST_FLAG_IS_SET (this, GST_ALSA_OPEN)) gst_alsa_close_audio (this);
if (!gst_alsa_open_audio (this)) return GST_PAD_LINK_REFUSED; if (!gst_alsa_open_audio (this)) return GST_PAD_LINK_REFUSED;
if (!gst_alsa_start_audio (this)) return GST_PAD_LINK_REFUSED; if (!gst_alsa_start_audio (this, format)) {
g_free (format);
return GST_PAD_LINK_REFUSED;
}
} }
return GST_PAD_LINK_OK; return GST_PAD_LINK_OK;
@ -865,7 +865,7 @@ gst_alsa_change_state (GstElement *element)
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_READY_TO_PAUSED:
if (!GST_FLAG_IS_SET (element, GST_ALSA_RUNNING)) if (!GST_FLAG_IS_SET (element, GST_ALSA_RUNNING))
if (!gst_alsa_start_audio (this)) if (!gst_alsa_start_audio (this, NULL))
return GST_STATE_FAILURE; return GST_STATE_FAILURE;
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_PAUSED_TO_PLAYING:
@ -1247,7 +1247,7 @@ gst_alsa_xrun_recovery (GstAlsa *this)
} }
} }
if (!(gst_alsa_stop_audio (this) && gst_alsa_start_audio (this))) { if (!(gst_alsa_stop_audio (this) && gst_alsa_start_audio (this, NULL))) {
gst_element_error (GST_ELEMENT (this), "alsasink: Error restarting audio after xrun"); gst_element_error (GST_ELEMENT (this), "alsasink: Error restarting audio after xrun");
} }
} }
@ -1303,27 +1303,69 @@ gst_alsa_open_audio (GstAlsa *this)
GST_FLAG_SET (this, GST_ALSA_OPEN); GST_FLAG_SET (this, GST_ALSA_OPEN);
return TRUE; return TRUE;
} }
/* error checking for hw params functions (no warnings on probing ie during capsnego) */
#ifdef G_HAVE_ISO_VARARGS
#define MY_ERROR_CHECK(value, ...) G_STMT_START{ \
int err = (value); \
if (err < 0) { \
if (! (format && oldformat)) \
g_warning ( __VA_ARGS__, snd_strerror (err)); \
return FALSE; \
} \
}G_STMT_END
#elif defined(G_HAVE_GNUC_VARARGS)
#define MY_ERROR_CHECK(value, args...) G_STMT_START{ \
int err = (value); \
if (err < 0) { \
if (! (format && oldformat)) \
g_warning ( ## args, snd_strerror (err)); \
return FALSE; \
} \
}G_STMT_END
#else
#define MY_ERROR_CHECK(value, args...) G_STMT_START{ \
int err = (value); \
if (err < 0) { \
if (! (format && oldformat)) \
g_warning (snd_strerror (err)); \
return FALSE; \
} \
}G_STMT_END
#endif
/** /**
* You must set all hw parameters at once and can't use already set params and * You must set all hw parameters at once and can't use already set params and
* change them. * change them.
* Thx ALSA for not documenting this * Thx ALSA for not documenting this
*/ */
static gboolean static gboolean
gst_alsa_set_hw_params (GstAlsa *this) gst_alsa_set_hw_params (GstAlsa *this, GstAlsaFormat *format)
{ {
snd_pcm_hw_params_t *hw_params; snd_pcm_hw_params_t *hw_params;
snd_pcm_access_mask_t *mask; snd_pcm_access_mask_t *mask;
GstAlsaFormat * oldformat;
g_return_val_if_fail (this != NULL, FALSE); g_return_val_if_fail (this != NULL, FALSE);
g_return_val_if_fail (this->handle != NULL, FALSE); g_return_val_if_fail (this->handle != NULL, FALSE);
GST_INFO (GST_CAT_PLUGIN_INFO, "Preparing channel: %s %dHz, %d channels\n", if (format == NULL || format == this->format) {
snd_pcm_format_name (this->format->format), this->format->rate, this->format->channels); format = this->format;
oldformat = NULL;
} else {
oldformat = this->format;
}
if (format && oldformat) {
GST_INFO (GST_CAT_PLUGIN_INFO, "Probing format: %s %dHz, %d channels\n",
snd_pcm_format_name (format->format), format->rate, format->channels);
} else {
GST_INFO (GST_CAT_PLUGIN_INFO, "Preparing format: %s %dHz, %d channels\n",
snd_pcm_format_name (format->format), format->rate, format->channels);
}
snd_pcm_hw_params_alloca (&hw_params); snd_pcm_hw_params_alloca (&hw_params);
ERROR_CHECK (snd_pcm_hw_params_any (this->handle, hw_params), MY_ERROR_CHECK (snd_pcm_hw_params_any (this->handle, hw_params),
"Broken configuration for this PCM: %s"); "Broken configuration for this PCM: %s");
ERROR_CHECK (snd_pcm_hw_params_set_periods_integer (this->handle, hw_params), MY_ERROR_CHECK (snd_pcm_hw_params_set_periods_integer (this->handle, hw_params),
"cannot restrict period size to integral value: %s"); "cannot restrict period size to integral value: %s");
/* enable this for soundcard specific debugging */ /* enable this for soundcard specific debugging */
@ -1336,24 +1378,24 @@ gst_alsa_set_hw_params (GstAlsa *this)
} else { } else {
snd_pcm_access_mask_set (mask, this->mmap ? SND_PCM_ACCESS_MMAP_NONINTERLEAVED : SND_PCM_ACCESS_RW_NONINTERLEAVED); snd_pcm_access_mask_set (mask, this->mmap ? SND_PCM_ACCESS_MMAP_NONINTERLEAVED : SND_PCM_ACCESS_RW_NONINTERLEAVED);
} }
ERROR_CHECK (snd_pcm_hw_params_set_access_mask (this->handle, hw_params, mask), MY_ERROR_CHECK (snd_pcm_hw_params_set_access_mask (this->handle, hw_params, mask),
"The Gstreamer ALSA plugin does not support your hardware. Error: %s"); "The Gstreamer ALSA plugin does not support your hardware. Error: %s");
if (this->format) { if (format) {
ERROR_CHECK (snd_pcm_hw_params_set_format (this->handle, hw_params, this->format->format), MY_ERROR_CHECK (snd_pcm_hw_params_set_format (this->handle, hw_params, format->format),
"Sample format (%s) not available: %s", snd_pcm_format_name (this->format->format)); "Sample format (%s) not available: %s", snd_pcm_format_name (format->format));
ERROR_CHECK (snd_pcm_hw_params_set_channels (this->handle, hw_params, this->format->channels), MY_ERROR_CHECK (snd_pcm_hw_params_set_channels (this->handle, hw_params, format->channels),
"Channels count (%d) not available: %s", this->format->channels); "Channels count (%d) not available: %s", format->channels);
ERROR_CHECK (snd_pcm_hw_params_set_rate (this->handle, hw_params, this->format->rate, 0), MY_ERROR_CHECK (snd_pcm_hw_params_set_rate (this->handle, hw_params, format->rate, 0),
"error setting rate (%d): %s", this->format->rate); "error setting rate (%d): %s", format->rate);
} }
ERROR_CHECK (snd_pcm_hw_params_set_periods_near (this->handle, hw_params, &this->period_count, 0), MY_ERROR_CHECK (snd_pcm_hw_params_set_periods_near (this->handle, hw_params, &this->period_count, 0),
"error setting buffer size to %u: %s", (guint) this->period_count); "error setting buffer size to %u: %s", (guint) this->period_count);
ERROR_CHECK (snd_pcm_hw_params_set_period_size_near (this->handle, hw_params, &this->period_size, 0), MY_ERROR_CHECK (snd_pcm_hw_params_set_period_size_near (this->handle, hw_params, &this->period_size, 0),
"error setting period size to %u frames: %s", (guint) this->period_size); "error setting period size to %u frames: %s", (guint) this->period_size);
ERROR_CHECK (snd_pcm_hw_params (this->handle, hw_params), MY_ERROR_CHECK (snd_pcm_hw_params (this->handle, hw_params),
"Could not set hardware parameters: %s"); "Could not set hardware parameters: %s");
/* now get the pcm caps */ /* now get the pcm caps */
@ -1367,8 +1409,12 @@ gst_alsa_set_hw_params (GstAlsa *this)
this->transmit = gst_alsa_do_read_write; this->transmit = gst_alsa_do_read_write;
} }
g_free (oldformat);
this->format = format;
return TRUE; return TRUE;
} }
#undef MY_ERROR_CHECK
static gboolean static gboolean
gst_alsa_set_sw_params (GstAlsa *this) gst_alsa_set_sw_params (GstAlsa *this)
{ {
@ -1398,9 +1444,9 @@ gst_alsa_set_sw_params (GstAlsa *this)
} }
static gboolean static gboolean
gst_alsa_start_audio (GstAlsa *this) gst_alsa_start_audio (GstAlsa *this, GstAlsaFormat *format)
{ {
if (!gst_alsa_set_hw_params (this)) if (!gst_alsa_set_hw_params (this, format))
return FALSE; return FALSE;
if (!gst_alsa_set_sw_params (this)) if (!gst_alsa_set_sw_params (this))
return FALSE; return FALSE;