X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=31886fd707a2c411f9167346add045ca3154edcb;hb=6bfcb565f7e0157900e892163b5eaca03a2aee47;hp=9f32f2ac2d79f5c6d86156bb38f0af5ea6d17564;hpb=a472dcd2c9faec3e191539fb647237195047bbd4;p=nageru

diff --git a/mixer.h b/mixer.h
index 9f32f2a..31886fd 100644
--- a/mixer.h
+++ b/mixer.h
@@ -5,22 +5,42 @@
 
 #include <epoxy/gl.h>
 #undef Success
+#include <stdbool.h>
+#include <stdint.h>
+
 #include <movit/effect_chain.h>
 #include <movit/flat_input.h>
+#include <atomic>
+#include <condition_variable>
+#include <cstddef>
 #include <functional>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <vector>
 
 #include "bmusb/bmusb.h"
+#include "ebu_r128_proc.h"
 #include "h264encode.h"
+#include "httpd.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
-#include "theme.h"
 #include "resampler.h"
+#include "theme.h"
 #include "timebase.h"
-#include "httpd.h"
-#include "ebu_r128_proc.h"
+#include "stereocompressor.h"
+#include "filter.h"
 
-#define MAX_CARDS 16
+class H264Encoder;
+class QSurface;
+namespace movit {
+class Effect;
+class EffectChain;
+class FlatInput;
+class ResourcePool;
+}  // namespace movit
 
 namespace movit {
 class YCbCrInput;
@@ -42,11 +62,8 @@ public:
 	enum Output {
 		OUTPUT_LIVE = 0,
 		OUTPUT_PREVIEW,
-		OUTPUT_INPUT0,
-		OUTPUT_INPUT1,
-		OUTPUT_INPUT2,
-		OUTPUT_INPUT3,
-		NUM_OUTPUTS
+		OUTPUT_INPUT0,  // 1, 2, 3, up to 15 follow numerically.
+		NUM_OUTPUTS = 18
 	};
 
 	struct DisplayFrame {
@@ -81,7 +98,9 @@ public:
 		output_channel[output].set_frame_ready_callback(callback);
 	}
 
-	typedef std::function<void(float, float, float, float, float)> audio_level_callback_t;
+	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;
 	void set_audio_level_callback(audio_level_callback_t callback)
 	{
 		audio_level_callback = callback;
@@ -92,12 +111,38 @@ public:
 		return theme->get_transition_names(pts());
 	}
 
+	unsigned get_num_channels() const
+	{
+		return theme->get_num_channels();
+	}
+
+	std::string get_channel_name(unsigned channel) const
+	{
+		return theme->get_channel_name(channel);
+	}
+
+	bool get_supports_set_wb(unsigned channel) const
+	{
+		return theme->get_supports_set_wb(channel);
+	}
+
+	void set_wb(unsigned channel, double r, double g, double b) const
+	{
+		theme->set_wb(channel, r, g, b);
+	}
+
+	void set_locut_cutoff(float cutoff_hz)
+	{
+		locut_cutoff_hz = cutoff_hz;
+	}
+
 private:
 	void bm_frame(unsigned card_index, uint16_t timecode,
 		FrameAllocator::Frame video_frame, size_t video_offset, uint16_t 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();
+	void process_audio_one_frame();
 	void subsample_chroma(GLuint src_tex, GLuint dst_dst);
 	void release_display_frame(DisplayFrame *frame);
 	double pts() { return double(pts_int) / TIMEBASE; }
@@ -126,11 +171,10 @@ private:
 		QSurface *surface;
 		QOpenGLContext *context;
 
-		bool new_data_ready = false;  // Whether new_frame and new_frame_audio contains anything.
+		bool new_data_ready = false;  // Whether new_frame contains anything.
 		bool should_quit = false;
 		RefCountedFrame new_frame;
 		GLsync new_data_ready_fence;  // Whether new_frame is ready for rendering.
-		std::vector<float> new_frame_audio;
 		std::condition_variable new_data_ready_changed;  // Set whenever new_data_ready is changed.
 		unsigned dropped_frames = 0;  // Before new_frame.
 
@@ -169,6 +213,16 @@ private:
 
 	// TODO: Implement oversampled peak detection.
 	float peak = 0.0f;
+
+	StereoFilter locut;  // Default cutoff 150 Hz, 24 dB/oct.
+	std::atomic<float> locut_cutoff_hz;
+
+	// First compressor; takes us up to about -12 dBFS.
+	StereoCompressor level_compressor;
+	float last_gain_staging_db = 0.0f;
+
+	StereoCompressor limiter;
+	StereoCompressor compressor;
 };
 
 extern Mixer *global_mixer;