ALSA: snd-aloop - fix capture buffer silence

perexg · perexg · commit 20d9a26dbbbe · 2010-09-30T00:20:17.000+02:00
In a special case, some old samples are left in the capture ring buffer.
Fix it.

Signed-off-by: Jaroslav Kysela &lt;perex@perex.cz&gt;
diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
@@ -347,7 +347,7 @@ static void copy_play_buf(struct loopback_pcm *play,
 			  unsigned int bytes)
 {
 	struct snd_pcm_runtime *runtime = play->substream->runtime;
-	char *src = play->substream->runtime->dma_area;
+	char *src = runtime->dma_area;
 	char *dst = capt->substream->runtime->dma_area;
 	unsigned int src_off = play->buf_pos;
 	unsigned int dst_off = capt->buf_pos;
@@ -385,8 +385,10 @@ static void copy_play_buf(struct loopback_pcm *play,
 		dst_off = (dst_off + size) % capt->pcm_buffer_size;
 	}
 
-	if (clear_bytes > 0)
+	if (clear_bytes > 0) {
 		clear_capture_buf(capt, clear_bytes);
+		capt->silent_size = 0;
+	}
 }
 
 #define BYTEPOS_UPDATE_POSONLY	0

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ static void copy_play_buf(struct loopback_pcm *play,`
`347`	`347`	`unsigned int bytes)`
`348`	`348`	`{`
`349`	`349`	`struct snd_pcm_runtime *runtime = play->substream->runtime;`
`350`		`- char *src = play->substream->runtime->dma_area;`
	`350`	`+ char *src = runtime->dma_area;`
`351`	`351`	`char *dst = capt->substream->runtime->dma_area;`
`352`	`352`	`unsigned int src_off = play->buf_pos;`
`353`	`353`	`unsigned int dst_off = capt->buf_pos;`
`@@ -385,8 +385,10 @@ static void copy_play_buf(struct loopback_pcm *play,`
`385`	`385`	`dst_off = (dst_off + size) % capt->pcm_buffer_size;`
`386`	`386`	`}`
`387`	`387`
`388`		`- if (clear_bytes > 0)`
	`388`	`+ if (clear_bytes > 0) {`
`389`	`389`	`clear_capture_buf(capt, clear_bytes);`
	`390`	`+ capt->silent_size = 0;`
	`391`	`+ }`
`390`	`392`	`}`
`391`	`393`
`392`	`394`	`#define BYTEPOS_UPDATE_POSONLY 0`