diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2020-10-24 18:20:59 +0200 |
|---|---|---|
| committer | Arun Raghavan <arun@asymptotic.io> | 2021-01-07 19:17:13 -0500 |
| commit | de9299c7b7610f7cfd3a91af5e8a2a139cd1e464 (patch) | |
| tree | d1238a89baf06710b09c3674759739ffd68f7006 | |
| parent | d1e0594e939e3309435c966d994b0207b10f5175 (diff) | |
| download | pulseaudio-de9299c7b7610f7cfd3a91af5e8a2a139cd1e464.tar.gz | |
alsa: mixer - use safe dB range values when the override mask is unset
Use safe values for the min_dB and max_dB fields when the position mask
is unset to avoid breakage for the upper levels.
If the range is incorrect, the volume range shown in pavucontrol shows
strange values.
(Thanks to Wim Taymans for the idea.)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/389>
| -rw-r--r-- | src/modules/alsa/alsa-mixer.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c index 063179052..4a50bd902 100644 --- a/src/modules/alsa/alsa-mixer.c +++ b/src/modules/alsa/alsa-mixer.c @@ -3017,6 +3017,7 @@ int pa_alsa_path_probe(pa_alsa_path *p, pa_alsa_mapping *mapping, snd_mixer_t *m double min_dB[PA_CHANNEL_POSITION_MAX], max_dB[PA_CHANNEL_POSITION_MAX]; pa_channel_position_t t; pa_channel_position_mask_t path_volume_channels = 0; + bool min_dB_set, max_dB_set; char buf[64]; pa_assert(p); @@ -3047,7 +3048,7 @@ int pa_alsa_path_probe(pa_alsa_path *p, pa_alsa_mapping *mapping, snd_mixer_t *m pa_log_debug("Probe of element %s failed.", buf); return -1; } - pa_log_debug("Probe of element %s succeeded (volume=%d, switch=%d, enumeration=%d).", buf, e->volume_use, e->switch_use, e->enumeration_use); + pa_log_debug("Probe of element %s succeeded (volume=%d, switch=%d, enumeration=%d, has_dB=%d).", buf, e->volume_use, e->switch_use, e->enumeration_use, e->has_dB); if (ignore_dB) e->has_dB = false; @@ -3111,18 +3112,30 @@ int pa_alsa_path_probe(pa_alsa_path *p, pa_alsa_mapping *mapping, snd_mixer_t *m p->supported = true; p->min_dB = INFINITY; + min_dB_set = false; p->max_dB = -INFINITY; + max_dB_set = false; for (t = 0; t < PA_CHANNEL_POSITION_MAX; t++) { if (path_volume_channels & PA_CHANNEL_POSITION_MASK(t)) { - if (p->min_dB > min_dB[t]) + if (p->min_dB > min_dB[t]) { p->min_dB = min_dB[t]; + min_dB_set = true; + } - if (p->max_dB < max_dB[t]) + if (p->max_dB < max_dB[t]) { p->max_dB = max_dB[t]; + max_dB_set = true; + } } } + /* this is probably a wrong prediction, but it should be safe */ + if (!min_dB_set) + p->min_dB = -INFINITY; + if (!max_dB_set) + p->max_dB = 0; + return 0; } |