From bc7a944c50239faf41619826ae914081034f83fe Mon Sep 17 00:00:00 2001 From: Marcin Rajwa Date: Fri, 7 Aug 2020 15:56:05 +0200 Subject: [PATCH] aplay: pcm_readv(): return read samples instead of requested upon abort This patch changes the logic of pcm_readv() when abort signal has been detected. During such condition we should return the amount of frames actually read instead of the size requested by caller. Currently functions pcm_read() and pcm_readv() when aborted (in_aborting flag set) return the amount of requested frames instead of those actually read prior to interrupt. The consequence of this is repetition of recent X frames where X stands for amount of frames in one period. This problem is barely visible or rather audible when the period is small like few milliseconds because repetition of 1 [ms] of data is not-noticeable however if we use buffer and period sizes in seconds then the problem becomes apparent. Example issue -> thesofproject/sof#3189 Signed-off-by: Marcin Rajwa Signed-off-by: Jaroslav Kysela --- aplay/aplay.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aplay/aplay.c b/aplay/aplay.c index e8714d8..6e7f4ae 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -2174,7 +2174,9 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount) count = chunk_size; } - while (count > 0 && !in_aborting) { + while (count > 0) { + if (in_aborting) + goto abort; unsigned int channel; void *bufs[channels]; size_t offset = result; @@ -2206,6 +2208,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount) count -= r; } } +abort: return rcount; }