X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=audio_mixer.cpp;h=d0737f217c260804c4272bf9d9d5382c109aaa94;hb=7a81f05c63a992acf4a859fd1136700e1d8b98ac;hp=a0628fe1f68a647675b09f998a4041a708cfffca;hpb=1f32e9e2f4d6b87d8b46a7e4a024a4f43af1b7a2;p=nageru diff --git a/audio_mixer.cpp b/audio_mixer.cpp index a0628fe..d0737f2 100644 --- a/audio_mixer.cpp +++ b/audio_mixer.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #ifdef __SSE__ #include #endif @@ -179,8 +180,9 @@ AudioMixer::AudioMixer(unsigned num_cards) set_final_makeup_gain_auto(global_flags.final_makeup_gain_auto); alsa_pool.init(); - InputMapping new_input_mapping; if (!global_flags.input_mapping_filename.empty()) { + current_mapping_mode = MappingMode::MULTICHANNEL; + InputMapping new_input_mapping; if (!load_input_mapping_from_file(get_devices(), global_flags.input_mapping_filename, &new_input_mapping)) { @@ -188,18 +190,13 @@ AudioMixer::AudioMixer(unsigned num_cards) global_flags.input_mapping_filename.c_str()); exit(1); } + set_input_mapping(new_input_mapping); } else { - // Generate a very simple, default input mapping. - InputMapping::Bus input; - input.name = "Main"; - input.device.type = InputSourceType::CAPTURE_CARD; - input.device.index = 0; - input.source_channel[0] = 0; - input.source_channel[1] = 1; - - new_input_mapping.buses.push_back(input); + set_simple_input(/*card_index=*/0); + if (global_flags.multichannel_mapping_mode) { + current_mapping_mode = MappingMode::MULTICHANNEL; + } } - set_input_mapping(new_input_mapping); r128.init(2, OUTPUT_FREQUENCY); r128.integr_start(); @@ -358,6 +355,7 @@ void AudioMixer::set_bus_settings(unsigned bus_index, const AudioMixer::BusSetti eq_level_db[bus_index][band_index] = settings.eq_level_db[band_index]; } gain_staging_db[bus_index] = settings.gain_staging_db; + last_gain_staging_db[bus_index] = gain_staging_db[bus_index]; level_compressor_enabled[bus_index] = settings.level_compressor_enabled; compressor_threshold_dbfs[bus_index] = settings.compressor_threshold_dbfs; compressor_enabled[bus_index] = settings.compressor_enabled; @@ -441,6 +439,31 @@ vector AudioMixer::get_active_devices() const return ret; } +namespace { + +void apply_gain(float db, float last_db, vector *samples) +{ + if (fabs(db - last_db) < 1e-3) { + // Constant over this frame. + const float gain = from_db(db); + for (size_t i = 0; i < samples->size(); ++i) { + (*samples)[i] *= gain; + } + } else { + // We need to do a fade. + unsigned num_samples = samples->size() / 2; + float gain = from_db(last_db); + const float gain_inc = pow(from_db(db - last_db), 1.0 / num_samples); + for (size_t i = 0; i < num_samples; ++i) { + (*samples)[i * 2 + 0] *= gain; + (*samples)[i * 2 + 1] *= gain; + gain *= gain_inc; + } + } +} + +} // namespace + vector AudioMixer::get_output(double pts, unsigned num_samples, ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy) { map> samples_card; @@ -489,11 +512,11 @@ vector AudioMixer::get_output(double pts, unsigned num_samples, Resamplin gain_staging_db[bus_index] = to_db(level_compressor[bus_index]->get_attenuation() * makeup_gain); } else { // Just apply the gain we already had. - float g = from_db(gain_staging_db[bus_index]); - for (size_t i = 0; i < samples_bus.size(); ++i) { - samples_bus[i] *= g; - } + float db = gain_staging_db[bus_index]; + float last_db = last_gain_staging_db[bus_index]; + apply_gain(db, last_db, &samples_bus); } + last_gain_staging_db[bus_index] = gain_staging_db[bus_index]; #if 0 printf("level=%f (%+5.2f dBFS) attenuation=%f (%+5.2f dB) end_result=%+5.2f dB\n", @@ -645,22 +668,7 @@ void AudioMixer::apply_eq(unsigned bus_index, vector *samples_bus) assert(samples_bus->size() % 2 == 0); const unsigned num_samples = samples_bus->size() / 2; - if (fabs(mid_db - last_mid_db) < 1e-3) { - // Constant over this frame. - const float gain = from_db(mid_db); - for (size_t i = 0; i < samples_bus->size(); ++i) { - (*samples_bus)[i] *= gain; - } - } else { - // We need to do a fade. - float gain = from_db(last_mid_db); - const float gain_inc = pow(from_db(mid_db - last_mid_db), 1.0 / num_samples); - for (size_t i = 0; i < num_samples; ++i) { - (*samples_bus)[i * 2 + 0] *= gain; - (*samples_bus)[i * 2 + 1] *= gain; - gain *= gain_inc; - } - } + apply_gain(mid_db, last_mid_db, samples_bus); apply_filter_fade(&eq[bus_index][EQ_BAND_BASS], samples_bus->data(), num_samples, bass_freq_hz, bass_db - mid_db, last_bass_db - last_mid_db); apply_filter_fade(&eq[bus_index][EQ_BAND_TREBLE], samples_bus->data(), num_samples, treble_freq_hz, treble_db - mid_db, last_treble_db - last_mid_db); @@ -888,10 +896,52 @@ void AudioMixer::serialize_device(DeviceSpec device_spec, DeviceSpecProto *devic } } +void AudioMixer::set_simple_input(unsigned card_index) +{ + InputMapping new_input_mapping; + InputMapping::Bus input; + input.name = "Main"; + input.device.type = InputSourceType::CAPTURE_CARD; + input.device.index = card_index; + input.source_channel[0] = 0; + input.source_channel[1] = 1; + + new_input_mapping.buses.push_back(input); + + lock_guard lock(audio_mutex); + current_mapping_mode = MappingMode::SIMPLE; + set_input_mapping_lock_held(new_input_mapping); + fader_volume_db[0] = 0.0f; +} + +unsigned AudioMixer::get_simple_input() const +{ + lock_guard lock(audio_mutex); + if (input_mapping.buses.size() == 1 && + input_mapping.buses[0].device.type == InputSourceType::CAPTURE_CARD && + input_mapping.buses[0].source_channel[0] == 0 && + input_mapping.buses[0].source_channel[1] == 1) { + return input_mapping.buses[0].device.index; + } else { + return numeric_limits::max(); + } +} + void AudioMixer::set_input_mapping(const InputMapping &new_input_mapping) { lock_guard lock(audio_mutex); + set_input_mapping_lock_held(new_input_mapping); + current_mapping_mode = MappingMode::MULTICHANNEL; +} + +AudioMixer::MappingMode AudioMixer::get_mapping_mode() const +{ + lock_guard lock(audio_mutex); + return current_mapping_mode; +} +void AudioMixer::set_input_mapping_lock_held(const InputMapping &new_input_mapping) +{ map> interesting_channels; for (const InputMapping::Bus &bus : new_input_mapping.buses) { if (bus.device.type == InputSourceType::CAPTURE_CARD || @@ -937,6 +987,12 @@ InputMapping AudioMixer::get_input_mapping() const return input_mapping; } +unsigned AudioMixer::num_buses() const +{ + lock_guard lock(audio_mutex); + return input_mapping.buses.size(); +} + void AudioMixer::reset_peak(unsigned bus_index) { lock_guard lock(audio_mutex);