Takashi Iwai
75216f4ef8
- Backport various upstream fixes for PCM (bnc#979702): 0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch 0002-pcm-Clean-up-error-paths-in-snd_pcm_plugin_-helpers.patch 0003-pcm-Fallback-open-as-the-first-instance-for-dmix-co.patch 0004-pcm-softvol-fix-conversion-of-TLVs-min_db-and-max_dB.patch 0005-pcm-Fix-suspend-resume-regression-with-dmix-co.patch 0006-pcm-dmix-Fix-doubly-resume-of-slave-PCM.patch OBS-URL: https://build.opensuse.org/request/show/395038 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=196
90 lines
2.9 KiB
Diff
90 lines
2.9 KiB
Diff
From 85bf9915989e0a338632739684c75192c1753239 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
|
Date: Sun, 8 May 2016 20:48:42 +0200
|
|
Subject: [PATCH] pcm: softvol: fix conversion of TLVs min_db and max_dB value
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Both, min_dB and max_dB, are floating type whereas the TLV is (always)
|
|
unsigned.
|
|
|
|
The problem with the conversion of a negative floating-point number into an
|
|
unsigned integer is, that the behavior is undefined. This may, depending on
|
|
the platform, result in a wrong TLV, i.e. for the default values of min_dB
|
|
(-51dB) and max_dB (0dB), alsactl generates the following state on an ARM
|
|
cpu build with GCC:
|
|
|
|
control.1 {
|
|
iface MIXER
|
|
name Master
|
|
value.0 255
|
|
value.1 255
|
|
comment {
|
|
access 'read write user'
|
|
type INTEGER
|
|
count 2
|
|
range '0 - 255'
|
|
tlv '00000001000000080000000000000014'
|
|
dbmin 0
|
|
dbmax 5100
|
|
dbvalue.0 5100
|
|
dbvalue.1 5100
|
|
}
|
|
}
|
|
|
|
With the fix applied, alsactl stores the correct TLV:
|
|
|
|
control.1 {
|
|
iface MIXER
|
|
name Master
|
|
value.0 255
|
|
value.1 255
|
|
comment {
|
|
access 'read write user'
|
|
type INTEGER
|
|
count 2
|
|
range '0 - 255'
|
|
tlv '0000000100000008ffffec1400000014'
|
|
dbmin -5100
|
|
dbmax 0
|
|
dbvalue.0 0
|
|
dbvalue.1 0
|
|
}
|
|
}
|
|
|
|
Also tested for different combinations of min_dB and max_dB other than the
|
|
default values.
|
|
|
|
Replaces:
|
|
http://mailman.alsa-project.org/pipermail/alsa-devel/2016-May/107733.html
|
|
|
|
Fixes:
|
|
http://mailman.alsa-project.org/pipermail/alsa-devel/2016-May/107628.html
|
|
|
|
Cc: Clemens Ladisch <clemens@ladisch.de>
|
|
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_softvol.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
|
|
index 802aa4b7cb68..5492db8cf9f1 100644
|
|
--- a/src/pcm/pcm_softvol.c
|
|
+++ b/src/pcm/pcm_softvol.c
|
|
@@ -658,8 +658,8 @@ static int add_tlv_info(snd_pcm_softvol_t *svol, snd_ctl_elem_info_t *cinfo)
|
|
unsigned int tlv[4];
|
|
tlv[0] = SND_CTL_TLVT_DB_SCALE;
|
|
tlv[1] = 2 * sizeof(int);
|
|
- tlv[2] = svol->min_dB * 100;
|
|
- tlv[3] = (svol->max_dB - svol->min_dB) * 100 / svol->max_val;
|
|
+ tlv[2] = (int)(svol->min_dB * 100);
|
|
+ tlv[3] = (int)((svol->max_dB - svol->min_dB) * 100 / svol->max_val);
|
|
return snd_ctl_elem_tlv_write(svol->ctl, &cinfo->id, tlv);
|
|
}
|
|
|
|
--
|
|
2.8.2
|
|
|