From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 3 May 2006 17:18:28 +0000 (+0200)
Subject: Fix hwptr update in rate plugin
X-Git-Tag: v1.0.12rc1~12
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=f9e0c56c46de1d5be93a732a3ca9a3251cb6a225;p=alsa-lib.git

Fix hwptr update in rate plugin

Fixed the update of hwptr in rate plugin.
This caused bad sounds on rate expansion and invalid memory access.
---

diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
index 0403e527..bbf0df61 100644
--- a/src/pcm/pcm_rate.c
+++ b/src/pcm/pcm_rate.c
@@ -603,7 +603,7 @@ static inline void snd_pcm_rate_sync_hwptr(snd_pcm_t *pcm)
 	 */
 	rate->hw_ptr =
 		(slave_hw_ptr / rate->gen.slave->period_size) * pcm->period_size +
-		rate->ops.output_frames(rate->obj, slave_hw_ptr % rate->gen.slave->period_size);
+		rate->ops.input_frames(rate->obj, slave_hw_ptr % rate->gen.slave->period_size);
 }
 
 static int snd_pcm_rate_hwsync(snd_pcm_t *pcm)
@@ -1437,9 +1437,6 @@ int _snd_pcm_rate_open(snd_pcm_t **pcmp, const char *name,
 		return -EINVAL;
 	}
 
-	if (! type) {
-	}
-
 	err = snd_pcm_slave_conf(root, slave, &sconf, 2,
 				 SND_PCM_HW_PARAM_FORMAT, 0, &sformat,
 				 SND_PCM_HW_PARAM_RATE, SCONF_MANDATORY, &srate);