X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=x264_speed_control.h;h=b0a1739d022e462c48c7e80e7b73b905fcdb6411;hb=6ffaabac0a523617b686f40c154a25cb548cc561;hp=b45e6c6de285c90e866293f0aa95e52258601b2a;hpb=cf7b9ee186d4ef8e5da0531b75854c97b821be44;p=nageru

diff --git a/x264_speed_control.h b/x264_speed_control.h
index b45e6c6..b0a1739 100644
--- a/x264_speed_control.h
+++ b/x264_speed_control.h
@@ -1,3 +1,6 @@
+#ifndef _X264_SPEED_CONTROL_H
+#define _X264_SPEED_CONTROL_H 1
+
 // The x264 speed control tries to encode video at maximum possible quality
 // without skipping frames (at the expense of higher encoding latency and
 // less even output rates, although VBV is still respected). It does this
@@ -44,13 +47,17 @@
 // some cleanup, but it's much, much better than just using a static preset.
 
 #include <stdint.h>
+#include <atomic>
 #include <chrono>
 #include <functional>
 
 extern "C" {
-#include "x264.h"
+#include <x264.h>
 }
 
+#include "metrics.h"
+#include "x264_dynamic.h"
+
 class X264SpeedControl {
 public:
 	// x264: Encoding object we are using; must be opened. Assumed to be
@@ -95,6 +102,8 @@ private:
 	int dither_preset(float f);
 	void apply_preset(int new_preset);
 
+	X264Dynamic dyn;
+
 	// Not owned by us.
 	x264_t *x264;
 
@@ -123,4 +132,13 @@ private:
 	} stat;
 
 	std::function<void(x264_param_t *)> override_func = nullptr;
+
+	// Metrics.
+	Histogram metric_x264_speedcontrol_preset_used_frames;
+	std::atomic<double> metric_x264_speedcontrol_buffer_available_seconds{0.0};
+	std::atomic<double> metric_x264_speedcontrol_buffer_size_seconds{0.0};
+	std::atomic<int64_t> metric_x264_speedcontrol_idle_frames{0};
+	std::atomic<int64_t> metric_x264_speedcontrol_late_frames{0};
 };
+
+#endif  // !defined(_X264_SPEED_CONTROL_H)