X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=00c1e1519c7dddb2b648cc6ab952ee00d3e43cd6;hb=538aa2fb443b25f34feafb4a50bb52206f7fe79c;hp=a177854b46cde0229ebfcb669998afea709813b7;hpb=b4f16ea9f8969a3ba14be8cd9c88cfe00d19533b;p=nageru

diff --git a/mixer.h b/mixer.h
index a177854..00c1e15 100644
--- a/mixer.h
+++ b/mixer.h
@@ -5,21 +5,39 @@
 
 #include <epoxy/gl.h>
 #undef Success
+#include <stdbool.h>
+#include <stdint.h>
+
 #include <movit/effect_chain.h>
 #include <movit/flat_input.h>
+#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"
 
-#define NUM_CARDS 2
+class H264Encoder;
+class QSurface;
+namespace movit {
+class Effect;
+class EffectChain;
+class FlatInput;
+class ResourcePool;
+}  // namespace movit
 
 namespace movit {
 class YCbCrInput;
@@ -30,7 +48,7 @@ class QSurfaceFormat;
 class Mixer {
 public:
 	// The surface format is used for offscreen destinations for OpenGL contexts we need.
-	Mixer(const QSurfaceFormat &format);
+	Mixer(const QSurfaceFormat &format, unsigned num_cards);
 	~Mixer();
 	void start();
 	void quit();
@@ -80,13 +98,24 @@ public:
 		output_channel[output].set_frame_ready_callback(callback);
 	}
 
+	typedef std::function<void(float, float, float, float, float)> audio_level_callback_t;
+	void set_audio_level_callback(audio_level_callback_t callback)
+	{
+		audio_level_callback = callback;
+	}
+
 	std::vector<std::string> get_transition_names()
 	{
 		return theme->get_transition_names(pts());
 	}
 
+	unsigned get_num_channels() const
+	{
+		return theme->get_num_channels();
+	}
+
 private:
-	void bm_frame(int card_index, uint16_t timecode,
+	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);
@@ -96,6 +125,7 @@ private:
 	double pts() { return double(pts_int) / TIMEBASE; }
 
 	HTTPD httpd;
+	unsigned num_cards;
 
 	QSurface *mixer_surface, *h264_encoder_surface;
 	std::unique_ptr<movit::ResourcePool> resource_pool;
@@ -130,9 +160,9 @@ private:
 		std::unique_ptr<Resampler> resampler;  // Under audio_mutex.
 		int last_timecode = -1;  // Unwrapped.
 	};
-	CaptureCard cards[NUM_CARDS];  // protected by <bmusb_mutex>
+	CaptureCard cards[MAX_CARDS];  // protected by <bmusb_mutex>
 
-	RefCountedFrame bmusb_current_rendering_frame[NUM_CARDS];
+	RefCountedFrame bmusb_current_rendering_frame[MAX_CARDS];
 
 	class OutputChannel {
 	public:
@@ -155,6 +185,12 @@ private:
 
 	std::thread mixer_thread;
 	bool should_quit = false;
+
+	audio_level_callback_t audio_level_callback = nullptr;
+	Ebu_r128_proc r128;
+
+	// TODO: Implement oversampled peak detection.
+	float peak = 0.0f;
 };
 
 extern Mixer *global_mixer;