mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: clean up volume min/max values

Browse source
This commit is contained in:
Wim Taymans 2023-01-20 09:29:59 +01:00
parent 1442fa7da7
commit eadab2ffe3
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pipewire-alsa/alsa-plugins/ctl_pipewire.c
View file

@ -37,24 +37,23 @@
PW_LOG_TOPIC_STATIC(alsa_log_topic, "alsa.ctl"); PW_LOG_TOPIC_STATIC(alsa_log_topic, "alsa.ctl");
#define PW_LOG_TOPIC_DEFAULT alsa_log_topic #define PW_LOG_TOPIC_DEFAULT alsa_log_topic
#define VOLUME_MAX 65536 #define VOLUME_MIN ((uint32_t) 0U)
#define VOLUME_MUTED ((uint32_t) 0U) #define VOLUME_MAX ((uint32_t) 0x10000U)
#define VOLUME_NORM ((uint32_t) 0x10000U)
static inline uint32_t volume_from_linear(float vol) static inline uint32_t volume_from_linear(float vol)
{ {
uint32_t v; uint32_t v;
if (vol <= 0.0f) if (vol <= 0.0f)
v = VOLUME_MUTED; v = VOLUME_MIN;
else else
v = SPA_CLAMP((uint64_t) lround(cbrt(vol) * VOLUME_NORM), v = SPA_CLAMP((uint64_t) lround(cbrt(vol) * VOLUME_MAX),
VOLUME_MUTED, VOLUME_MAX); VOLUME_MIN, VOLUME_MAX);
return v; return v;
} }
static inline float volume_to_linear(uint32_t vol) static inline float volume_to_linear(uint32_t vol)
{ {
float v = ((float)vol) / VOLUME_NORM; float v = ((float)vol) / VOLUME_MAX;
return v * v * v; return v * v * v;
} }
@ -437,7 +436,7 @@ static int pipewire_get_integer_info(snd_ctl_ext_t * ext,
long *imax, long *istep) long *imax, long *istep)
{ {
*istep = 1; *istep = 1;
*imin = 0; *imin = VOLUME_MIN;
*imax = VOLUME_MAX; *imax = VOLUME_MAX;
return 0; return 0;