Update the queue length metric after trimming, not before.

[nageru] / x264_encoder.h

diff --git a/x264_encoder.h b/x264_encoder.h
index 34cf70242b75dbb60cf806386bfcca74700c0e06..2f9c81c4f51e91748680bb8f84234b4f313414e1 100644 (file)
--- a/x264_encoder.h
+++ b/x264_encoder.h
@@ -32,7 +32,10 @@ extern "C" {
 
 #include <movit/image_format.h>
 
+#include "defs.h"
+#include "metrics.h"
 #include "print_latency.h"
+#include "x264_dynamic.h"
 
 class Mux;
 class X264SpeedControl;
@@ -88,6 +91,7 @@ private:
        std::thread encoder_thread;
        std::atomic<bool> x264_init_done{false};
        std::atomic<bool> should_quit{false};
+       X264Dynamic dyn;
        x264_t *x264;
        std::unique_ptr<X264SpeedControl> speed_control;
 
@@ -111,6 +115,16 @@ private:
 
        // Key is the pts of the frame.
        std::unordered_map<int64_t, ReceivedTimestamps> frames_being_encoded;
+
+       // Metrics.
+       std::atomic<int64_t> metric_x264_queued_frames{0};
+       std::atomic<int64_t> metric_x264_max_queued_frames{X264_QUEUE_LENGTH};
+       std::atomic<int64_t> metric_x264_dropped_frames{0};
+       std::atomic<int64_t> metric_x264_output_frames_i{0};
+       std::atomic<int64_t> metric_x264_output_frames_p{0};
+       std::atomic<int64_t> metric_x264_output_frames_b{0};
+       Histogram metric_x264_crf;
+       LatencyHistogram latency_histogram;
 };
 
 #endif  // !defined(_X264ENCODE_H)