| Message ID | 20190205162940.1028-1-ckeepax@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: compress: Fix stop handling on compressed capture streams | expand |
On Tue, 05 Feb 2019 17:29:40 +0100, Charles Keepax wrote: > > It is normal user behaviour to start, stop, then start a stream > again without closing it. Currently this works for compressed > playback streams but not capture ones. > > The states on a compressed capture stream go directly from OPEN to > PREPARED, unlike a playback stream which moves to SETUP and waits > for a write of data before moving to PREPARED. Currently however, > when a stop is sent the state is set to SETUP for both types of > streams. This leaves a capture stream in the situation where a new > start can't be sent as that requires the state to be PREPARED and > a new set_params can't be sent as that requires the state to be > OPEN. The only option being to close the stream, and then reopen. > > Correct this issues by allowing snd_compr_drain_notify to set the > state depending on the stream direction, as we already do in > set_params. > > Fixes: 49bb6402f1aa ("ALSA: compress_core: Add support for capture streams") > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Applied now (with Cc to stable). Thanks. Takashi
diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index 0cdc3999ecfa8..c5188ff724d12 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -173,7 +173,11 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) if (snd_BUG_ON(!stream)) return; - stream->runtime->state = SNDRV_PCM_STATE_SETUP; + if (stream->direction == SND_COMPRESS_PLAYBACK) + stream->runtime->state = SNDRV_PCM_STATE_SETUP; + else + stream->runtime->state = SNDRV_PCM_STATE_PREPARED; + wake_up(&stream->runtime->sleep); }
It is normal user behaviour to start, stop, then start a stream again without closing it. Currently this works for compressed playback streams but not capture ones. The states on a compressed capture stream go directly from OPEN to PREPARED, unlike a playback stream which moves to SETUP and waits for a write of data before moving to PREPARED. Currently however, when a stop is sent the state is set to SETUP for both types of streams. This leaves a capture stream in the situation where a new start can't be sent as that requires the state to be PREPARED and a new set_params can't be sent as that requires the state to be OPEN. The only option being to close the stream, and then reopen. Correct this issues by allowing snd_compr_drain_notify to set the state depending on the stream direction, as we already do in set_params. Fixes: 49bb6402f1aa ("ALSA: compress_core: Add support for capture streams") Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> --- include/sound/compress_driver.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)