X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fffmpeg_capture.cpp;h=a9ad73d8d7ee0948744111bfaffc451159c25e9f;hb=bdc9f1ea04141e71906d486f9d254c3346835e72;hp=c6824069aedc8786954531e3fb1f8f62deb52391;hpb=1be4f26ad8f13698671d63f203ec0433cf4cf4aa;p=nageru

diff --git a/nageru/ffmpeg_capture.cpp b/nageru/ffmpeg_capture.cpp
index c682406..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;
 	}
 
@@ -452,6 +454,27 @@ void FFmpegCapture::send_disconnected_frame()
 	}
 }
 
+AVPixelFormat get_vaapi_hw_format(AVCodecContext *ctx, const AVPixelFormat *fmt)
+{
+	for (const AVPixelFormat *fmt_ptr = fmt; *fmt_ptr != -1; ++fmt_ptr) {
+		for (int i = 0;; ++i) {  // Termination condition inside loop.
+			const AVCodecHWConfig *config = avcodec_get_hw_config(ctx->codec, i);
+			if (config == nullptr) {  // End of list.
+				fprintf(stderr, "Decoder %s does not support device.\n", ctx->codec->name);
+				break;
+			}
+			if (config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX &&
+			    config->device_type == AV_HWDEVICE_TYPE_VAAPI &&
+			    config->pix_fmt == *fmt_ptr) {
+				return config->pix_fmt;
+			}
+		}
+	}
+
+	// We found no VA-API formats, so take the best software format.
+	return fmt[0];
+}
+
 bool FFmpegCapture::play_video(const string &pathname)
 {
 	// Note: Call before open, not after; otherwise, there's a race.
@@ -477,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 });
@@ -507,7 +530,8 @@ 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);
 	if (avcodec_parameters_to_context(video_codec_ctx.get(), video_codecpar) < 0) {
@@ -518,6 +542,18 @@ bool FFmpegCapture::play_video(const string &pathname)
 		fprintf(stderr, "%s: Cannot find video decoder\n", pathname.c_str());
 		return false;
 	}
+
+	// Seemingly, it's not too easy to make something that just initializes
+	// “whatever goes”, so we don't get VDPAU or CUDA here without enumerating
+	// through several different types. VA-API will do for now.
+	AVBufferRef *hw_device_ctx = nullptr;
+	if (av_hwdevice_ctx_create(&hw_device_ctx, AV_HWDEVICE_TYPE_VAAPI, nullptr, nullptr, 0) < 0) {
+		fprintf(stderr, "Failed to initialize VA-API for FFmpeg acceleration. Decoding video in software.\n");
+	} else {
+		video_codec_ctx->hw_device_ctx = av_buffer_ref(hw_device_ctx);
+		video_codec_ctx->get_format = get_vaapi_hw_format;
+	}
+
 	if (avcodec_open2(video_codec_ctx.get(), video_codec, nullptr) < 0) {
 		fprintf(stderr, "%s: Cannot open video decoder\n", pathname.c_str());
 		return false;
@@ -538,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;
@@ -700,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;
@@ -807,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());
@@ -850,6 +891,21 @@ AVFrameWithDeleter FFmpegCapture::decode_frame(AVFormatContext *format_ctx, AVCo
 		// Decode video, if we have a frame.
 		int err = avcodec_receive_frame(video_codec_ctx, video_avframe.get());
 		if (err == 0) {
+			if (video_avframe->format == AV_PIX_FMT_VAAPI) {
+				// Get the frame down to the CPU. (TODO: See if we can keep it
+				// on the GPU all the way, since it will be going up again later.
+				// However, this only works if the OpenGL GPU is the same one.)
+				AVFrameWithDeleter sw_frame = av_frame_alloc_unique();
+				int err = av_hwframe_transfer_data(sw_frame.get(), video_avframe.get(), 0);
+				if (err != 0) {
+					fprintf(stderr, "%s: Cannot transfer hardware video frame to software.\n", pathname.c_str());
+					*error = true;
+					return AVFrameWithDeleter(nullptr);
+				}
+				sw_frame->pts = video_avframe->pts;
+				sw_frame->pkt_duration = video_avframe->pkt_duration;
+				video_avframe = move(sw_frame);
+			}
 			frame_finished = true;
 			break;
 		} else if (err != AVERROR(EAGAIN)) {
@@ -1060,7 +1116,7 @@ unsigned FFmpegCapture::frame_height(const AVFrame *frame) const
 	if (height == 0) {
 		return frame->height;
 	} else {
-		return width;
+		return height;
 	}
 }