X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg_capture.cpp;h=50b4fa45109362d637dfd69c5122725f69e3828d;hb=327534a3031a332423411c9599c741f2f81657df;hp=b8010d08219b52e30479b299822550ac8a850519;hpb=affb3ca6e247a1193287c20e5ebb2574289375ae;p=nageru

diff --git a/ffmpeg_capture.cpp b/ffmpeg_capture.cpp
index b8010d0..50b4fa4 100644
--- a/ffmpeg_capture.cpp
+++ b/ffmpeg_capture.cpp
@@ -288,6 +288,7 @@ void FFmpegCapture::producer_thread_func()
 			producer_thread_should_quit.sleep_for(seconds(1));
 			continue;
 		}
+		should_interrupt = false;
 		if (!play_video(pathname)) {
 			// Error.
 			fprintf(stderr, "Error when playing %s, sleeping one second and trying again...\n", pathname.c_str());
@@ -349,7 +350,10 @@ bool FFmpegCapture::play_video(const string &pathname)
 		last_modified = buf.st_mtim;
 	}
 
-	auto format_ctx = avformat_open_input_unique(pathname.c_str(), nullptr, nullptr);
+	AVDictionary *opts = nullptr;
+	av_dict_set(&opts, "fflags", "nobuffer", 0);
+
+	auto format_ctx = avformat_open_input_unique(pathname.c_str(), nullptr, &opts, AVIOInterruptCB{ &FFmpegCapture::interrupt_cb_thunk, this });
 	if (format_ctx == nullptr) {
 		fprintf(stderr, "%s: Error opening file\n", pathname.c_str());
 		return false;
@@ -463,6 +467,7 @@ bool FFmpegCapture::play_video(const string &pathname)
 			}
 			next_frame_start = compute_frame_start(frame->pts, pts_origin, video_timebase, start, rate);
 			video_frame->received_timestamp = next_frame_start;
+			audio_frame->received_timestamp = next_frame_start;
 			bool finished_wakeup = producer_thread_should_quit.sleep_until(next_frame_start);
 			if (finished_wakeup) {
 				if (audio_frame->len > 0) {
@@ -797,3 +802,13 @@ UniqueFrame FFmpegCapture::make_video_frame(const AVFrame *frame, const string &
 
 	return video_frame;
 }
+
+int FFmpegCapture::interrupt_cb_thunk(void *unique)
+{
+	return reinterpret_cast<FFmpegCapture *>(unique)->interrupt_cb();
+}
+
+int FFmpegCapture::interrupt_cb()
+{
+	return should_interrupt.load();
+}