X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Faudio_mixer.h;h=9dc5c89d9702666bd8f936e5096604196aead143;hb=a944bad466ba5601a96f6833e1ea2eb31f9b55af;hp=a7ab9a5a0d60378e632fbd34a7105865c05b0ef0;hpb=eeda8995329601f9f4e35047358400833eeae68e;p=nageru

diff --git a/nageru/audio_mixer.h b/nageru/audio_mixer.h
index a7ab9a5..9dc5c89 100644
--- a/nageru/audio_mixer.h
+++ b/nageru/audio_mixer.h
@@ -37,6 +37,15 @@ namespace bmusb {
 struct AudioFormat;
 }  // namespace bmusb
 
+// Convert the given audio from {16,24,32}-bit M-channel to 32-bit N-channel PCM.
+// Assumes little-endian and chunky, signed PCM throughout.
+std::vector<int32_t> convert_audio_to_fixed32(const uint8_t *data, unsigned num_samples, bmusb::AudioFormat audio_format, unsigned num_destination_channels);
+
+// Similar, except converts ot floating-point instead, and converts only one channel.
+void convert_audio_to_fp32(float *dst, size_t out_channel, size_t out_num_channels,
+                           const uint8_t *src, size_t in_channel, bmusb::AudioFormat in_audio_format,
+                           size_t num_samples);
+
 enum EQBand {
 	EQ_BAND_BASS = 0,
 	EQ_BAND_MID,
@@ -54,9 +63,9 @@ public:
 	// the lock wasn't successfully taken; if so, you should simply try again.
 	// (This is to avoid a deadlock where a card hangs on the mutex in add_audio()
 	// while we are trying to shut it down from another thread that also holds
-	// the mutex.) frame_length is in TIMEBASE units.
-	bool add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, bmusb::AudioFormat audio_format, int64_t frame_length, std::chrono::steady_clock::time_point frame_time);
-	bool add_silence(DeviceSpec device_spec, unsigned samples_per_frame, unsigned num_frames, int64_t frame_length);
+	// the mutex.)
+	bool add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, bmusb::AudioFormat audio_format, std::chrono::steady_clock::time_point frame_time);
+	bool add_silence(DeviceSpec device_spec, unsigned samples_per_frame, unsigned num_frames);
 
 	// If a given device is offline for whatever reason and cannot deliver audio
 	// (by means of add_audio() or add_silence()), you can call put it in silence mode,
@@ -208,51 +217,51 @@ public:
 
 	void set_gain_staging_db(unsigned bus_index, float gain_db)
 	{
-		std::unique_lock<std::mutex> lock(compressor_mutex);
+		std::lock_guard<std::mutex> lock(compressor_mutex);
 		level_compressor_enabled[bus_index] = false;
 		gain_staging_db[bus_index] = gain_db;
 	}
 
 	float get_gain_staging_db(unsigned bus_index) const
 	{
-		std::unique_lock<std::mutex> lock(compressor_mutex);
+		std::lock_guard<std::mutex> lock(compressor_mutex);
 		return gain_staging_db[bus_index];
 	}
 
 	void set_gain_staging_auto(unsigned bus_index, bool enabled)
 	{
-		std::unique_lock<std::mutex> lock(compressor_mutex);
+		std::lock_guard<std::mutex> lock(compressor_mutex);
 		level_compressor_enabled[bus_index] = enabled;
 	}
 
 	bool get_gain_staging_auto(unsigned bus_index) const
 	{
-		std::unique_lock<std::mutex> lock(compressor_mutex);
+		std::lock_guard<std::mutex> lock(compressor_mutex);
 		return level_compressor_enabled[bus_index];
 	}
 
 	void set_final_makeup_gain_db(float gain_db)
 	{
-		std::unique_lock<std::mutex> lock(compressor_mutex);
+		std::lock_guard<std::mutex> lock(compressor_mutex);
 		final_makeup_gain_auto = false;
 		final_makeup_gain = from_db(gain_db);
 	}
 
 	float get_final_makeup_gain_db()
 	{
-		std::unique_lock<std::mutex> lock(compressor_mutex);
+		std::lock_guard<std::mutex> lock(compressor_mutex);
 		return to_db(final_makeup_gain);
 	}
 
 	void set_final_makeup_gain_auto(bool enabled)
 	{
-		std::unique_lock<std::mutex> lock(compressor_mutex);
+		std::lock_guard<std::mutex> lock(compressor_mutex);
 		final_makeup_gain_auto = enabled;
 	}
 
 	bool get_final_makeup_gain_auto() const
 	{
-		std::unique_lock<std::mutex> lock(compressor_mutex);
+		std::lock_guard<std::mutex> lock(compressor_mutex);
 		return final_makeup_gain_auto;
 	}
 
@@ -320,6 +329,10 @@ private:
 		// Which channels we consider interesting (ie., are part of some input_mapping).
 		std::set<unsigned> interesting_channels;
 		bool silenced = false;
+
+		// Positive means the audio is delayed, negative means we try to have it earlier
+		// (although we can't time-travel!). Stored together with the input mapping.
+		double extra_delay_ms = 0.0;
 	};
 
 	const AudioDevice *find_audio_device(DeviceSpec device_spec) const