X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=quicksync_encoder.cpp;h=1b36aa5246fbda3b19b5e65a5abc48365ab23840;hb=017c260b96736e797fee120107b85c4c7fc81aa1;hp=3a689d35b47c2107cfe7220a87040e7e4b775722;hpb=2abf57fbc06f52c04fb2ca1f765459908e688890;p=nageru

diff --git a/quicksync_encoder.cpp b/quicksync_encoder.cpp
index 3a689d3..1b36aa5 100644
--- a/quicksync_encoder.cpp
+++ b/quicksync_encoder.cpp
@@ -64,6 +64,18 @@ using namespace std::placeholders;
 class QOpenGLContext;
 class QSurface;
 
+namespace {
+
+// These need to survive several QuickSyncEncoderImpl instances,
+// so they are outside.
+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
+
 #define CHECK_VASTATUS(va_status, func)                                 \
     if (va_status != VA_STATUS_SUCCESS) {                               \
         fprintf(stderr, "%s:%d (%s) failed with %d\n", __func__, __LINE__, func, va_status); \
@@ -1413,8 +1425,8 @@ void QuickSyncEncoderImpl::save_codeddata(GLSurface *surf, storage_task task)
 	vaUnmapBuffer(va_dpy, surf->coded_buf);
 
 	static int frameno = 0;
-	print_latency("Current QuickSync latency (video inputs → disk mux):",
-		task.received_ts, (task.frame_type == FRAME_B), &frameno);
+	print_latency("Current Quick Sync latency (video inputs → disk mux):",
+		task.received_ts, (task.frame_type == FRAME_B), &frameno, &qs_latency_histogram);
 
 	{
 		// Add video.
@@ -1561,6 +1573,15 @@ QuickSyncEncoderImpl::QuickSyncEncoderImpl(const std::string &filename, Resource
 		memset(&slice_param, 0, sizeof(slice_param));
 	}
 
+	call_once(quick_sync_metrics_inited, [](){
+		mixer_latency_histogram.init("mixer");
+		qs_latency_histogram.init("quick_sync");
+		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);
 
 	encode_thread = thread([this]{
@@ -1620,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;
@@ -1790,6 +1812,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)
@@ -1812,9 +1835,13 @@ void QuickSyncEncoderImpl::open_output_file(const std::string &filename)
 		video_extradata = x264_encoder->get_global_headers();
 	}
 
+	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)));
+		std::bind(&DiskSpaceEstimator::report_write, disk_space_estimator, filename, _1),
+		{ &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());
@@ -1962,7 +1989,7 @@ void QuickSyncEncoderImpl::pass_frame(QuickSyncEncoderImpl::PendingFrame frame,
 	ReceivedTimestamps received_ts = find_received_timestamp(frame.input_frames);
 	static int frameno = 0;
 	print_latency("Current mixer latency (video inputs → ready for encode):",
-		received_ts, false, &frameno);
+		received_ts, false, &frameno, &mixer_latency_histogram);
 
 	// Release back any input frames we needed to render this frame.
 	frame.input_frames.clear();