iMX/i2som-imx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MLK-24044: ASoC: fsl_easrc_m2m: Fix output length not accurate

Browse Source 
We need to accumulate the input data length for calculating the
output length because there are data need to be prefilled in
the beginning. If the fraction part beyond the integrity of
sample is not considered in calculating, which may cause the
output task timeout.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Viorel Suman <viorel.suman@nxp.com>
This commit is contained in:
Shengjiu Wang
2020-05-15 15:51:43 +08:00
parent 54a5d221ed
commit 3e87108614
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/fsl/fsl_easrc_m2m.c
View File

@ -10,6 +10,7 @@ struct fsl_easrc_m2m {
unsigned int easrc_active;
unsigned int first_convert;
unsigned int sg_nodes[2];
unsigned int in_filled_len;
struct scatterlist sg[2][9];
struct dma_async_tx_descriptor *desc[2];
spinlock_t lock; /* protect mem resource */
@ -181,17 +182,15 @@ static long fsl_easrc_calc_outbuf_len(struct fsl_easrc_m2m *m2m,
in_width = snd_pcm_format_physical_width(ctx->in_params.sample_format) / 8;
out_width = snd_pcm_format_physical_width(ctx->out_params.sample_format) / 8;
in_samples = pbuf->input_buffer_length / (in_width * channels);
out_samples = ctx->out_params.sample_rate * in_samples /
ctx->in_params.sample_rate;
out_length = out_samples * out_width * channels;
if (out_samples <= ctx->out_missed_sample) {
m2m->in_filled_len += pbuf->input_buffer_length;
if (m2m->in_filled_len <= ctx->in_filled_sample * in_width * channels) {
out_length = 0;
ctx->out_missed_sample -= out_samples;
} else {
out_length -= ctx->out_missed_sample * out_width * channels;
ctx->out_missed_sample = 0;
in_samples = m2m->in_filled_len / (in_width * channels) - ctx->in_filled_sample;
out_samples = ctx->out_params.sample_rate * in_samples /
ctx->in_params.sample_rate;
out_length = out_samples * out_width * channels;
m2m->in_filled_len = ctx->in_filled_sample * in_width * channels;
}
return out_length;