X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=audio_mixer.h;h=f2c77b91c8130cfba4a4edd3aa5200df87178b94;hb=95c6bc9d8e340b02112f713389390102d547cc4c;hp=ef49120dc2b2047b99ed7ff045ec17ad226a137f;hpb=29cccb8cb0bb613b7f4b3e9d27a4a5c71a2f82e8;p=nageru

diff --git a/audio_mixer.h b/audio_mixer.h
index ef49120..f2c77b9 100644
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -14,11 +14,14 @@
 #include <math.h>
 #include <stdint.h>
 #include <atomic>
+#include <map>
 #include <memory>
 #include <mutex>
+#include <set>
 #include <vector>
 
 #include "bmusb/bmusb.h"
+#include "db.h"
 #include "defs.h"
 #include "filter.h"
 #include "resampling_queue.h"
@@ -28,19 +31,66 @@ namespace bmusb {
 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 Bus {
+		std::string name;
+		DeviceSpec device;
+		int source_channel[2] { -1, -1 };  // Left and right. -1 = none.
+	};
+
+	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 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;
+
 	void set_locut_cutoff(float cutoff_hz)
 	{
 		locut_cutoff_hz = cutoff_hz;
@@ -125,13 +175,13 @@ public:
 	{
 		std::unique_lock<std::mutex> lock(compressor_mutex);
 		final_makeup_gain_auto = false;
-		final_makeup_gain = pow(10.0f, gain_db / 20.0f);
+		final_makeup_gain = from_db(gain_db);
 	}
 
 	float get_final_makeup_gain_db()
 	{
 		std::unique_lock<std::mutex> lock(compressor_mutex);
-		return 20.0 * log10(final_makeup_gain);
+		return to_db(final_makeup_gain);
 	}
 
 	void set_final_makeup_gain_auto(bool enabled)
@@ -147,14 +197,25 @@ public:
 	}
 
 private:
+	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;
+	};
+	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;
 
-	struct CaptureCard {
-		std::mutex audio_mutex;
-		std::unique_ptr<ResamplingQueue> resampling_queue;  // Under audio_mutex.
-		int64_t next_local_pts = 0;  // Beginning of next frame, in TIMEBASE units. Under audio_mutex.
-	};
-	CaptureCard cards[MAX_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;
@@ -180,6 +241,9 @@ 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.
+
+	InputMapping input_mapping;  // Under audio_mutex.
+	std::atomic<float> fader_volume_db[MAX_BUSES] {{ 0.0f }};
 };
 
 #endif  // !defined(_AUDIO_MIXER_H)