X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=audio_mixer.cpp;h=769dabfa74a0831cb6678a52f15d245d2c4ca6f2;hb=4c879d05be9112b33245de1a694713dc59ced565;hp=5a7804582ce591f4b80432fe418c01ebe2c7c4e7;hpb=c015407a3953235df07a601baa6aa8e02ba7b561;p=nageru

diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index 5a78045..769dabf 100644
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -185,7 +185,8 @@ void AudioMixer::reset_alsa_mutex_held(DeviceSpec device_spec)
 	if (device->interesting_channels.empty()) {
 		device->alsa_device.reset();
 	} else {
-		device->alsa_device.reset(new ALSAInput(available_alsa_cards[card_index].address.c_str(), OUTPUT_FREQUENCY, 2, bind(&AudioMixer::add_audio, this, device_spec, _1, _2, _3, _4)));
+		const ALSAInput::Device &alsa_dev = available_alsa_cards[card_index];
+		device->alsa_device.reset(new ALSAInput(alsa_dev.address.c_str(), OUTPUT_FREQUENCY, alsa_dev.num_channels, bind(&AudioMixer::add_audio, this, device_spec, _1, _2, _3, _4)));
 		device->capture_frequency = device->alsa_device->get_sample_rate();
 		device->alsa_device->start_capture_thread();
 	}
@@ -350,12 +351,16 @@ vector<float> AudioMixer::get_output(double pts, unsigned num_samples, Resamplin
 	}
 
 	// TODO: Move lo-cut etc. into each bus.
-	vector<float> samples_out;
+	vector<float> samples_out, left, right;
 	samples_out.resize(num_samples * 2);
 	samples_bus.resize(num_samples * 2);
 	for (unsigned bus_index = 0; bus_index < input_mapping.buses.size(); ++bus_index) {
 		fill_audio_bus(samples_card, input_mapping.buses[bus_index], num_samples, &samples_bus[0]);
 
+		// TODO: We should measure post-fader.
+		deinterleave_samples(samples_bus, &left, &right);
+		measure_bus_levels(bus_index, left, right);
+
 		float volume = from_db(fader_volume_db[bus_index]);
 		if (bus_index == 0) {
 			for (unsigned i = 0; i < num_samples * 2; ++i) {
@@ -483,6 +488,15 @@ vector<float> AudioMixer::get_output(double pts, unsigned num_samples, Resamplin
 	return samples_out;
 }
 
+void AudioMixer::measure_bus_levels(unsigned bus_index, const vector<float> &left, const vector<float> &right)
+{
+	const float *ptrs[] = { left.data(), right.data() };
+	{
+		lock_guard<mutex> lock(audio_measure_mutex);
+		bus_r128[bus_index]->process(left.size(), const_cast<float **>(ptrs));
+	}
+}
+
 void AudioMixer::update_meters(const vector<float> &samples)
 {
 	// Upsample 4x to find interpolated peak.
@@ -492,7 +506,7 @@ void AudioMixer::update_meters(const vector<float> &samples)
 	vector<float> interpolated_samples;
 	interpolated_samples.resize(samples.size());
 	{
-		unique_lock<mutex> lock(audio_measure_mutex);
+		lock_guard<mutex> lock(audio_measure_mutex);
 
 		while (peak_resampler.inp_count > 0) {  // About four iterations.
 			peak_resampler.out_data = &interpolated_samples[0];
@@ -509,7 +523,7 @@ void AudioMixer::update_meters(const vector<float> &samples)
 	deinterleave_samples(samples, &left, &right);
 	float *ptrs[] = { left.data(), right.data() };
 	{
-		unique_lock<mutex> lock(audio_measure_mutex);
+		lock_guard<mutex> lock(audio_measure_mutex);
 		r128.process(left.size(), ptrs);
 		correlation.process_samples(samples);
 	}
@@ -519,7 +533,7 @@ void AudioMixer::update_meters(const vector<float> &samples)
 
 void AudioMixer::reset_meters()
 {
-	unique_lock<mutex> lock(audio_measure_mutex);
+	lock_guard<mutex> lock(audio_measure_mutex);
 	peak_resampler.reset();
 	peak = 0.0f;
 	r128.reset();
@@ -533,13 +547,19 @@ void AudioMixer::send_audio_level_callback()
 		return;
 	}
 
-	unique_lock<mutex> lock(audio_measure_mutex);
+	lock_guard<mutex> lock(audio_measure_mutex);
 	double loudness_s = r128.loudness_S();
 	double loudness_i = r128.integrated();
 	double loudness_range_low = r128.range_min();
 	double loudness_range_high = r128.range_max();
 
-	audio_level_callback(loudness_s, to_db(peak),
+	vector<float> bus_loudness;
+	bus_loudness.resize(input_mapping.buses.size());
+	for (unsigned bus_index = 0; bus_index < bus_r128.size(); ++bus_index) {
+		bus_loudness[bus_index] = bus_r128[bus_index]->loudness_S();
+	}
+
+	audio_level_callback(loudness_s, to_db(peak), bus_loudness,
 		loudness_i, loudness_range_low, loudness_range_high,
 		gain_staging_db,
 		to_db(final_makeup_gain),
@@ -611,6 +631,17 @@ void AudioMixer::set_input_mapping(const InputMapping &new_input_mapping)
 		}
 	}
 
+	{
+		lock_guard<mutex> lock(audio_measure_mutex);
+		bus_r128.resize(new_input_mapping.buses.size());
+		for (unsigned bus_index = 0; bus_index < bus_r128.size(); ++bus_index) {
+			if (bus_r128[bus_index] == nullptr) {
+				bus_r128[bus_index].reset(new Ebu_r128_proc);
+			}
+			bus_r128[bus_index]->init(2, OUTPUT_FREQUENCY);
+		}
+	}
+
 	input_mapping = new_input_mapping;
 }