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

bluetooth: Use software volume for >100%, balance and finer control

Browse source 
This compensates discrepancies between requested volume and actual
volume represented by the 127-step A2DP range or 15-step HSP/HFP range,
including setting volume above 100% without any additional logic; the
delta simply becomes larger.  The delta is calculated per channel
against "mono" hardware volume on the remote to also take care of
differences in balance.  The remote uses the maximum volume of all
channels and software is used to attenuate below that (or above, if one
or more channels are set above 100%).

Note that this does _NOT_ take the actual volume on the remote into
account yet! Most headphones don't use the full range, and instead round
to the nearest multiple of some arbitrarily chosen step size.
They do reply with this value, which we should consequently retrieve and
deal with.
This commit is contained in:
Marijn Suijten 2020-11-23 23:10:44 +01:00
parent 5af2afba85
commit a01a897345
1 changed files with 42 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/modules/bluetooth/module-bluez5-device.c
View file

@ -924,9 +924,38 @@ static int source_set_state_in_io_thread_cb(pa_source *s, pa_source_state_t new_
return 0;
}
/* Use software volume to compensate for lack in hardware granularity,
* provide stereo balance, and >100% amplification */
static bool set_software_volume_compensation(const pa_cvolume *real_volume,
const pa_volume_t hardware_volume,
pa_cvolume *soft_volume) {
char hw_volume_str[PA_VOLUME_SNPRINT_VERBOSE_MAX];
char volume_str[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
bool different = false;
pa_assert(real_volume->channels == soft_volume->channels);
for (int i = 0; i < soft_volume->channels; ++i) {
/* Calculate in unsigned space since hardware volume can never exceed real_volume */
pa_volume_t delta = PA_VOLUME_NORM + real_volume->values[i] - hardware_volume;
soft_volume->values[i] = delta;
different |= delta != PA_VOLUME_NORM;
}
if (different) {
pa_log_debug("Remote all-channel hardware volume %s does not match requested %s",
pa_volume_snprint_verbose(hw_volume_str, sizeof(hw_volume_str), hardware_volume, false),
pa_cvolume_snprint_verbose(volume_str, sizeof(volume_str), real_volume, NULL, false));
pa_log_debug("Compensating with %s",
pa_cvolume_snprint_verbose(volume_str, sizeof(volume_str), soft_volume, NULL, false));
}
return different;
}
/* Run from main thread */
static void source_set_volume_cb(pa_source *s) {
pa_volume_t volume;
pa_volume_t volume, hardware_volume;
struct userdata *u;
pa_assert(s);
@ -940,10 +969,14 @@ static void source_set_volume_cb(pa_source *s) {
pa_assert(u->transport);
pa_assert(u->transport->set_source_volume);
/* In the AG role, send a command to change microphone gain on the HS/HF */
volume = u->transport->set_source_volume(u->transport, pa_cvolume_max(&s->real_volume));
volume = pa_cvolume_max(&s->real_volume);
pa_cvolume_set(&s->real_volume, u->decoder_sample_spec.channels, volume);
/* In the AG role, send a command to change microphone gain on the HS/HF */
// TODO: Round up for the below compensation to work properly.
hardware_volume = u->transport->set_source_volume(u->transport, volume);
// TODO: This does not take into account any rounding that might also happen on the headphones
// For that we need to know which _incoming_ `Volume` change belongs to a requested volume.
set_software_volume_compensation(&s->real_volume, hardware_volume, &s->soft_volume);
}
/* Run from main thread */
@ -1163,7 +1196,7 @@ static int sink_set_state_in_io_thread_cb(pa_sink *s, pa_sink_state_t new_state,
/* Run from main thread */
static void sink_set_volume_cb(pa_sink *s) {
pa_volume_t volume;
pa_volume_t volume, hardware_volume;
struct userdata *u;
pa_assert(s);
@ -1177,10 +1210,11 @@ static void sink_set_volume_cb(pa_sink *s) {
pa_assert(u->transport);
pa_assert(u->transport->set_sink_volume);
/* In the AG role, send a command to change speaker gain on the HS/HF */
volume = u->transport->set_sink_volume(u->transport, pa_cvolume_max(&s->real_volume));
volume = pa_cvolume_max(&s->real_volume);
pa_cvolume_set(&s->real_volume, u->encoder_sample_spec.channels, volume);
/* In the AG role, send a command to change speaker gain on the HS/HF */
hardware_volume = u->transport->set_sink_volume(u->transport, volume);
set_software_volume_compensation(&s->real_volume, hardware_volume, &s->soft_volume);
}
/* Run from main thread */