X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=x264_encoder.h;h=687bf718679c316a3b2e6a24a41c8e449d79c776;hp=2f9c81c4f51e91748680bb8f84234b4f313414e1;hb=327534a3031a332423411c9599c741f2f81657df;hpb=1df7849fad1d0647a02951abaa60f9e4f40ce360

diff --git a/x264_encoder.h b/x264_encoder.h
index 2f9c81c..687bf71 100644
--- a/x264_encoder.h
+++ b/x264_encoder.h
@@ -77,6 +77,9 @@ private:
 	void init_x264();
 	void encode_frame(QueuedFrame qf);
 
+	// bitrate_kbit can be 0 for no change.
+	static void speed_control_override_func(unsigned bitrate_kbit, movit::YCbCrLumaCoefficients coefficients, x264_param_t *param);
+
 	// One big memory chunk of all 50 (or whatever) frames, allocated in
 	// the constructor. All data functions just use pointers into this
 	// pool.
@@ -95,8 +98,6 @@ private:
 	x264_t *x264;
 	std::unique_ptr<X264SpeedControl> speed_control;
 
-	std::function<void(x264_param_t *)> bitrate_override_func;
-
 	std::atomic<unsigned> new_bitrate_kbit{0};  // 0 for no change.
 
 	// Protects everything below it.
@@ -115,16 +116,6 @@ 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)