X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=quicksync_encoder.cpp;h=f7e1696ab9f13419f182ed03a556e2e913c2c1b1;hb=fb7eac9998ac186130409e859eb7c63906f7a2fd;hp=d13cf87624069cc1319c3986df21fc89e42a26da;hpb=bc0683200d63d2fd0d49c0b998885c8b4d9db77e;p=nageru

diff --git a/quicksync_encoder.cpp b/quicksync_encoder.cpp
index d13cf87..f7e1696 100644
--- a/quicksync_encoder.cpp
+++ b/quicksync_encoder.cpp
@@ -68,9 +68,11 @@ namespace {
 
 // These need to survive several QuickSyncEncoderImpl instances,
 // so they are outside.
-bool mux_metrics_inited = false;
+once_flag quick_sync_metrics_inited;
 LatencyHistogram mixer_latency_histogram, qs_latency_histogram;
 MuxMetrics current_file_mux_metrics, total_mux_metrics;
+std::atomic<double> metric_current_file_start_time_seconds{0.0 / 0.0};
+std::atomic<int64_t> metric_quick_sync_stalled_frames{0};
 
 }  // namespace
 
@@ -1571,11 +1573,14 @@ QuickSyncEncoderImpl::QuickSyncEncoderImpl(const std::string &filename, Resource
 		memset(&slice_param, 0, sizeof(slice_param));
 	}
 
-	if (!mux_metrics_inited) {
+	call_once(quick_sync_metrics_inited, [](){
 		mixer_latency_histogram.init("mixer");
 		qs_latency_histogram.init("quick_sync");
-		mux_metrics_inited = true;
-	}
+		current_file_mux_metrics.init({{ "destination", "current_file" }});
+		total_mux_metrics.init({{ "destination", "files_total" }});
+		global_metrics.add("current_file_start_time_seconds", &metric_current_file_start_time_seconds, Metrics::TYPE_GAUGE);
+		global_metrics.add("quick_sync_stalled_frames", &metric_quick_sync_stalled_frames);
+	});
 
 	storage_thread = thread(&QuickSyncEncoderImpl::storage_task_thread, this);
 
@@ -1636,6 +1641,7 @@ bool QuickSyncEncoderImpl::begin_frame(int64_t pts, int64_t duration, YCbCrLumaC
 		if (surf == nullptr) {
 			fprintf(stderr, "Warning: No free slots for frame %d, rendering has to wait for H.264 encoder\n",
 				current_storage_frame);
+			++metric_quick_sync_stalled_frames;
 			storage_task_queue_changed.wait(lock, [this, &surf]{
 				if (storage_thread_should_quit)
 					return true;
@@ -1713,6 +1719,7 @@ bool QuickSyncEncoderImpl::begin_frame(int64_t pts, int64_t duration, YCbCrLumaC
 
 void QuickSyncEncoderImpl::add_audio(int64_t pts, vector<float> audio)
 {
+	lock_guard<mutex> lock(file_audio_encoder_mutex);
 	assert(!is_shutdown);
 	file_audio_encoder->encode_audio(audio, pts + global_delay());
 }
@@ -1794,7 +1801,10 @@ void QuickSyncEncoderImpl::shutdown()
 	storage_thread.join();
 
 	// Encode any leftover audio in the queues, and also any delayed frames.
-	file_audio_encoder->encode_last_audio();
+	{
+		lock_guard<mutex> lock(file_audio_encoder_mutex);
+		file_audio_encoder->encode_last_audio();
+	}
 
 	if (!global_flags.x264_video_to_disk) {
 		release_encode();
@@ -1806,6 +1816,7 @@ void QuickSyncEncoderImpl::shutdown()
 void QuickSyncEncoderImpl::close_file()
 {
 	file_mux.reset();
+	metric_current_file_start_time_seconds = 0.0 / 0.0;
 }
 
 void QuickSyncEncoderImpl::open_output_file(const std::string &filename)
@@ -1828,17 +1839,17 @@ void QuickSyncEncoderImpl::open_output_file(const std::string &filename)
 		video_extradata = x264_encoder->get_global_headers();
 	}
 
-	if (!mux_metrics_inited) {
-		current_file_mux_metrics.init({{ "destination", "current_file" }});
-		total_mux_metrics.init({{ "destination", "files_total" }});
-		mux_metrics_inited = true;
-	}
 	current_file_mux_metrics.reset();
 
-	AVCodecParametersWithDeleter audio_codecpar = file_audio_encoder->get_codec_parameters();
-	file_mux.reset(new Mux(avctx, frame_width, frame_height, Mux::CODEC_H264, video_extradata, audio_codecpar.get(), TIMEBASE,
-		std::bind(&DiskSpaceEstimator::report_write, disk_space_estimator, filename, _1),
-		{ &current_file_mux_metrics, &total_mux_metrics }));
+	{
+		lock_guard<mutex> lock(file_audio_encoder_mutex);
+		AVCodecParametersWithDeleter audio_codecpar = file_audio_encoder->get_codec_parameters();
+		file_mux.reset(new Mux(avctx, frame_width, frame_height, Mux::CODEC_H264, video_extradata, audio_codecpar.get(), TIMEBASE,
+			std::bind(&DiskSpaceEstimator::report_write, disk_space_estimator, filename, _1),
+			Mux::WRITE_BACKGROUND,
+			{ &current_file_mux_metrics, &total_mux_metrics }));
+	}
+	metric_current_file_start_time_seconds = get_timestamp_for_metrics();
 
 	if (global_flags.x264_video_to_disk) {
 		x264_encoder->add_mux(file_mux.get());
@@ -1978,8 +1989,12 @@ void QuickSyncEncoderImpl::pass_frame(QuickSyncEncoderImpl::PendingFrame frame,
 	// Wait for the GPU to be done with the frame.
 	GLenum sync_status;
 	do {
-		sync_status = glClientWaitSync(frame.fence.get(), 0, 1000000000);
+		sync_status = glClientWaitSync(frame.fence.get(), 0, 0);
 		check_error();
+		if (sync_status == GL_TIMEOUT_EXPIRED) {
+			// NVIDIA likes to busy-wait; yield instead.
+			this_thread::sleep_for(milliseconds(1));
+		}
 	} while (sync_status == GL_TIMEOUT_EXPIRED);
 	assert(sync_status != GL_WAIT_FAILED);