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

diff --git a/mixer.h b/mixer.h
index 5476914..0e1d295 100644
--- a/mixer.h
+++ b/mixer.h
@@ -3,44 +3,44 @@
 
 // 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 <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 "libusb.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
-#include "resampling_queue.h"
 #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 ChromaSubsampler;
 class QSurface;
+class QSurfaceFormat;
+
 namespace movit {
 class Effect;
 class EffectChain;
@@ -48,11 +48,6 @@ class FlatInput;
 class ResourcePool;
 }  // namespace movit
 
-namespace movit {
-class YCbCrInput;
-}
-class QSurfaceFormat;
-
 // For any card that's not the master (where we pick out the frames as they
 // come, as fast as we can process), there's going to be a queue. The question
 // is when we should drop frames from that queue (apart from the obvious
@@ -167,15 +162,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());
@@ -206,16 +192,6 @@ public:
 		return theme->map_signal(channel);
 	}
 
-	unsigned get_audio_source() const
-	{
-		return audio_source_channel;
-	}
-
-	void set_audio_source(unsigned channel)
-	{
-		audio_source_channel = channel;
-	}
-
 	unsigned get_master_clock() const
 	{
 		return master_clock_channel;
@@ -241,6 +217,7 @@ public:
 		theme->set_wb(channel, r, g, b);
 	}
 
+	// Note: You can also get this through the global variable global_audio_mixer.
 	AudioMixer *get_audio_mixer() { return &audio_mixer; }
 	const AudioMixer *get_audio_mixer() const { return &audio_mixer; }
 
@@ -249,8 +226,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,10 +296,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; }
 
@@ -337,9 +309,7 @@ private:
 	std::atomic<unsigned> audio_source_channel{0};
 	std::atomic<unsigned> master_clock_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<ChromaSubsampler> chroma_subsampler;
 	std::unique_ptr<VideoEncoder> video_encoder;
 
 	// Effects part of <display_chain>. Owned by <display_chain>.
@@ -347,6 +317,10 @@ private:
 
 	int64_t pts_int = 0;  // In TIMEBASE units.
 
+	// Accumulated errors in number of 1/TIMEBASE audio samples. If OUTPUT_FREQUENCY divided by
+	// frame rate is integer, will always stay zero.
+	unsigned fractional_samples = 0;
+
 	std::mutex bmusb_mutex;
 	bool has_bmusb_thread = false;
 	struct CaptureCard {
@@ -364,6 +338,7 @@ private:
 			unsigned field;  // Which field (0 or 1) of the frame to use. Always 0 for progressive.
 			std::function<void()> upload_func;  // Needs to be called to actually upload the texture to OpenGL.
 			unsigned dropped_frames = 0;  // Number of dropped frames before this one.
+			std::chrono::steady_clock::time_point received_timestamp = std::chrono::steady_clock::time_point::min();
 		};
 		std::queue<NewFrame> new_frames;
 		bool should_quit = false;
@@ -371,15 +346,16 @@ private:
 
 		QueueLengthPolicy queue_length_policy;  // Refers to the "new_frames" queue.
 
-		// Accumulated errors in number of 1/TIMEBASE samples. If OUTPUT_FREQUENCY divided by
-		// frame rate is integer, will always stay zero.
-		unsigned fractional_samples = 0;
-
 		int last_timecode = -1;  // Unwrapped.
 	};
-	CaptureCard cards[MAX_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]);
+	CaptureCard cards[MAX_VIDEO_CARDS];  // protected by <bmusb_mutex>
+	AudioMixer audio_mixer;  // Same as global_audio_mixer (see audio_mixer.h).
+	struct OutputFrameInfo {
+		int dropped_frames;  // Since last frame.
+		int num_samples;  // Audio samples needed for this output frame.
+		int64_t frame_duration;  // In TIMEBASE units.
+	};
+	OutputFrameInfo get_one_frame_from_each_card(unsigned master_card_index, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS]);
 
 	InputState input_state;
 
@@ -421,13 +397,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 +409,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;