From: <th...@ke...> - 2007-12-08 16:47:44
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: thaytan Date: Sat Dec 08 2007 16:47:48 UTC Log message: * sys/oss/gstosshelper.c: Verify that the format returned after the ioctl is the one we requested. It is valid for the ioctl to succeed while substituting an alternate 'supported' sample format. Modified files: . : ChangeLog sys/oss : gstosshelper.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3202&r2=1.3203 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/sys/oss/gstosshelper.c.diff?r1=1.10&r2=1.11 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.3202 retrieving revision 1.3203 diff -u -d -r1.3202 -r1.3203 --- ChangeLog 7 Dec 2007 20:07:48 -0000 1.3202 +++ ChangeLog 8 Dec 2007 16:47:32 -0000 1.3203 @@ -1,3 +1,10 @@ +2007-12-08 Jan Schmidt <jan...@su...> + + * sys/oss/gstosshelper.c: + Verify that the format returned after the ioctl is the one + we requested. It is valid for the ioctl to succeed while + substituting an alternate 'supported' sample format. 2007-12-07 Tim-Philipp Müller <tim at centricular dot net> * sys/oss/gstossaudio.c: (plugin_init): Index: gstosshelper.c RCS file: /cvs/gstreamer/gst-plugins-good/sys/oss/gstosshelper.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gstosshelper.c 23 Sep 2007 18:57:14 -0000 1.10 +++ gstosshelper.c 8 Dec 2007 16:47:33 -0000 1.11 @@ -352,7 +352,7 @@ GST_LOG ("checking format %d, channels %d, rate %d", format, n_channels, rate); ret = ioctl (probe->fd, SNDCTL_DSP_SETFMT, &format); - if (ret < 0) + if (ret < 0 || format != probe->format) return -1; ret = ioctl (probe->fd, SNDCTL_DSP_CHANNELS, &n_channels); if (ret < 0) |