X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fvideo_encoder.cpp;h=8138e76a42c99a7cf984d030ea7241423d99599d;hb=58644bea00e8de98276e4acb4e62e892256e3b46;hp=6344b8c6a04a89e0fe6e9e312999a2ad449ab93f;hpb=9b7d691b4cc5db7dbfc18c82e86c1207fcac4722;p=nageru

diff --git a/nageru/video_encoder.cpp b/nageru/video_encoder.cpp
index 6344b8c..8138e76 100644
--- a/nageru/video_encoder.cpp
+++ b/nageru/video_encoder.cpp
@@ -13,12 +13,12 @@ extern "C" {
 
 #include "audio_encoder.h"
 #include "defs.h"
-#include "ffmpeg_raii.h"
+#include "shared/ffmpeg_raii.h"
 #include "flags.h"
-#include "httpd.h"
-#include "mux.h"
+#include "shared/httpd.h"
+#include "shared/mux.h"
 #include "quicksync_encoder.h"
-#include "timebase.h"
+#include "shared/timebase.h"
 #include "x264_encoder.h"
 
 class RefCountedFrame;
@@ -35,7 +35,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 +59,17 @@ 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));
+	}
+	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();
 	}
 
 	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());
@@ -77,6 +83,7 @@ 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 +107,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 +128,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 +137,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());
 }
 
@@ -193,7 +212,8 @@ void VideoEncoder::open_output_stream()
 		video_extradata = x264_encoder->get_global_headers();
 	}
 
-	stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_codec_parameters().get(), COARSE_TIMEBASE,
+	stream_mux.reset(new Mux(avctx, width, height, video_codec, video_extradata, stream_audio_encoder->get_codec_parameters().get(),
+		get_color_space(global_flags.ycbcr_rec709_coefficients), COARSE_TIMEBASE,
 		/*write_callback=*/nullptr, Mux::WRITE_FOREGROUND, { &stream_mux_metrics }));
 	stream_mux_metrics.init({{ "destination", "http" }});
 }
@@ -216,9 +236,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(stream_mux_header);
+		httpd->set_header(HTTPD::StreamID{ HTTPD::MAIN_STREAM, 0 }, stream_mux_header);
 	} else {
-		httpd->add_data((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;
 }