X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg_capture.h;h=0fbc3e895ddaa6726fa976378f3d8a526009ab06;hb=9e821958485d7f5845c3b24635df1f3243092e02;hp=e573caab9368565c8797ebeb4e65c4ea34bf2092;hpb=20377c411096a3dc84f6669eb6a5177019f06667;p=nageru

diff --git a/ffmpeg_capture.h b/ffmpeg_capture.h
index e573caa..0fbc3e8 100644
--- a/ffmpeg_capture.h
+++ b/ffmpeg_capture.h
@@ -35,6 +35,7 @@ extern "C" {
 #include <libavresample/avresample.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/rational.h>
+#include <libavutil/samplefmt.h>
 }
 
 #include "bmusb/bmusb.h"
@@ -77,6 +78,12 @@ public:
 		producer_thread_should_quit.wakeup();
 	}
 
+	// 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
 	{
@@ -206,6 +213,9 @@ 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();
+
 	std::string description, filename;
 	uint16_t timecode = 0;
 	unsigned width, height;
@@ -214,6 +224,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;
@@ -235,7 +247,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 {