Commit a9960e6a authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai

ALSA: pcm: fix fifo_size frame calculation

The calculated frame size was wrong because snd_pcm_format_physical_width()
actually returns the number of bits, not bytes.

Use snd_pcm_format_size() instead, which not only returns bytes, but also
simplifies the calculation.

Fixes: 8bea869c ("ALSA: PCM midlevel: improve fifo_size handling")
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8245b363
...@@ -1782,14 +1782,16 @@ static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream, ...@@ -1782,14 +1782,16 @@ static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream,
{ {
struct snd_pcm_hw_params *params = arg; struct snd_pcm_hw_params *params = arg;
snd_pcm_format_t format; snd_pcm_format_t format;
int channels, width; int channels;
ssize_t frame_size;
params->fifo_size = substream->runtime->hw.fifo_size; params->fifo_size = substream->runtime->hw.fifo_size;
if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_FIFO_IN_FRAMES)) { if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_FIFO_IN_FRAMES)) {
format = params_format(params); format = params_format(params);
channels = params_channels(params); channels = params_channels(params);
width = snd_pcm_format_physical_width(format); frame_size = snd_pcm_format_size(format, channels);
params->fifo_size /= width * channels; if (frame_size > 0)
params->fifo_size /= (unsigned)frame_size;
} }
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment