X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=audio_mixer.h;h=9793646c9bac3493651e39643a610c7df75c5d0f;hb=6ffaabac0a523617b686f40c154a25cb548cc561;hp=afebea471b7809cd7e51e11b583a413193159c2a;hpb=bc8e214a1e9f6d27055914901b660b6c9269d636;p=nageru

diff --git a/audio_mixer.h b/audio_mixer.h
index afebea4..9793646 100644
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -46,7 +46,7 @@ enum EQBand {
 
 class AudioMixer {
 public:
-	AudioMixer(unsigned num_cards);
+	AudioMixer(unsigned num_capture_cards, unsigned num_ffmpeg_inputs);
 	void reset_resampler(DeviceSpec device_spec);
 	void reset_meters();
 
@@ -142,6 +142,18 @@ public:
 		return locut_enabled[bus];
 	}
 
+	bool is_mono(unsigned bus_index);
+
+	void set_stereo_width(unsigned bus_index, float width)
+	{
+		stereo_width[bus_index] = width;
+	}
+
+	float get_stereo_width(unsigned bus_index)
+	{
+		return stereo_width[bus_index];
+	}
+
 	void set_eq(unsigned bus_index, EQBand band, float db_gain)
 	{
 		assert(band >= 0 && band < NUM_EQ_BANDS);
@@ -289,6 +301,7 @@ public:
 		float fader_volume_db;
 		bool muted;
 		bool locut_enabled;
+		float stereo_width;
 		float eq_level_db[NUM_EQ_BANDS];
 		float gain_staging_db;
 		bool level_compressor_enabled;
@@ -317,7 +330,7 @@ private:
 	AudioDevice *find_audio_device(DeviceSpec device_spec);
 
 	void find_sample_src_from_device(const std::map<DeviceSpec, std::vector<float>> &samples_card, DeviceSpec device_spec, int source_channel, const float **srcptr, unsigned *stride);
-	void fill_audio_bus(const std::map<DeviceSpec, std::vector<float>> &samples_card, const InputMapping::Bus &bus, unsigned num_samples, float *output);
+	void fill_audio_bus(const std::map<DeviceSpec, std::vector<float>> &samples_card, const InputMapping::Bus &bus, unsigned num_samples, float stereo_width, float *output);
 	void reset_resampler_mutex_held(DeviceSpec device_spec);
 	void apply_eq(unsigned bus_index, std::vector<float> *samples_bus);
 	void update_meters(const std::vector<float> &samples);
@@ -327,13 +340,14 @@ private:
 	std::vector<DeviceSpec> get_active_devices() const;
 	void set_input_mapping_lock_held(const InputMapping &input_mapping);
 
-	unsigned num_cards;
+	unsigned num_capture_cards, num_ffmpeg_inputs;
 
 	mutable std::timed_mutex audio_mutex;
 
 	ALSAPool alsa_pool;
 	AudioDevice video_cards[MAX_VIDEO_CARDS];  // Under audio_mutex.
 	AudioDevice alsa_inputs[MAX_ALSA_CARDS];  // Under audio_mutex.
+	std::unique_ptr<AudioDevice[]> ffmpeg_inputs;  // Under audio_mutex.
 
 	std::atomic<float> locut_cutoff_hz{120};
 	StereoFilter locut[MAX_BUSES];  // Default cutoff 120 Hz, 24 dB/oct.
@@ -375,6 +389,7 @@ private:
 	std::atomic<float> fader_volume_db[MAX_BUSES] {{ 0.0f }};
 	std::atomic<bool> mute[MAX_BUSES] {{ false }};
 	float last_fader_volume_db[MAX_BUSES] { 0.0f };  // Under audio_mutex.
+	std::atomic<float> stereo_width[MAX_BUSES] {{ 0.0f }};  // Default 1.0f (is set in constructor).
 	std::atomic<float> eq_level_db[MAX_BUSES][NUM_EQ_BANDS] {{{ 0.0f }}};
 	float last_eq_level_db[MAX_BUSES][NUM_EQ_BANDS] {{ 0.0f }};
 
@@ -394,6 +409,19 @@ private:
 	std::atomic<double> metric_audio_peak_dbfs{0.0 / 0.0};
 	std::atomic<double> metric_audio_final_makeup_gain_db{0.0};
 	std::atomic<double> metric_audio_correlation{0.0};
+
+	// These are all gauges corresponding to the elements of BusLevel.
+	// In a sense, they'd probably do better as histograms, but that's an
+	// awful lot of time series when you have many buses.
+	struct BusMetrics {
+		std::vector<std::pair<std::string, std::string>> labels;
+		std::atomic<double> current_level_dbfs[2]{{0.0/0.0},{0.0/0.0}};
+		std::atomic<double> peak_level_dbfs[2]{{0.0/0.0},{0.0/0.0}};
+		std::atomic<double> historic_peak_dbfs{0.0/0.0};
+		std::atomic<double> gain_staging_db{0.0/0.0};
+		std::atomic<double> compressor_attenuation_db{0.0/0.0};
+	};
+	std::unique_ptr<BusMetrics[]> bus_metrics;  // One for each bus in <input_mapping>.
 };
 
 extern AudioMixer *global_audio_mixer;