ALSA: scarlett2: Increase mixer range to +12dB
Subsystems (2)
Geoffrey D. Bennett
maintainerPATCH 1/1 ALSA: scarlett2: Increase mixer range to +12dB
The values loaded into the mixer are 16-bit values, with 8192 representing 0dB, going up to a current maximum of 16345 (+6dB). All supported interfaces have no problem going up to 32612 (+12dB), so update SCARLETT2_MIXER_MAX_DB and scarlett2_mixer_values[] to allow for this.
Tested with:
- Scarlett 2nd Gen 6i6, 18i8, 18i20
- Scarlett 3rd Gen 4i4, 8i6, 18i8, 18i20
- Scarlett 4th Gen Solo, 2i2, 4i4
- Clarett+ 2Pre, 4Pre, 8Pre
- Vocaster One and Two
--- sound/usb/mixer_scarlett2.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
sound/usb/mixer_scarlett2.c +5 -4
@@ -184,16 +184,16 @@/* maximum Bluetooth volume value */ #define SCARLETT2_MAX_BLUETOOTH_VOLUME 30 -/* mixer range from -80dB to +6dB in 0.5dB steps */ +/* mixer range from -80dB to +12dB in 0.5dB steps */ #define SCARLETT2_MIXER_MIN_DB -80#define SCARLETT2_MIXER_BIAS (-SCARLETT2_MIXER_MIN_DB * 2) -#define SCARLETT2_MIXER_MAX_DB 6 +#define SCARLETT2_MIXER_MAX_DB 12#define SCARLETT2_MIXER_MAX_VALUE \ ((SCARLETT2_MIXER_MAX_DB - SCARLETT2_MIXER_MIN_DB) * 2)#define SCARLETT2_MIXER_VALUE_COUNT (SCARLETT2_MIXER_MAX_VALUE + 1)/* map from (dB + 80) * 2 to mixer value -* for dB in 0 .. 172: int(8192 * pow(10, ((dB - 160) / 2 / 20))) +* for dB in 0 .. 184: int(8192 * pow(10, ((dB - 160) / 2 / 20))) */ static const u16 scarlett2_mixer_values[SCARLETT2_MIXER_VALUE_COUNT ] = {0 ,0 ,0 ,0 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,2 ,2 ,2 ,2 ,2 ,
@@ -209,7 +209,8 @@ static const u16 scarlett2_mixer_values[SCARLETT2_MIXER_VALUE_COUNT] = {3078 ,3261 ,3454 ,3659 ,3876 ,4105 ,4349 ,4606 ,4879 ,5168 ,5475 ,5799 ,6143 ,6507 ,6892 ,7301 ,7733 ,8192 ,8677 ,9191 ,9736 ,10313 ,10924 ,11571 ,12257 ,12983 ,13752 ,14567 ,15430 , -16345 +16345 ,17313 ,18339 ,19426 ,20577 ,21796 ,23088 ,24456 ,25905 , +27440 ,29066 ,30788 ,32612 };/* Maximum number of analogue outputs */
Signature · 1 line
2.44.0
Quoted 7 lines · Geoffrey D. Bennett
The values loaded into the mixer are 16-bit values, with 8192 representing 0dB, going up to a current maximum of 16345 (+6dB). All supported interfaces have no problem going up to 32612 (+12dB), so update
SCARLETT2_MIXER_MAX_DBand scarlett2_mixer_values[] to allow for this.
Quoted 8 lines
Tested with:
- Scarlett 2nd Gen 6i6, 18i8, 18i20
- Scarlett 3rd Gen 4i4, 8i6, 18i8, 18i20
- Scarlett 4th Gen Solo, 2i2, 4i4
- Clarett+ 2Pre, 4Pre, 8Pre
- Vocaster One and TwoSigned-off-by Geoffrey D. Bennett <[email protected]>
Applied now. Thanks.
Takashi