M image/user/data/equalizer/loudspeaker_routing.json => image/user/data/equalizer/loudspeaker_routing.json +19 -19
@@ 7,42 7,42 @@
"inputPath": 1,
"outputPath": 2,
"playbackPathGain": 0,
- "playbackPathAtten": 5,
+ "playbackPathAtten": 2,
"filterParams": [
{
- "filterType": "None",
- "frequency": 100.2,
+ "filterType": "HighPass",
+ "frequency": 501.8,
"samplerate": 16000,
"Q": 0.701,
"gain": 0
},
{
- "filterType": "None",
- "frequency": 17996.2,
+ "filterType": "Parametric",
+ "frequency": 2800,
"samplerate": 16000,
- "Q": 0.701,
- "gain": 0
+ "Q": 3,
+ "gain": -4
},
{
- "filterType": "None",
- "frequency": 13984.7,
+ "filterType": "Parametric",
+ "frequency": 4500,
"samplerate": 16000,
- "Q": 0.701,
- "gain": -10
+ "Q": 3,
+ "gain": -6
},
{
- "filterType": "None",
- "frequency": 200.4,
+ "filterType": "Parametric",
+ "frequency": 7100,
"samplerate": 16000,
- "Q": 0.701,
- "gain": -10
+ "Q": 3,
+ "gain": -3
},
{
- "filterType": "None",
- "frequency": 1496.7,
+ "filterType": "Parametric",
+ "frequency": 2000.0,
"samplerate": 16000,
- "Q": 0.701,
- "gain": -4
+ "Q": 2,
+ "gain": 6
}
]
}
M module-audio/Audio/Profiles/ProfilePlaybackHeadphones.hpp => module-audio/Audio/Profiles/ProfilePlaybackHeadphones.hpp +1 -1
@@ 14,7 14,7 @@ namespace audio
: Profile(
"Playback Headphones",
Type::PlaybackHeadphones,
- purefs::dir::getUserDiskPath() / "data/equalizer/headphones_playback.json",
+ purefs::dir::getCurrentOSPath() / "user/data/equalizer/headphones_playback.json",
audio::codec::Configuration{
.sampleRate_Hz = 0,
.bitWidth = 16,
M module-audio/Audio/Profiles/ProfilePlaybackLoudspeaker.hpp => module-audio/Audio/Profiles/ProfilePlaybackLoudspeaker.hpp +1 -1
@@ 15,7 15,7 @@ namespace audio
: Profile(
"Playback Loudspeaker",
Type::PlaybackLoudspeaker,
- purefs::dir::getUserDiskPath() / "data/equalizer/loudspeaker_playback.json",
+ purefs::dir::getCurrentOSPath() / "user/data/equalizer/loudspeaker_playback.json",
audio::codec::Configuration{
.sampleRate_Hz = 0,
.bitWidth = 16,
M module-audio/Audio/Profiles/ProfileRoutingEarspeaker.hpp => module-audio/Audio/Profiles/ProfileRoutingEarspeaker.hpp +1 -1
@@ 14,7 14,7 @@ namespace audio
: Profile(
"Routing Earspeaker",
Type::RoutingEarspeaker,
- purefs::dir::getUserDiskPath() / "data/equalizer/earspeaker_routing.json",
+ purefs::dir::getCurrentOSPath() / "user/data/equalizer/earspeaker_routing.json",
audio::codec::Configuration{
.sampleRate_Hz = 16000,
.bitWidth = 16,
M module-audio/Audio/Profiles/ProfileRoutingHeadphones.hpp => module-audio/Audio/Profiles/ProfileRoutingHeadphones.hpp +1 -1
@@ 14,7 14,7 @@ namespace audio
: Profile(
"Routing Headset",
Type::RoutingHeadphones,
- purefs::dir::getUserDiskPath() / "data/equalizer/headphones_routing.json",
+ purefs::dir::getCurrentOSPath() / "user/data/equalizer/headphones_routing.json",
audio::codec::Configuration{
.sampleRate_Hz = 16000,
.bitWidth = 16,
M module-audio/Audio/Profiles/ProfileRoutingLoudspeaker.hpp => module-audio/Audio/Profiles/ProfileRoutingLoudspeaker.hpp +27 -25
@@ 13,31 13,33 @@ namespace audio
public:
ProfileRoutingLoudspeaker(Volume volume, Gain gain)
- : Profile(
- "Routing Speakerphone",
- Type::RoutingLoudspeaker,
- purefs::dir::getUserDiskPath() / "data/equalizer/loudspeaker_routing.json",
- audio::codec::Configuration{
- .sampleRate_Hz = sampleRate,
- .bitWidth = 16,
- .flags =
- static_cast<uint32_t>(audio::codec::Flags::InputLeft) | // microphone use left audio channel
- static_cast<uint32_t>(audio::codec::Flags::OutputMono),
- .outputVolume = 1,
- .inputGain = 0,
- .playbackPathGain = 0,
- .playbackPathAtten = 5,
- .inputPath = audio::codec::InputPath::Microphone,
- .outputPath = audio::codec::OutputPath::Loudspeaker,
- .filterCoefficients =
- {qfilter_CalculateCoeffs(audio::equalizer::FilterType::None, 307.3f, sampleRate, 0.701f, 0),
- qfilter_CalculateCoeffs(audio::equalizer::FilterType::None, 5080.1f, sampleRate, 0.847f, 0),
- qfilter_CalculateCoeffs(
- audio::equalizer::FilterType::None, 15975.7f, sampleRate, 0.701f, -10),
- qfilter_CalculateCoeffs(audio::equalizer::FilterType::None, 200.4f, sampleRate, 0.701f, -10),
- qfilter_CalculateCoeffs(
- audio::equalizer::FilterType::None, 1496.7f, sampleRate, 0.701f, -4)}},
- AudioDevice::Type::Audiocodec)
+ : Profile("Routing Speakerphone",
+ Type::RoutingLoudspeaker,
+ purefs::dir::getCurrentOSPath() / "user/data/equalizer/loudspeaker_routing.json",
+ audio::codec::Configuration{
+ .sampleRate_Hz = sampleRate,
+ .bitWidth = 16,
+ .flags = static_cast<uint32_t>(
+ audio::codec::Flags::InputLeft) | // microphone use left audio channel
+ static_cast<uint32_t>(audio::codec::Flags::OutputMono),
+ .outputVolume = 1,
+ .inputGain = 0,
+ .playbackPathGain = 0,
+ .playbackPathAtten = 2,
+ .inputPath = audio::codec::InputPath::Microphone,
+ .outputPath = audio::codec::OutputPath::Loudspeaker,
+ .filterCoefficients =
+ {qfilter_CalculateCoeffs(
+ audio::equalizer::FilterType::HighPass, 501.8f, sampleRate, 0.701f, 0),
+ qfilter_CalculateCoeffs(
+ audio::equalizer::FilterType::Parametric, 2800.f, sampleRate, 3.f, -4),
+ qfilter_CalculateCoeffs(
+ audio::equalizer::FilterType::Parametric, 4500.f, sampleRate, 3.f, -6),
+ qfilter_CalculateCoeffs(
+ audio::equalizer::FilterType::Parametric, 7100.f, sampleRate, 3.f, -3),
+ qfilter_CalculateCoeffs(
+ audio::equalizer::FilterType::Parametric, 2000.f, sampleRate, 2.f, 6)}},
+ AudioDevice::Type::Audiocodec)
{
audioConfiguration.sampleRate_Hz = sampleRate;
audioConfiguration.outputVolume = static_cast<float>(volume);