| Message ID | 20190722092436.651-3-ckeepax@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/4] ALSA: compress: Fix regression on compressed capture streams | expand |
On Mon, 22 Jul 2019 11:24:35 +0200, Charles Keepax wrote: > > Partial drain and next track are intended for gapless playback and > don't really have an obvious interpretation for a capture stream, so > makes sense to not allow those operations on capture streams. > > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Applied, thanks. Takashi > --- > > Changes since v1: > - Continue to allow drain on capture streams. > > Thanks, > Charles > > sound/core/compress_offload.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c > index 40dae723c59db..6cf5b8440cf30 100644 > --- a/sound/core/compress_offload.c > +++ b/sound/core/compress_offload.c > @@ -834,6 +834,10 @@ static int snd_compr_next_track(struct snd_compr_stream *stream) > if (stream->runtime->state != SNDRV_PCM_STATE_RUNNING) > return -EPERM; > > + /* next track doesn't have any meaning for capture streams */ > + if (stream->direction == SND_COMPRESS_CAPTURE) > + return -EPERM; > + > /* you can signal next track if this is intended to be a gapless stream > * and current track metadata is set > */ > @@ -861,6 +865,10 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream) > break; > } > > + /* partial drain doesn't have any meaning for capture streams */ > + if (stream->direction == SND_COMPRESS_CAPTURE) > + return -EPERM; > + > /* stream can be drained only when next track has been signalled */ > if (stream->next_track == false) > return -EPERM; > -- > 2.11.0 > >
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 40dae723c59db..6cf5b8440cf30 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -834,6 +834,10 @@ static int snd_compr_next_track(struct snd_compr_stream *stream) if (stream->runtime->state != SNDRV_PCM_STATE_RUNNING) return -EPERM; + /* next track doesn't have any meaning for capture streams */ + if (stream->direction == SND_COMPRESS_CAPTURE) + return -EPERM; + /* you can signal next track if this is intended to be a gapless stream * and current track metadata is set */ @@ -861,6 +865,10 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream) break; } + /* partial drain doesn't have any meaning for capture streams */ + if (stream->direction == SND_COMPRESS_CAPTURE) + return -EPERM; + /* stream can be drained only when next track has been signalled */ if (stream->next_track == false) return -EPERM;
Partial drain and next track are intended for gapless playback and don't really have an obvious interpretation for a capture stream, so makes sense to not allow those operations on capture streams. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> --- Changes since v1: - Continue to allow drain on capture streams. Thanks, Charles sound/core/compress_offload.c | 8 ++++++++ 1 file changed, 8 insertions(+)