X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=nageru%2Fffmpeg_capture.cpp;h=a9ad73d8d7ee0948744111bfaffc451159c25e9f;hb=9fa1937b8af43ec93e6fd4ea3a23519257b3274d;hp=a8b6f612a06a470eb7427648497dffc4aaf47295;hpb=9948aa3cbbf9e0eaa7e0f92852498195e287e235;p=nageru

diff --git a/nageru/ffmpeg_capture.cpp b/nageru/ffmpeg_capture.cpp
index a8b6f61..a9ad73d 100644
--- a/nageru/ffmpeg_capture.cpp
+++ b/nageru/ffmpeg_capture.cpp
@@ -438,9 +438,11 @@ void FFmpegCapture::send_disconnected_frame()
 			memset(video_frame.data + frame_width * frame_height, 128, frame_width * frame_height);  // Valid for both NV12 and planar.
 		}
 
-		frame_callback(-1, AVRational{1, TIMEBASE}, -1, AVRational{1, TIMEBASE}, timecode++,
-			video_frame, /*video_offset=*/0, video_format,
-			FrameAllocator::Frame(), /*audio_offset=*/0, AudioFormat());
+		if (frame_callback != nullptr) {
+			frame_callback(-1, AVRational{1, TIMEBASE}, -1, AVRational{1, TIMEBASE}, timecode++,
+				video_frame, /*video_offset=*/0, video_format,
+				FrameAllocator::Frame(), /*audio_offset=*/0, AudioFormat());
+		}
 		last_frame_was_connected = false;
 	}
 
@@ -498,7 +500,7 @@ bool FFmpegCapture::play_video(const string &pathname)
 	} else {
 #ifdef HAVE_SRT
 		// SRT socket, already opened.
-		AVInputFormat *mpegts_fmt = av_find_input_format("mpegts");
+		const AVInputFormat *mpegts_fmt = av_find_input_format("mpegts");
 		format_ctx = avformat_open_input_unique(&FFmpegCapture::read_srt_thunk, this,
 			mpegts_fmt, /*options=*/nullptr,
 			AVIOInterruptCB{ &FFmpegCapture::interrupt_cb_thunk, this });
@@ -528,7 +530,7 @@ bool FFmpegCapture::play_video(const string &pathname)
 
 	// Open video decoder.
 	const AVCodecParameters *video_codecpar = format_ctx->streams[video_stream_index]->codecpar;
-	AVCodec *video_codec = avcodec_find_decoder(video_codecpar->codec_id);
+	const AVCodec *video_codec = avcodec_find_decoder(video_codecpar->codec_id);
 
 	video_timebase = format_ctx->streams[video_stream_index]->time_base;
 	AVCodecContextWithDeleter video_codec_ctx = avcodec_alloc_context3_unique(nullptr);
@@ -572,7 +574,7 @@ bool FFmpegCapture::play_video(const string &pathname)
 			fprintf(stderr, "%s: Cannot fill audio codec parameters\n", pathname.c_str());
 			return false;
 		}
-		AVCodec *audio_codec = avcodec_find_decoder(audio_codecpar->codec_id);
+		const AVCodec *audio_codec = avcodec_find_decoder(audio_codecpar->codec_id);
 		if (audio_codec == nullptr) {
 			fprintf(stderr, "%s: Cannot find audio decoder\n", pathname.c_str());
 			return false;
@@ -734,9 +736,11 @@ bool FFmpegCapture::play_video(const string &pathname)
 					timecode += MAX_FPS * 2 + 1;
 				}
 				last_neutral_color = get_neutral_color(frame->metadata);
-				frame_callback(frame->pts, video_timebase, audio_pts, audio_timebase, timecode++,
-					video_frame.get_and_release(), 0, video_format,
-					audio_frame.get_and_release(), 0, audio_format);
+				if (frame_callback != nullptr) {
+					frame_callback(frame->pts, video_timebase, audio_pts, audio_timebase, timecode++,
+						video_frame.get_and_release(), 0, video_format,
+						audio_frame.get_and_release(), 0, audio_format);
+				}
 				first_frame = false;
 				last_frame = steady_clock::now();
 				last_frame_was_connected = true;
@@ -841,13 +845,16 @@ AVFrameWithDeleter FFmpegCapture::decode_frame(AVFormatContext *format_ctx, AVCo
 			if (pkt.stream_index == audio_stream_index && audio_callback != nullptr) {
 				audio_callback(&pkt, format_ctx->streams[audio_stream_index]->time_base);
 			}
-			if (pkt.stream_index == video_stream_index) {
+			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 && global_flags.transcode_video) {
 				if (avcodec_send_packet(video_codec_ctx, &pkt) < 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) {
+			} else if (pkt.stream_index == audio_stream_index && global_flags.transcode_audio) {
 				has_audio = true;
 				if (avcodec_send_packet(audio_codec_ctx, &pkt) < 0) {
 					fprintf(stderr, "%s: Cannot send packet to audio codec.\n", pathname.c_str());