X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fvideo_encoder.cpp;h=31c6b4d8e24834d960205a3790e8dcc02169d88f;hb=23a236b4b2c551376b90c31d9a6cf72025da368c;hp=8dee6da8307d47814f650302ad6d6ded2e78398e;hpb=b2313d869262960aa3bcaaf3f45f2a3b90d1fc18;p=nageru

diff --git a/nageru/video_encoder.cpp b/nageru/video_encoder.cpp
index 8dee6da..31c6b4d 100644
--- a/nageru/video_encoder.cpp
+++ b/nageru/video_encoder.cpp
@@ -12,6 +12,9 @@ extern "C" {
 }
 
 #include "audio_encoder.h"
+#ifdef HAVE_AV1
+#include "av1_encoder.h"
+#endif
 #include "defs.h"
 #include "shared/ffmpeg_raii.h"
 #include "flags.h"
@@ -35,7 +38,7 @@ string generate_local_dump_filename(int frame)
 	localtime_r(&now, &now_tm);
 
 	char timestamp[64];
-	strftime(timestamp, sizeof(timestamp), "%F-%T%z", &now_tm);
+	strftime(timestamp, sizeof(timestamp), "%F-%H%M%S%z", &now_tm);
 
 	// Use the frame number to disambiguate between two cuts starting
 	// on the same second.
@@ -59,11 +62,23 @@ VideoEncoder::VideoEncoder(ResourcePool *resource_pool, QSurface *surface, const
 		stream_audio_encoder.reset(new AudioEncoder(global_flags.stream_audio_codec_name, global_flags.stream_audio_codec_bitrate, oformat));
 	}
 	if (global_flags.x264_video_to_http || global_flags.x264_video_to_disk) {
-		x264_encoder.reset(new X264Encoder(oformat));
+		x264_encoder.reset(new X264Encoder(oformat, /*use_separate_disk_params=*/false));
+	}
+	VideoCodecInterface *http_encoder = x264_encoder.get();
+	VideoCodecInterface *disk_encoder = x264_encoder.get();
+#ifdef HAVE_AV1
+	if (global_flags.av1_video_to_http) {
+		av1_encoder.reset(new AV1Encoder(oformat));
+		http_encoder = av1_encoder.get();
+	}
+#endif
+	if (global_flags.x264_separate_disk_encode) {
+		x264_disk_encoder.reset(new X264Encoder(oformat, /*use_separate_disk_params=*/true));
+		disk_encoder = x264_disk_encoder.get();
 	}
 
 	string filename = generate_local_dump_filename(/*frame=*/0);
-	quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, x264_encoder.get(), disk_space_estimator));
+	quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, http_encoder, disk_encoder, disk_space_estimator));
 
 	open_output_stream();
 	stream_audio_encoder->add_mux(stream_mux.get());
@@ -71,12 +86,18 @@ VideoEncoder::VideoEncoder(ResourcePool *resource_pool, QSurface *surface, const
 	if (global_flags.x264_video_to_http) {
 		x264_encoder->add_mux(stream_mux.get());
 	}
+#ifdef HAVE_AV1
+	if (global_flags.av1_video_to_http) {
+		av1_encoder->add_mux(stream_mux.get());
+	}
+#endif
 }
 
 VideoEncoder::~VideoEncoder()
 {
 	quicksync_encoder->shutdown();
 	x264_encoder.reset(nullptr);
+	x264_disk_encoder.reset(nullptr);
 	quicksync_encoder->close_file();
 	quicksync_encoder.reset(nullptr);
 	while (quicksync_encoders_in_shutdown.load() > 0) {
@@ -100,12 +121,17 @@ void VideoEncoder::do_cut(int frame)
 	lock_guard<mutex> lock1(qs_mu, adopt_lock), lock2(qs_audio_mu, adopt_lock);
 	QuickSyncEncoder *old_encoder = quicksync_encoder.release();  // When we go C++14, we can use move capture instead.
 	X264Encoder *old_x264_encoder = nullptr;
+	X264Encoder *old_x264_disk_encoder = nullptr;
 	if (global_flags.x264_video_to_disk) {
 		old_x264_encoder = x264_encoder.release();
 	}
-	thread([old_encoder, old_x264_encoder, this]{
+	if (global_flags.x264_separate_disk_encode) {
+		old_x264_disk_encoder = x264_disk_encoder.release();
+	}
+	thread([old_encoder, old_x264_encoder, old_x264_disk_encoder, this]{
 		old_encoder->shutdown();
 		delete old_x264_encoder;
+		delete old_x264_disk_encoder;
 		old_encoder->close_file();
 		stream_mux->unplug();
 
@@ -116,7 +142,8 @@ void VideoEncoder::do_cut(int frame)
 	}).detach();
 
 	if (global_flags.x264_video_to_disk) {
-		x264_encoder.reset(new X264Encoder(oformat));
+		x264_encoder.reset(new X264Encoder(oformat, /*use_separate_disk_params=*/false));
+		assert(global_flags.x264_video_to_http);
 		if (global_flags.x264_video_to_http) {
 			x264_encoder->add_mux(stream_mux.get());
 		}
@@ -124,8 +151,14 @@ void VideoEncoder::do_cut(int frame)
 			x264_encoder->change_bitrate(overriding_bitrate);
 		}
 	}
+	X264Encoder *http_encoder = x264_encoder.get();
+	X264Encoder *disk_encoder = x264_encoder.get();
+	if (global_flags.x264_separate_disk_encode) {
+		x264_disk_encoder.reset(new X264Encoder(oformat, /*use_separate_disk_params=*/true));
+		disk_encoder = x264_disk_encoder.get();
+	}
 
-	quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, x264_encoder.get(), disk_space_estimator));
+	quicksync_encoder.reset(new QuickSyncEncoder(filename, resource_pool, surface, va_display, width, height, oformat, http_encoder, disk_encoder, disk_space_estimator));
 	quicksync_encoder->set_stream_mux(stream_mux.get());
 }
 
@@ -172,7 +205,7 @@ RefCountedGLsync VideoEncoder::end_frame()
 void VideoEncoder::open_output_stream()
 {
 	AVFormatContext *avctx = avformat_alloc_context();
-	avctx->oformat = oformat;
+	avctx->oformat = const_cast<decltype(avctx->oformat)>(oformat);  // const_cast is a hack to work in FFmpeg both before and after 5.0.
 
 	uint8_t *buf = (uint8_t *)av_malloc(MUX_BUFFER_SIZE);
 	avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, this, nullptr, nullptr, nullptr);
@@ -182,6 +215,8 @@ void VideoEncoder::open_output_stream()
 	Mux::Codec video_codec;
 	if (global_flags.uncompressed_video_to_http) {
 		video_codec = Mux::CODEC_NV12;
+	} else if (global_flags.av1_video_to_http) {
+		video_codec = Mux::CODEC_AV1;
 	} else {
 		video_codec = Mux::CODEC_H264;
 	}
@@ -189,8 +224,12 @@ void VideoEncoder::open_output_stream()
 	avctx->flags = AVFMT_FLAG_CUSTOM_IO;
 
 	string video_extradata;
-	if (global_flags.x264_video_to_http || global_flags.x264_video_to_disk) {
+	if (global_flags.x264_video_to_http) {
 		video_extradata = x264_encoder->get_global_headers();
+#ifdef HAVE_AV1
+	} else if (global_flags.av1_video_to_http) {
+		video_extradata = av1_encoder->get_global_headers();
+#endif
 	}
 
 	stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_codec_parameters().get(),
@@ -217,9 +256,9 @@ int VideoEncoder::write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType t
 
 	if (type == AVIO_DATA_MARKER_HEADER) {
 		stream_mux_header.append((char *)buf, buf_size);
-		httpd->set_header(HTTPD::MAIN_STREAM, stream_mux_header);
+		httpd->set_header(HTTPD::StreamID{ HTTPD::MAIN_STREAM, 0 }, stream_mux_header);
 	} else {
-		httpd->add_data(HTTPD::MAIN_STREAM, (char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT, time, AVRational{ AV_TIME_BASE, 1 });
+		httpd->add_data(HTTPD::StreamID{ HTTPD::MAIN_STREAM, 0 }, (char *)buf, buf_size, type == AVIO_DATA_MARKER_SYNC_POINT, time, AVRational{ AV_TIME_BASE, 1 });
 	}
 	return buf_size;
 }