X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=45311aa42ec98af08cf7fb55719c16e3e01c0041;hb=02083dca89292d6ba95642cf8957f1cee8826313;hp=b89fd987175c902e9886eac1cf662949c560205d;hpb=05174f1722841b45313a58aaffa8f4cea9c12f63;p=nageru

diff --git a/mixer.h b/mixer.h
index b89fd98..45311aa 100644
--- a/mixer.h
+++ b/mixer.h
@@ -6,12 +6,17 @@
 #include <epoxy/gl.h>
 #undef Success
 #include <movit/effect_chain.h>
+#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"
 
 #define NUM_CARDS 2
 
@@ -29,21 +34,39 @@ public:
 	void start();
 	void quit();
 
-	enum Source {
-		SOURCE_INPUT1,
-		SOURCE_INPUT2,
-		SOURCE_SBS,
-	};
-	void cut(Source source);
+	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
 	};
 
 	struct DisplayFrame {
-		GLuint texnum;
-		RefCountedGLsync ready_fence;  // Asserted when the texture is done rendering.
+		// The chain for rendering this frame. To render a display frame,
+		// first wait for <ready_fence>, then call <setup_chain>
+		// to wire up all the inputs, and then finally call
+		// chain->render_to_screen() or similar.
+		movit::EffectChain *chain;
+		std::function<void()> setup_chain;
+
+		// Asserted when all the inputs are ready; you cannot render the chain
+		// before this.
+		RefCountedGLsync ready_fence;
+
+		// Holds on to all the input frames needed for this display frame,
+		// so they are not released while still rendering.
+		std::vector<RefCountedFrame> input_frames;
+
+		// Textures that should be released back to the resource pool
+		// when this frame disappears, if any.
+		// TODO: Refcount these as well?
+		std::vector<GLuint> temp_textures;
 	};
 	// Implicitly frees the previous one if there's a new frame available.
 	bool get_display_frame(Output output, DisplayFrame *frame) {
@@ -56,6 +79,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,
@@ -64,43 +92,49 @@ 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; }
 
 	QSurface *mixer_surface, *h264_encoder_surface;
 	std::unique_ptr<movit::ResourcePool> resource_pool;
-	std::unique_ptr<movit::EffectChain> chain;
+	std::unique_ptr<Theme> theme;
+	std::unique_ptr<movit::EffectChain> display_chain;
 	GLuint cbcr_program_num;  // Owned by <resource_pool>.
 	std::unique_ptr<H264Encoder> h264_encoder;
 
-	// Effects part of <chain>. Owned by <chain>.
-	movit::YCbCrInput *input[NUM_CARDS];
-	movit::Effect *resample_effect, *resample2_effect;
-	movit::Effect *padding_effect, *padding2_effect;
+	// Effects part of <display_chain>. Owned by <display_chain>.
+	movit::FlatInput *display_input;
 
-	Source current_source = SOURCE_INPUT1;
-	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.
-		FrameAllocator::Frame new_frame;
+		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>
 
-	FrameAllocator::Frame bmusb_current_rendering_frame[NUM_CARDS];
+	RefCountedFrame bmusb_current_rendering_frame[NUM_CARDS];
 
 	class OutputChannel {
 	public:
-		void output_frame(GLuint tex, RefCountedGLsync fence);
+		~OutputChannel();
+		void output_frame(DisplayFrame frame);
 		bool get_display_frame(DisplayFrame *frame);
 		void set_frame_ready_callback(new_frame_ready_callback_t callback);