From: Abramo Bagnara <abramo@alsa-project.org>
Date: Thu, 30 Nov 2000 14:14:36 +0000 (+0000)
Subject: Fixed sw_params
X-Git-Tag: v1.0.3~292
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=b62a07a9db7204eb77b8d73c37e1be5008500ec2;p=alsa-utils.git

Fixed sw_params
---

diff --git a/aplay/aplay.c b/aplay/aplay.c
index 9118fb2..c7dd5a0 100644
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -683,6 +683,7 @@ static void set_params(void)
 {
 	snd_pcm_hw_info_t info;
 	snd_pcm_strategy_t *strategy;
+	size_t bufsize;
 	int err;
 	snd_pcm_hw_info_any(&info);
 	if (mmap_flag)
@@ -721,16 +722,27 @@ static void set_params(void)
 		error("unable to set hw params");
 		exit(EXIT_FAILURE);
 	}
+	bufsize = hwparams.fragment_size * hwparams.fragments;
 
 	swparams.start_mode = SND_PCM_START_DATA;
 	swparams.ready_mode = ready_mode;
 	swparams.xrun_mode = xrun_mode;
 	swparams.avail_min = hwparams.rate * avail_min / 1000;
+	swparams.xfer_min = hwparams.rate * xfer_min / 1000;
 	if (xrun_mode == SND_PCM_XRUN_FRAGMENT)
 		swparams.xfer_align = hwparams.fragment_size;
 	else
 		swparams.xfer_align = 1;
-	swparams.xfer_min = hwparams.rate * xfer_min / 1000;
+	swparams.xfer_min -= swparams.xfer_min % swparams.xfer_align;
+	swparams.avail_min -= swparams.avail_min % swparams.xfer_align;
+	if (swparams.xfer_min == 0)
+		swparams.xfer_min = swparams.xfer_align;
+	else if (swparams.xfer_min >= bufsize)
+		swparams.xfer_min = bufsize - swparams.xfer_align;
+	if (swparams.avail_min == 0)
+		swparams.avail_min = swparams.xfer_align;
+	else if (swparams.avail_min >= bufsize)
+		swparams.avail_min = bufsize - swparams.xfer_align;
 	swparams.time = 0;
 	if (snd_pcm_sw_params(handle, &swparams) < 0) {
 		snd_pcm_dump_sw_params_fail(&swparams, stderr);