X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg_capture.h;h=705d25ffe5a47461e297401e81e7c6ccd6b69eaf;hb=ffd68fbfb90242069af957f2a28908f0559f8348;hp=eb377f7fe039b42ba2f029aa8e7ea42117f59252;hpb=d205e9c826b4a4e1290cc4160067aad818e70081;p=nageru

diff --git a/ffmpeg_capture.h b/ffmpeg_capture.h
index eb377f7..705d25f 100644
--- a/ffmpeg_capture.h
+++ b/ffmpeg_capture.h
@@ -35,10 +35,12 @@ extern "C" {
 #include <libavresample/avresample.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/rational.h>
+#include <libavutil/samplefmt.h>
 }
 
 #include "bmusb/bmusb.h"
 #include "ffmpeg_raii.h"
+#include "ref_counted_frame.h"
 #include "quittable_sleeper.h"
 
 struct AVFormatContext;
@@ -76,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
 	{
@@ -106,7 +114,8 @@ public:
 
 	// FFmpegCapture-specific overload of set_frame_callback that also gives
 	// the raw original pts from the video. Negative pts means a dummy frame.
-	typedef std::function<void(int64_t pts, AVRational timebase, uint16_t timecode,
+	typedef std::function<void(int64_t video_pts, AVRational video_timebase, int64_t audio_pts, AVRational audio_timebase,
+	                           uint16_t timecode,
 	                           bmusb::FrameAllocator::Frame video_frame, size_t video_offset, bmusb::VideoFormat video_format,
 				   bmusb::FrameAllocator::Frame audio_frame, size_t audio_offset, bmusb::AudioFormat audio_format)>
 		frame_callback_t;
@@ -119,13 +128,13 @@ public:
 	{
 		frame_callback = std::bind(
 			callback,
-			std::placeholders::_3,
-			std::placeholders::_4,
 			std::placeholders::_5,
 			std::placeholders::_6,
 			std::placeholders::_7,
 			std::placeholders::_8,
-			std::placeholders::_9);
+			std::placeholders::_9,
+			std::placeholders::_10,
+			std::placeholders::_11);
 	}
 
 	// FFmpegCapture-specific callback that gives the raw audio.
@@ -198,11 +207,14 @@ private:
 	// Returns nullptr if no frame was decoded (e.g. EOF).
 	AVFrameWithDeleter decode_frame(AVFormatContext *format_ctx, AVCodecContext *video_codec_ctx, AVCodecContext *audio_codec_ctx,
 	                                const std::string &pathname, int video_stream_index, int audio_stream_index,
-	                                bmusb::FrameAllocator::Frame *audio_frame, bmusb::AudioFormat *audio_format, bool *error);
+	                                bmusb::FrameAllocator::Frame *audio_frame, bmusb::AudioFormat *audio_format, int64_t *audio_pts, bool *error);
 	void convert_audio(const AVFrame *audio_avframe, bmusb::FrameAllocator::Frame *audio_frame, bmusb::AudioFormat *audio_format);
 
 	bmusb::VideoFormat construct_video_format(const AVFrame *frame, AVRational video_timebase);
-	bmusb::FrameAllocator::Frame make_video_frame(const AVFrame *frame, const std::string &pathname, bool *error);
+	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;
@@ -212,6 +224,7 @@ private:
 	bool running = false;
 	int card_index = -1;
 	double rate = 1.0;
+	std::atomic<bool> should_interrupt{false};
 
 	bool has_dequeue_callbacks = false;
 	std::function<void()> dequeue_init_callback = nullptr;