X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=a177854b46cde0229ebfcb669998afea709813b7;hb=b4f16ea9f8969a3ba14be8cd9c88cfe00d19533b;hp=b4eaad9b0d2a1338d9c099fe5302edeb6f2c4e48;hpb=1e4d9085b0fd09607c8da23008cbee3be8ff119d;p=nageru

diff --git a/mixer.h b/mixer.h
index b4eaad9..a177854 100644
--- a/mixer.h
+++ b/mixer.h
@@ -9,12 +9,15 @@
 #include <movit/flat_input.h>
 #include <functional>
 
-#include "bmusb.h"
+#include "bmusb/bmusb.h"
 #include "h264encode.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 #include "theme.h"
+#include "resampler.h"
+#include "timebase.h"
+#include "httpd.h"
 
 #define NUM_CARDS 2
 
@@ -32,13 +35,16 @@ public:
 	void start();
 	void quit();
 
-	void transition_clicked(int transition_num, float t);
+	void transition_clicked(int transition_num);
+	void channel_clicked(int preview_num);
 
 	enum Output {
 		OUTPUT_LIVE = 0,
 		OUTPUT_PREVIEW,
 		OUTPUT_INPUT0,
 		OUTPUT_INPUT1,
+		OUTPUT_INPUT2,
+		OUTPUT_INPUT3,
 		NUM_OUTPUTS
 	};
 
@@ -74,6 +80,11 @@ public:
 		output_channel[output].set_frame_ready_callback(callback);
 	}
 
+	std::vector<std::string> get_transition_names()
+	{
+		return theme->get_transition_names(pts());
+	}
+
 private:
 	void bm_frame(int card_index, uint16_t timecode,
 		FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format,
@@ -82,6 +93,9 @@ private:
 	void thread_func();
 	void subsample_chroma(GLuint src_tex, GLuint dst_dst);
 	void release_display_frame(DisplayFrame *frame);
+	double pts() { return double(pts_int) / TIMEBASE; }
+
+	HTTPD httpd;
 
 	QSurface *mixer_surface, *h264_encoder_surface;
 	std::unique_ptr<movit::ResourcePool> resource_pool;
@@ -93,22 +107,28 @@ private:
 	// Effects part of <display_chain>. Owned by <display_chain>.
 	movit::FlatInput *display_input;
 
-	int frame = 0;
+	int64_t pts_int = 0;  // In TIMEBASE units.
 
 	std::mutex bmusb_mutex;
 	struct CaptureCard {
 		BMUSBCapture *usb;
 		std::unique_ptr<PBOFrameAllocator> frame_allocator;
 
-		// Threading stuff
-		bool thread_initialized = false;
+		// Stuff for the OpenGL context (for texture uploading).
 		QSurface *surface;
 		QOpenGLContext *context;
 
-		bool new_data_ready = false;  // Whether new_frame contains anything.
+		bool new_data_ready = false;  // Whether new_frame and new_frame_audio 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.
+
+		std::mutex audio_mutex;
+		std::unique_ptr<Resampler> resampler;  // Under audio_mutex.
+		int last_timecode = -1;  // Unwrapped.
 	};
 	CaptureCard cards[NUM_CARDS];  // protected by <bmusb_mutex>
 
@@ -116,6 +136,7 @@ private:
 
 	class OutputChannel {
 	public:
+		~OutputChannel();
 		void output_frame(DisplayFrame frame);
 		bool get_display_frame(DisplayFrame *frame);
 		void set_frame_ready_callback(new_frame_ready_callback_t callback);