X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fffmpeg_capture.cpp;h=4b9d477648cdbc8ee7e3efedfb79e112e972a2b3;hb=8bf76def09e0747734c33a21a8f94b3f462305c7;hp=79fba7b9ab4ebf4135e8e9f34c145e78a676e7b4;hpb=685a74b4a2e928670eb5fb53919bbcffca45c8e3;p=nageru

diff --git a/nageru/ffmpeg_capture.cpp b/nageru/ffmpeg_capture.cpp
index 79fba7b..4b9d477 100644
--- a/nageru/ffmpeg_capture.cpp
+++ b/nageru/ffmpeg_capture.cpp
@@ -50,6 +50,11 @@ using namespace bmusb;
 using namespace movit;
 using namespace Eigen;
 
+// Avoid deprecation warnings, but we don't want to drop FFmpeg 5.1 support just yet.
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 30, 100)
+#define pkt_duration duration
+#endif
+
 namespace {
 
 steady_clock::time_point compute_frame_start(int64_t frame_pts, int64_t pts_origin, const AVRational &video_timebase, const steady_clock::time_point &origin, double rate)
@@ -531,10 +536,13 @@ bool FFmpegCapture::play_video(const string &pathname)
 
 	AVFormatContextWithCloser format_ctx;
 	if (srt_sock == -1) {
-		// Regular file.
+		// Regular file (or stream).
+		frame_timeout_started = steady_clock::now();
+		frame_timeout_valid = true;
 		format_ctx = avformat_open_input_unique(pathname.c_str(), /*fmt=*/nullptr,
 			/*options=*/nullptr,
 			AVIOInterruptCB{ &FFmpegCapture::interrupt_cb_thunk, this });
+		frame_timeout_valid = false;
 	} else {
 #ifdef HAVE_SRT
 		// SRT socket, already opened.
@@ -653,8 +661,15 @@ bool FFmpegCapture::play_video(const string &pathname)
 
 		int64_t audio_pts;
 		bool error;
+		frame_timeout_started = steady_clock::now();
+		frame_timeout_valid = true;
 		AVFrameWithDeleter frame = decode_frame(format_ctx.get(), video_codec_ctx.get(), audio_codec_ctx.get(),
 			pathname, video_stream_index, audio_stream_index, subtitle_stream_index, audio_frame.get(), &audio_format, &audio_pts, &error);
+		frame_timeout_valid = false;
+		if (should_interrupt.load()) {
+			// Abort no matter whether we got a frame or not.
+			return false;
+		}
 		if (error) {
 			if (++consecutive_errors >= 100) {
 				fprintf(stderr, "More than 100 consecutive error video frames, aborting playback.\n");
@@ -891,34 +906,31 @@ AVFrameWithDeleter FFmpegCapture::decode_frame(AVFormatContext *format_ctx, AVCo
 	*audio_pts = -1;
 	bool has_audio = false;
 	do {
-		AVPacket pkt;
-		unique_ptr<AVPacket, decltype(av_packet_unref)*> pkt_cleanup(
-			&pkt, av_packet_unref);
-		av_init_packet(&pkt);
-		pkt.data = nullptr;
-		pkt.size = 0;
-		if (av_read_frame(format_ctx, &pkt) == 0) {
-			if (pkt.stream_index == audio_stream_index && audio_callback != nullptr) {
-				audio_callback(&pkt, format_ctx->streams[audio_stream_index]->time_base);
+		AVPacketWithDeleter pkt = av_packet_alloc_unique();
+		pkt->data = nullptr;
+		pkt->size = 0;
+		if (av_read_frame(format_ctx, pkt.get()) == 0) {
+			if (pkt->stream_index == audio_stream_index && audio_callback != nullptr) {
+				audio_callback(pkt.get(), format_ctx->streams[audio_stream_index]->time_base);
 			}
-			if (pkt.stream_index == video_stream_index && video_callback != nullptr) {
-				video_callback(&pkt, format_ctx->streams[video_stream_index]->time_base);
+			if (pkt->stream_index == video_stream_index && video_callback != nullptr) {
+				video_callback(pkt.get(), format_ctx->streams[video_stream_index]->time_base);
 			}
-			if (pkt.stream_index == video_stream_index && global_flags.transcode_video) {
-				if (avcodec_send_packet(video_codec_ctx, &pkt) < 0) {
+			if (pkt->stream_index == video_stream_index && global_flags.transcode_video) {
+				if (avcodec_send_packet(video_codec_ctx, pkt.get()) < 0) {
 					fprintf(stderr, "%s: Cannot send packet to video codec.\n", pathname.c_str());
 					*error = true;
 					return AVFrameWithDeleter(nullptr);
 				}
-			} else if (pkt.stream_index == audio_stream_index && global_flags.transcode_audio) {
+			} else if (pkt->stream_index == audio_stream_index && global_flags.transcode_audio) {
 				has_audio = true;
-				if (avcodec_send_packet(audio_codec_ctx, &pkt) < 0) {
+				if (avcodec_send_packet(audio_codec_ctx, pkt.get()) < 0) {
 					fprintf(stderr, "%s: Cannot send packet to audio codec.\n", pathname.c_str());
 					*error = true;
 					return AVFrameWithDeleter(nullptr);
 				}
-			} else if (pkt.stream_index == subtitle_stream_index) {
-				last_subtitle = string(reinterpret_cast<const char *>(pkt.data), pkt.size);
+			} else if (pkt->stream_index == subtitle_stream_index) {
+				last_subtitle = string(reinterpret_cast<const char *>(pkt->data), pkt->size);
 				has_last_subtitle = true;
 			}
 		} else {
@@ -1166,6 +1178,21 @@ int FFmpegCapture::interrupt_cb_thunk(void *opaque)
 
 int FFmpegCapture::interrupt_cb()
 {
+	// If ten seconds is gone without anything happening, we assume that
+	// we are in a network stream that died and FFmpeg just didn't
+	// pick it up (or perhaps it just hung, keeping the connection open).
+	// Called back approximately every 100 ms if something is hanging,
+	// so we get more than enough accuracy for our purposes.
+	if (!should_interrupt && frame_timeout_valid &&
+	    duration<double>(steady_clock::now() - frame_timeout_started).count() >= 10.0) {
+		string filename_copy;
+		{
+			lock_guard<mutex> lock(filename_mu);
+			filename_copy = filename;
+		}
+		fprintf(stderr, "%s: No frame for more than 10 seconds, restarting stream.\n", filename.c_str());
+		should_interrupt = true;
+	}
 	return should_interrupt.load();
 }