[alsa-devel] [PATCH TINYCOMPRESS 8/14] compress: Handle case of pause() during compress_write()
Richard Fitzgerald
rf at opensource.wolfsonmicro.com
Sun Feb 10 01:15:06 CET 2013
If stream is paused() during a compress_write() the poll()
will return 0 or -EBADFD, or the write() will return -EBADFD.
This is not an error so compress_write() should not pass an
error code to the caller. It should abort the write and then
return the number of bytes it had written up to that point.
diff --git a/compress.c b/compress.c
index b706f8b..7457550 100644
--- a/compress.c
+++ b/compress.c
@@ -329,10 +329,13 @@ int compress_write(struct compress *compress, const void *buf, unsigned int size
if (avail.avail < compress->config.fragment_size) {
/* nothing to write so wait */
ret = poll(&fds, 1, compress->max_poll_wait_ms);
+ /* A pause will cause -EBADFD or zero return from driver
+ * This is not an error, just stop writing
+ */
+ if ((ret == 0) || (ret == -EBADFD))
+ break;
if (ret < 0)
return oops(compress, errno, "poll error");
- if (ret == 0)
- return oops(compress, -EPIPE, "Poll timeout, Broken Pipe");
if (fds.revents & POLLOUT) {
if (ioctl(compress->fd, SNDRV_COMPRESS_AVAIL, &avail))
return oops(compress, errno, "cannot get avail");
@@ -351,6 +354,9 @@ int compress_write(struct compress *compress, const void *buf, unsigned int size
else
to_write = size;
written = write(compress->fd, cbuf, to_write);
+ /* If play was paused the write returns -EBADFD */
+ if (written == -EBADFD)
+ break;
if (written < 0)
return oops(compress, errno, "write failed!\n");
--
1.7.2.5
More information about the Alsa-devel
mailing list