#include "audio_mixer.h"
#include <assert.h>
-#include <endian.h>
#include <bmusb/bmusb.h>
-#include <stdio.h>
#include <endian.h>
-#include <cmath>
-#include <limits>
-#ifdef __SSE__
+#include <math.h>
+#ifdef __SSE2__
#include <immintrin.h>
#endif
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <cstddef>
+#include <limits>
+#include <utility>
#include "db.h"
#include "flags.h"
-#include "mixer.h"
#include "state.pb.h"
#include "timebase.h"
{
BusSettings settings;
settings.fader_volume_db = 0.0f;
+ settings.muted = false;
settings.locut_enabled = global_flags.locut_enabled;
for (unsigned band_index = 0; band_index < NUM_EQ_BANDS; ++band_index) {
settings.eq_level_db[band_index] = 0.0f;
lock_guard<timed_mutex> lock(audio_mutex);
BusSettings settings;
settings.fader_volume_db = fader_volume_db[bus_index];
+ settings.muted = mute[bus_index];
settings.locut_enabled = locut_enabled[bus_index];
for (unsigned band_index = 0; band_index < NUM_EQ_BANDS; ++band_index) {
settings.eq_level_db[band_index] = eq_level_db[bus_index][band_index];
{
lock_guard<timed_mutex> lock(audio_mutex);
fader_volume_db[bus_index] = settings.fader_volume_db;
+ mute[bus_index] = settings.muted;
locut_enabled[bus_index] = settings.locut_enabled;
for (unsigned band_index = 0; band_index < NUM_EQ_BANDS; ++band_index) {
eq_level_db[bus_index][band_index] = settings.eq_level_db[band_index];
void AudioMixer::fill_audio_bus(const map<DeviceSpec, vector<float>> &samples_card, const InputMapping::Bus &bus, unsigned num_samples, float *output)
{
if (bus.device.type == InputSourceType::SILENCE) {
- memset(output, 0, num_samples * sizeof(*output));
+ memset(output, 0, num_samples * 2 * sizeof(*output));
} else {
assert(bus.device.type == InputSourceType::CAPTURE_CARD ||
bus.device.type == InputSourceType::ALSA_INPUT);
assert(samples_bus.size() == samples_out->size());
assert(samples_bus.size() % 2 == 0);
unsigned num_samples = samples_bus.size() / 2;
- if (fabs(fader_volume_db[bus_index] - last_fader_volume_db[bus_index]) > 1e-3) {
+ const float new_volume_db = mute[bus_index] ? -90.0f : fader_volume_db[bus_index].load();
+ if (fabs(new_volume_db - last_fader_volume_db[bus_index]) > 1e-3) {
// The volume has changed; do a fade over the course of this frame.
// (We might have some numerical issues here, but it seems to sound OK.)
// For the purpose of fading here, the silence floor is set to -90 dB
// (the fader only goes to -84).
float old_volume = from_db(max<float>(last_fader_volume_db[bus_index], -90.0f));
- float volume = from_db(max<float>(fader_volume_db[bus_index], -90.0f));
+ float volume = from_db(max<float>(new_volume_db, -90.0f));
float volume_inc = pow(volume / old_volume, 1.0 / num_samples);
volume = old_volume;
volume *= volume_inc;
}
}
- } else {
- float volume = from_db(fader_volume_db[bus_index]);
+ } else if (new_volume_db > -90.0f) {
+ float volume = from_db(new_volume_db);
if (bus_index == 0) {
for (unsigned i = 0; i < num_samples; ++i) {
(*samples_out)[i * 2 + 0] = samples_bus[i * 2 + 0] * volume;
}
}
- last_fader_volume_db[bus_index] = fader_volume_db[bus_index];
+ last_fader_volume_db[bus_index] = new_volume_db;
}
void AudioMixer::measure_bus_levels(unsigned bus_index, const vector<float> &left, const vector<float> &right)
{
assert(left.size() == right.size());
- const float volume = from_db(fader_volume_db[bus_index]);
+ const float volume = mute[bus_index] ? 0.0f : from_db(fader_volume_db[bus_index]);
const float peak_levels[2] = {
find_peak(left.data(), left.size()) * volume,
find_peak(right.data(), right.size()) * volume