X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=821ceb2f5f606ad48133f7d8475f1fe7d40af12a;hb=7f552730c721332e9f22286e5f82de5fd9492249;hp=6d0cbce1593b6da92c4f426668d948c982683921;hpb=196392c483a9cbf7fd7b572d9242aa283031453f;p=nageru

diff --git a/mixer.h b/mixer.h
index 6d0cbce..821ceb2 100644
--- a/mixer.h
+++ b/mixer.h
@@ -35,6 +35,7 @@
 #include "stereocompressor.h"
 #include "filter.h"
 #include "input_state.h"
+#include "correlation_measurer.h"
 
 class H264Encoder;
 class QSurface;
@@ -103,7 +104,8 @@ public:
 
 	typedef std::function<void(float level_lufs, float peak_db,
 	                           float global_level_lufs, float range_low_lufs, float range_high_lufs,
-	                           float auto_gain_staging_db)> audio_level_callback_t;
+	                           float gain_staging_db, float final_makeup_gain_db,
+	                           float correlation)> audio_level_callback_t;
 	void set_audio_level_callback(audio_level_callback_t callback)
 	{
 		audio_level_callback = callback;
@@ -124,6 +126,31 @@ public:
 		return theme->get_channel_name(channel);
 	}
 
+	int get_channel_signal(unsigned channel) const
+	{
+		return theme->get_channel_signal(channel);
+	}
+
+	int map_signal(unsigned channel)
+	{
+		return theme->map_signal(channel);
+	}
+
+	unsigned get_audio_source() const
+	{
+		return audio_source_channel;
+	}
+
+	void set_audio_source(unsigned channel)
+	{
+		audio_source_channel = channel;
+	}
+
+	void set_signal_mapping(int signal, int card)
+	{
+		return theme->set_signal_mapping(signal, card);
+	}
+
 	bool get_supports_set_wb(unsigned channel) const
 	{
 		return theme->get_supports_set_wb(channel);
@@ -139,6 +166,11 @@ public:
 		locut_cutoff_hz = cutoff_hz;
 	}
 
+	void set_locut_enabled(bool enabled)
+	{
+		locut_enabled = enabled;
+	}
+
 	float get_limiter_threshold_dbfs()
 	{
 		return limiter_threshold_dbfs;
@@ -169,11 +201,49 @@ public:
 		compressor_enabled = enabled;
 	}
 
+	void set_gain_staging_db(float gain_db)
+	{
+		std::unique_lock<std::mutex> lock(compressor_mutex);
+		level_compressor_enabled = false;
+		gain_staging_db = gain_db;
+	}
+
+	void set_gain_staging_auto(bool enabled)
+	{
+		std::unique_lock<std::mutex> lock(compressor_mutex);
+		level_compressor_enabled = enabled;
+	}
+
+	void set_final_makeup_gain_db(float gain_db)
+	{
+		std::unique_lock<std::mutex> lock(compressor_mutex);
+		final_makeup_gain_auto = false;
+		final_makeup_gain = pow(10.0f, gain_db / 20.0f);
+	}
+
+	void set_final_makeup_gain_auto(bool enabled)
+	{
+		std::unique_lock<std::mutex> lock(compressor_mutex);
+		final_makeup_gain_auto = enabled;
+	}
+
+	void schedule_cut()
+	{
+		should_cut = true;
+	}
+
 	void reset_meters();
 
+	unsigned get_num_cards() const { return num_cards; }
+
+	std::string get_card_description(unsigned card_index) const {
+		assert(card_index < num_cards);
+		return cards[card_index].usb->get_description();
+	}
+
 private:
 	void bm_frame(unsigned card_index, uint16_t timecode,
-		FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format,
+		FrameAllocator::Frame video_frame, size_t video_offset, VideoFormat video_format,
 		FrameAllocator::Frame audio_frame, size_t audio_offset, uint16_t audio_format);
 	void place_rectangle(movit::Effect *resample_effect, movit::Effect *padding_effect, float x0, float y0, float x1, float y1);
 	void thread_func();
@@ -189,8 +259,11 @@ private:
 	QSurface *mixer_surface, *h264_encoder_surface;
 	std::unique_ptr<movit::ResourcePool> resource_pool;
 	std::unique_ptr<Theme> theme;
+	std::atomic<unsigned> audio_source_channel{0};
 	std::unique_ptr<movit::EffectChain> display_chain;
 	GLuint cbcr_program_num;  // Owned by <resource_pool>.
+	GLuint cbcr_vbo;  // Holds position and texcoord data.
+	GLuint cbcr_position_attribute_index, cbcr_texcoord_attribute_index;
 	std::unique_ptr<H264Encoder> h264_encoder;
 
 	// Effects part of <display_chain>. Owned by <display_chain>.
@@ -252,22 +325,27 @@ private:
 	std::thread mixer_thread;
 	std::thread audio_thread;
 	std::atomic<bool> should_quit{false};
+	std::atomic<bool> should_cut{false};
 
 	audio_level_callback_t audio_level_callback = nullptr;
-	std::mutex r128_mutex;
-	Ebu_r128_proc r128;  // Under r128_mutex.
+	std::mutex compressor_mutex;
+	Ebu_r128_proc r128;  // Under compressor_mutex.
+	CorrelationMeasurer correlation;  // Under compressor_mutex.
 
 	Resampler peak_resampler;
 	std::atomic<float> peak{0.0f};
 
-	StereoFilter locut;  // Default cutoff 150 Hz, 24 dB/oct.
+	StereoFilter locut;  // Default cutoff 120 Hz, 24 dB/oct.
 	std::atomic<float> locut_cutoff_hz;
+	std::atomic<bool> locut_enabled{true};
 
 	// First compressor; takes us up to about -12 dBFS.
-	StereoCompressor level_compressor;
-	float last_gain_staging_db = 0.0f;
+	StereoCompressor level_compressor;  // Under compressor_mutex. Used to set/override gain_staging_db if <level_compressor_enabled>.
+	float gain_staging_db = 0.0f;  // Under compressor_mutex.
+	bool level_compressor_enabled = true;  // Under compressor_mutex.
 
-	static constexpr float ref_level_dbfs = -14.0f;
+	static constexpr float ref_level_dbfs = -14.0f;  // Chosen so that we end up around 0 LU in practice.
+	static constexpr float ref_level_lufs = -23.0f;  // 0 LU, more or less by definition.
 
 	StereoCompressor limiter;
 	std::atomic<float> limiter_threshold_dbfs{ref_level_dbfs + 4.0f};   // 4 dB.
@@ -276,6 +354,9 @@ private:
 	std::atomic<float> compressor_threshold_dbfs{ref_level_dbfs - 12.0f};  // -12 dB.
 	std::atomic<bool> compressor_enabled{true};
 
+	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.
+
 	std::unique_ptr<ALSAOutput> alsa;
 
 	struct AudioTask {