X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=a177854b46cde0229ebfcb669998afea709813b7;hb=b4f16ea9f8969a3ba14be8cd9c88cfe00d19533b;hp=9b631e4766071d35e6f0d215cd3f4442f46cdf2e;hpb=3ed9b0fbb73071284aa7fa221ce0373d2dadbc85;p=nageru

diff --git a/mixer.h b/mixer.h
index 9b631e4..a177854 100644
--- a/mixer.h
+++ b/mixer.h
@@ -9,13 +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
 
@@ -80,7 +82,7 @@ public:
 
 	std::vector<std::string> get_transition_names()
 	{
-		return theme->get_transition_names(frame / 60.0);
+		return theme->get_transition_names(pts());
 	}
 
 private:
@@ -91,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;
@@ -102,7 +107,7 @@ 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 {
@@ -114,11 +119,16 @@ private:
 		QOpenGLContext *context;
 
 		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.
-		Resampler *resampler = nullptr;
+		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>