github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-12 08:43:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ALSA: pcm_dmaengine: preprocess vad data for the first round

Browse Source 
This patch fixup the lost vad activity frames count in the
first round dma xfer.

Change-Id: I72c1e5a9aeefc4966741b1fbf9c9e4d551cacfab
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
This commit is contained in:
Sugar Zhang 2018-08-31 11:58:07 +08:00 committed by Tao Huang
parent 128120abb0
commit 924c406896
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/core/pcm_dmaengine.c
View File

@ -35,6 +35,7 @@ struct dmaengine_pcm_runtime_data {
unsigned int pos;
#ifdef CONFIG_SND_SOC_ROCKCHIP_VAD
unsigned int vpos;
unsigned int vresidue_bytes;
#endif
};
@ -188,7 +189,21 @@ static void dmaengine_pcm_vad_dma_complete(void *arg)
{
struct snd_pcm_substream *substream = arg;
struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
unsigned int pos, size;
void *buf;
if (snd_pcm_vad_attached(substream) &&
substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
buf = substream->runtime->dma_area + prtd->vpos;
pos = prtd->vpos + snd_pcm_lib_period_bytes(substream);
if (pos <= snd_pcm_lib_buffer_bytes(substream))
size = substream->runtime->period_size;
else
size = bytes_to_frames(substream->runtime,
prtd->vresidue_bytes);
snd_pcm_vad_preprocess(substream, buf, size);
}
prtd->vpos += snd_pcm_lib_period_bytes(substream);
if (prtd->vpos >= snd_pcm_lib_buffer_bytes(substream))
prtd->vpos = 0;
@ -221,6 +236,7 @@ static int dmaengine_pcm_prepare_single_and_submit(struct snd_pcm_substream *sub
buf_end = substream->runtime->dma_addr + snd_pcm_lib_buffer_bytes(substream);
count = (buf_end - buf_start) / period_bytes;
residue_bytes = (buf_end - buf_start) % period_bytes;
prtd->vresidue_bytes = residue_bytes;
pr_debug("%s: offset: %d, buffer_bytes: %d\n", __func__, offset, buffer_bytes);
pr_debug("%s: count: %d, residue_bytes: %d\n", __func__, count, residue_bytes);
for (i = 0; i < count; i++) {