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

ext/alsa/gstalsa.c: Only set hardware parameters *after* negotiation. Before negotiation, it will set ANY and that se...

Browse source 
Original commit message from CVS:
* ext/alsa/gstalsa.c: (gst_alsa_change_state):
Only set hardware parameters *after* negotiation. Before
negotiation, it will set ANY and that seems to cause crashes
(see e.g. #151288, #153227).
This commit is contained in:
Ronald S. Bultje 2004-11-11 10:27:01 +00:00
parent f04b458d87
commit 05b7b2845b
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-11-11 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/alsa/gstalsa.c: (gst_alsa_change_state):
Only set hardware parameters *after* negotiation. Before
negotiation, it will set ANY and that seems to cause crashes
(see e.g. #151288, #153227).
2004-11-10 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-11-10 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/alsa/gstalsasink.c: (gst_alsa_sink_get_time): * ext/alsa/gstalsasink.c: (gst_alsa_sink_get_time):

13
ext/alsa/gstalsa.c
View file

@ -1100,9 +1100,6 @@ gst_alsa_change_state (GstElement * element)
return GST_STATE_FAILURE; return GST_STATE_FAILURE;
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_READY_TO_PAUSED:
if (!(GST_FLAG_IS_SET (element, GST_ALSA_RUNNING) ||
gst_alsa_start_audio (this)))
return GST_STATE_FAILURE;
this->played = 0; this->played = 0;
this->captured = 0; this->captured = 0;
break; break;
@ -1113,8 +1110,14 @@ gst_alsa_change_state (GstElement * element)
snd_strerror (err)); snd_strerror (err));
return GST_STATE_FAILURE; return GST_STATE_FAILURE;
} }
} else if (!(GST_FLAG_IS_SET (element, GST_ALSA_RUNNING) || }
gst_alsa_start_audio (this))) { /* If we were already negotiated, but we are not running, then
* we stopped (probably because we paused), so re-start. If
* there's no format, we didn't negotiate yet so don't do
* anything because ALSA will crash (#151288, #153227, etc.). */
else if (this->format != NULL &&
!GST_FLAG_IS_SET (element, GST_ALSA_RUNNING) &&
!gst_alsa_start_audio (this)) {
return GST_STATE_FAILURE; return GST_STATE_FAILURE;
} }
gst_alsa_clock_start (this->clock); gst_alsa_clock_start (this->clock);