X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=ffmpeg_capture.h;h=8a513df971fa20f2cba71e25ac603242b9be3be3;hp=f718c70a23ff4dccceb7df40877f389e44815266;hb=703e00da89118df9be0354dda621bed023e6030e;hpb=a13e862be5f67802e5a9e04b150e2ed2ca6ffae0

diff --git a/ffmpeg_capture.h b/ffmpeg_capture.h
index f718c70..8a513df 100644
--- a/ffmpeg_capture.h
+++ b/ffmpeg_capture.h
@@ -17,7 +17,6 @@
 // changes parameters midway, which is allowed in some formats.
 //
 // You can get out the audio either as decoded or in raw form (Kaeru uses this).
-// However, the rest of Nageru can't really use the audio for anything yet.
 
 #include <assert.h>
 #include <stdint.h>
@@ -78,6 +77,25 @@ public:
 		producer_thread_should_quit.wakeup();
 	}
 
+	std::string get_filename() const
+	{
+		std::lock_guard<std::mutex> lock(filename_mu);
+		return filename;
+	}
+
+	void change_filename(const std::string &new_filename)
+	{
+		std::lock_guard<std::mutex> lock(filename_mu);
+		filename = new_filename;
+		should_interrupt = true;
+	}
+
+	// Will stop the stream even if it's hung on blocking I/O.
+	void disconnect()
+	{
+		should_interrupt = true;
+	}
+
 	// CaptureInterface.
 	void set_video_frame_allocator(bmusb::FrameAllocator *allocator) override
 	{
@@ -207,6 +225,10 @@ private:
 	bmusb::VideoFormat construct_video_format(const AVFrame *frame, AVRational video_timebase);
 	UniqueFrame make_video_frame(const AVFrame *frame, const std::string &pathname, bool *error);
 
+	static int interrupt_cb_thunk(void *unique);
+	int interrupt_cb();
+
+	mutable std::mutex filename_mu;
 	std::string description, filename;
 	uint16_t timecode = 0;
 	unsigned width, height;
@@ -215,6 +237,8 @@ private:
 	bool running = false;
 	int card_index = -1;
 	double rate = 1.0;
+	std::atomic<bool> should_interrupt{false};
+	bool last_frame_was_connected = true;
 
 	bool has_dequeue_callbacks = false;
 	std::function<void()> dequeue_init_callback = nullptr;
@@ -236,7 +260,7 @@ private:
 	std::thread producer_thread;
 
 	int64_t pts_origin, last_pts;
-	std::chrono::steady_clock::time_point start, next_frame_start;
+	std::chrono::steady_clock::time_point start, next_frame_start, last_frame;
 
 	std::mutex queue_mu;
 	struct QueuedCommand {