X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=audio_mixer.h;h=f2c77b91c8130cfba4a4edd3aa5200df87178b94;hb=95c6bc9d8e340b02112f713389390102d547cc4c;hp=6f7dbe5d0b45850fed81f743b6674eeb176c6c7b;hpb=4bbcd111d04f36a42cf3d40f18fcee5a91c6322a;p=nageru

diff --git a/audio_mixer.h b/audio_mixer.h
index 6f7dbe5..f2c77b9 100644
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -14,8 +14,10 @@
 #include <math.h>
 #include <stdint.h>
 #include <atomic>
+#include <map>
 #include <memory>
 #include <mutex>
+#include <set>
 #include <vector>
 
 #include "bmusb/bmusb.h"
@@ -30,34 +32,61 @@ struct AudioFormat;
 }  // namespace bmusb
 
 enum class InputSourceType { SILENCE, CAPTURE_CARD };
+struct DeviceSpec {
+	InputSourceType type;
+	unsigned index;
+
+	bool operator== (const DeviceSpec &other) const {
+		return type == other.type && index == other.index;
+	}
+
+	bool operator< (const DeviceSpec &other) const {
+		if (type != other.type)
+			return type < other.type;
+		return index < other.index;
+	}
+};
+struct DeviceInfo {
+	std::string name;
+	unsigned num_channels;
+};
+
+static inline uint64_t DeviceSpec_to_key(const DeviceSpec &device_spec)
+{
+	return (uint64_t(device_spec.type) << 32) | device_spec.index;
+}
+
+static inline DeviceSpec key_to_DeviceSpec(uint64_t key)
+{
+	return DeviceSpec{ InputSourceType(key >> 32), unsigned(key & 0xffffffff) };
+}
 
 struct InputMapping {
-	struct Input {
+	struct Bus {
 		std::string name;
-		InputSourceType input_source_type;
-		unsigned input_source_index;
+		DeviceSpec device;
 		int source_channel[2] { -1, -1 };  // Left and right. -1 = none.
 	};
 
-	std::vector<Input> inputs;
+	std::vector<Bus> buses;
 };
 
 class AudioMixer {
 public:
 	AudioMixer(unsigned num_cards);
-	void reset_card(unsigned card_index);
+	void reset_device(DeviceSpec device_spec);
 
 	// frame_length is in TIMEBASE units.
-	void add_audio(unsigned card_index, const uint8_t *data, unsigned num_samples, bmusb::AudioFormat audio_format, int64_t frame_length);
-	void add_silence(unsigned card_index, unsigned samples_per_frame, unsigned num_frames, int64_t frame_length);
+	void add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, bmusb::AudioFormat audio_format, int64_t frame_length);
+	void add_silence(DeviceSpec device_spec, unsigned samples_per_frame, unsigned num_frames, int64_t frame_length);
 	std::vector<float> get_output(double pts, unsigned num_samples, ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy);
 
 	// See comments inside get_output().
 	void set_current_loudness(double level_lufs) { loudness_lufs = level_lufs; }
 
-	void set_fader_volume(unsigned card_index, float level_db) { cards[card_index].fader_volume_db = level_db; }
-	std::vector<std::string> get_names() const;
-	void set_name(unsigned card_index, const std::string &name);
+	void set_fader_volume(unsigned bus_index, float level_db) { fader_volume_db[bus_index] = level_db; }
+	std::map<DeviceSpec, DeviceInfo> get_devices() const;
+	void set_name(DeviceSpec device_spec, const std::string &name);
 
 	void set_input_mapping(const InputMapping &input_mapping);
 	InputMapping get_input_mapping() const;
@@ -168,18 +197,25 @@ public:
 	}
 
 private:
-	unsigned num_cards;
-
-	struct CaptureCard {
-		std::atomic<float> fader_volume_db{0.0f};
-
-		// Everything below audio_mutex is protected by it.
-		mutable std::mutex audio_mutex;
+	struct AudioDevice {
 		std::unique_ptr<ResamplingQueue> resampling_queue;
 		int64_t next_local_pts = 0;
 		std::string name;
+		unsigned capture_frequency = OUTPUT_FREQUENCY;
+		// Which channels we consider interesting (ie., are part of some input_mapping).
+		std::set<unsigned> interesting_channels;
 	};
-	CaptureCard cards[MAX_CARDS];
+	AudioDevice *find_audio_device(DeviceSpec device_spec);
+
+	void find_sample_src_from_device(const std::vector<float> *samples_card, DeviceSpec device_spec, int source_channel, const float **srcptr, unsigned *stride);
+	void fill_audio_bus(const std::vector<float> *samples_card, const InputMapping::Bus &bus, unsigned num_samples, float *output);
+	void reset_device_mutex_held(DeviceSpec device_spec);
+
+	unsigned num_cards;
+
+	mutable std::mutex audio_mutex;
+
+	AudioDevice cards[MAX_CARDS];  // Under audio_mutex.
 
 	StereoFilter locut;  // Default cutoff 120 Hz, 24 dB/oct.
 	std::atomic<float> locut_cutoff_hz;
@@ -206,8 +242,8 @@ private:
 	double final_makeup_gain = 1.0;  // Under compressor_mutex. Read/write by the user. Note: Not in dB, we want the numeric precision so that we can change it slowly.
 	bool final_makeup_gain_auto = true;  // Under compressor_mutex.
 
-	mutable std::mutex mapping_mutex;
-	InputMapping input_mapping;  // Under mapping_mutex.
+	InputMapping input_mapping;  // Under audio_mutex.
+	std::atomic<float> fader_volume_db[MAX_BUSES] {{ 0.0f }};
 };
 
 #endif  // !defined(_AUDIO_MIXER_H)