X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=5c69edd4450ac4922b30ac05b52a6413c6fe2084;hb=c3a08ff6100840205d295a58d6bf340aa20afde0;hp=547691428ad5fcfe60f5f1720c5d4a36514e2fb2;hpb=29cccb8cb0bb613b7f4b3e9d27a4a5c71a2f82e8;p=nageru

diff --git a/mixer.h b/mixer.h
index 5476914..5c69edd 100644
--- a/mixer.h
+++ b/mixer.h
@@ -3,31 +3,34 @@
 
 // The actual video mixer, running in its own separate background thread.
 
+#include <assert.h>
 #include <epoxy/gl.h>
 #undef Success
-#include <stdbool.h>
-#include <stdint.h>
 
 #include <movit/effect_chain.h>
 #include <movit/flat_input.h>
-#include <zita-resampler/resampler.h>
+#include <stdbool.h>
+#include <stdint.h>
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
 #include <cstddef>
 #include <functional>
+#include <map>
 #include <memory>
 #include <mutex>
+#include <queue>
 #include <string>
 #include <thread>
 #include <vector>
 
-#include "bmusb/bmusb.h"
 #include "alsa_output.h"
 #include "audio_mixer.h"
-#include "ebu_r128_proc.h"
-#include "video_encoder.h"
+#include "bmusb/bmusb.h"
+#include "defs.h"
 #include "httpd.h"
+#include "input_state.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
@@ -35,12 +38,11 @@
 #include "theme.h"
 #include "timebase.h"
 #include "stereocompressor.h"
-#include "filter.h"
-#include "input_state.h"
-#include "correlation_measurer.h"
+#include "video_encoder.h"
 
-class QuickSyncEncoder;
+class ALSAOutput;
 class QSurface;
+class QuickSyncEncoder;
 namespace movit {
 class Effect;
 class EffectChain;
@@ -167,15 +169,6 @@ public:
 		output_channel[output].set_color_updated_callback(callback);
 	}
 
-	typedef std::function<void(float level_lufs, float peak_db,
-	                           float global_level_lufs, float range_low_lufs, float range_high_lufs,
-	                           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;
-	}
-
 	std::vector<std::string> get_transition_names()
 	{
 		return theme->get_transition_names(pts());
@@ -249,8 +242,6 @@ public:
 		should_cut = true;
 	}
 
-	void reset_meters();
-
 	unsigned get_num_cards() const { return num_cards; }
 
 	std::string get_card_description(unsigned card_index) const {
@@ -321,9 +312,7 @@ private:
 	void handle_hotplugged_cards();
 	void schedule_audio_resampling_tasks(unsigned dropped_frames, int num_samples_per_frame, int length_per_frame);
 	void render_one_frame(int64_t duration);
-	void send_audio_level_callback();
 	void audio_thread_func();
-	void process_audio_one_frame(int64_t frame_pts_int, int num_samples, ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy);
 	void subsample_chroma(GLuint src_tex, GLuint dst_dst);
 	void release_display_frame(DisplayFrame *frame);
 	double pts() { return double(pts_int) / TIMEBASE; }
@@ -377,9 +366,9 @@ private:
 
 		int last_timecode = -1;  // Unwrapped.
 	};
-	CaptureCard cards[MAX_CARDS];  // protected by <bmusb_mutex>
+	CaptureCard cards[MAX_VIDEO_CARDS];  // protected by <bmusb_mutex>
 	AudioMixer audio_mixer;
-	void get_one_frame_from_each_card(unsigned master_card_index, CaptureCard::NewFrame new_frames[MAX_CARDS], bool has_new_frame[MAX_CARDS], int num_samples[MAX_CARDS]);
+	void get_one_frame_from_each_card(unsigned master_card_index, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS], int num_samples[MAX_VIDEO_CARDS]);
 
 	InputState input_state;
 
@@ -421,13 +410,6 @@ private:
 	std::atomic<bool> should_quit{false};
 	std::atomic<bool> should_cut{false};
 
-	audio_level_callback_t audio_level_callback = nullptr;
-	mutable std::mutex audio_measure_mutex;
-	Ebu_r128_proc r128;  // Under audio_measure_mutex.
-	CorrelationMeasurer correlation;  // Under audio_measure_mutex.
-	Resampler peak_resampler;  // Under audio_measure_mutex.
-	std::atomic<float> peak{0.0f};
-
 	std::unique_ptr<ALSAOutput> alsa;
 
 	struct AudioTask {
@@ -440,10 +422,10 @@ private:
 	std::queue<AudioTask> audio_task_queue;  // Under audio_mutex.
 
 	// For mode scanning.
-	bool is_mode_scanning[MAX_CARDS]{ false };
-	std::vector<uint32_t> mode_scanlist[MAX_CARDS];
-	unsigned mode_scanlist_index[MAX_CARDS]{ 0 };
-	std::chrono::steady_clock::time_point last_mode_scan_change[MAX_CARDS];
+	bool is_mode_scanning[MAX_VIDEO_CARDS]{ false };
+	std::vector<uint32_t> mode_scanlist[MAX_VIDEO_CARDS];
+	unsigned mode_scanlist_index[MAX_VIDEO_CARDS]{ 0 };
+	std::chrono::steady_clock::time_point last_mode_scan_change[MAX_VIDEO_CARDS];
 };
 
 extern Mixer *global_mixer;