New dpatch to fix #367524.
git-svn-id: svn://anonscm.debian.org/svn/pkg-alsa/trunk/alsa-lib@1638 9eaf2def-abe4-0310-ac0d-9aefe66b05c3
Jordi Mallach
17 years ago
|
0 |
alsa-lib (1.0.11-4) UNRELEASED; urgency=low
|
|
1 |
|
|
2 |
* debian/patches/06_pcm_rate_hwptr_update.dpatch: Fix the update of hwptr
|
|
3 |
in rate plugin to avoid bad sounds on Ekiga and other applications
|
|
4 |
(closes: #367524).
|
|
5 |
|
|
6 |
-- Jordi Mallach <jordi@debian.org> Wed, 17 May 2006 18:19:37 +0200
|
|
7 |
|
| 0 | 8 |
alsa-lib (1.0.11-3) unstable; urgency=low
|
| 1 | 9 |
|
| 2 | 10 |
* debian/control: make lib32asound2 Replace/Conflict ia32-libs (<< 1.9),
|
| 2 | 2 |
03_configure_cross_compile
|
| 3 | 3 |
04_doxygen_links
|
| 4 | 4 |
05_multiarch
|
|
5 |
06_pcm_rate_hwptr_update
|
|
0 |
#! /bin/sh /usr/share/dpatch/dpatch-run
|
|
1 |
## 06_pcm_rate_hwptr_update.dpatch by Jordi Mallach <jordi@debian.org>
|
|
2 |
##
|
|
3 |
## All lines beginning with `## DP:' are a description of the patch.
|
|
4 |
## DP: Fixed the update of hwptr in rate plugin.
|
|
5 |
## DP: This caused bad sounds on rate expansion and invalid memory access.
|
|
6 |
|
|
7 |
@DPATCH@
|
|
8 |
diff -urNad alsa-lib-1.0.11~/src/pcm/pcm_rate.c alsa-lib-1.0.11/src/pcm/pcm_rate.c
|
|
9 |
--- alsa-lib-1.0.11~/src/pcm/pcm_rate.c 2006-04-12 12:38:16.000000000 +0200
|
|
10 |
+++ alsa-lib-1.0.11/src/pcm/pcm_rate.c 2006-05-17 18:15:05.392666006 +0200
|
|
11 |
@@ -600,7 +600,7 @@
|
|
12 |
*/
|
|
13 |
rate->hw_ptr =
|
|
14 |
(slave_hw_ptr / rate->gen.slave->period_size) * pcm->period_size +
|
|
15 |
- rate->ops.output_frames(rate->obj, slave_hw_ptr % rate->gen.slave->period_size);
|
|
16 |
+ rate->ops.input_frames(rate->obj, slave_hw_ptr % rate->gen.slave->period_size);
|
|
17 |
}
|
|
18 |
|
|
19 |
static int snd_pcm_rate_hwsync(snd_pcm_t *pcm)
|
|
20 |
@@ -1387,9 +1387,6 @@
|
|
21 |
return -EINVAL;
|
|
22 |
}
|
|
23 |
|
|
24 |
- if (! type) {
|
|
25 |
- }
|
|
26 |
-
|
|
27 |
err = snd_pcm_slave_conf(root, slave, &sconf, 2,
|
|
28 |
SND_PCM_HW_PARAM_FORMAT, 0, &sformat,
|
|
29 |
SND_PCM_HW_PARAM_RATE, SCONF_MANDATORY, &srate);
|