X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=x264_speed_control.cpp;h=ca9f52a6003def7f29209aad08a51629b7bb8727;hp=b6a60e97b877a566331bec7f7c99a578321af1c8;hb=703e00da89118df9be0354dda621bed023e6030e;hpb=4194f21b1a5e4ccfe79d40024075ab9795814029

diff --git a/x264_speed_control.cpp b/x264_speed_control.cpp
index b6a60e9..ca9f52a 100644
--- a/x264_speed_control.cpp
+++ b/x264_speed_control.cpp
@@ -16,6 +16,8 @@
 using namespace std;
 using namespace std::chrono;
 
+#define SC_PRESETS 25
+
 X264SpeedControl::X264SpeedControl(x264_t *x264, float f_speed, int i_buffer_size, float f_buffer_init)
 	: dyn(load_x264_for_bit_depth(global_flags.x264_bit_depth)),
 	  x264(x264), f_speed(f_speed)
@@ -40,7 +42,8 @@ X264SpeedControl::X264SpeedControl(x264_t *x264, float f_speed, int i_buffer_siz
 
 	metric_x264_speedcontrol_buffer_available_seconds = buffer_fill * 1e-6;
 	metric_x264_speedcontrol_buffer_size_seconds = buffer_size * 1e-6;
-	global_metrics.add_histogram("x264_speedcontrol_preset_used_frames", {}, metric_x264_speedcontrol_preset_used_frames, SC_PRESETS);
+	metric_x264_speedcontrol_preset_used_frames.init_uniform(SC_PRESETS);
+	global_metrics.add("x264_speedcontrol_preset_used_frames", &metric_x264_speedcontrol_preset_used_frames);
 	global_metrics.add("x264_speedcontrol_buffer_available_seconds", &metric_x264_speedcontrol_buffer_available_seconds, Metrics::TYPE_GAUGE);
 	global_metrics.add("x264_speedcontrol_buffer_size_seconds", &metric_x264_speedcontrol_buffer_size_seconds, Metrics::TYPE_GAUGE);
 	global_metrics.add("x264_speedcontrol_idle_frames", &metric_x264_speedcontrol_idle_frames);
@@ -78,7 +81,8 @@ typedef struct
 // all presets are benchmarked with --weightp 1 --mbtree --rc-lookahead 20
 // on top of the given settings (equivalent settings to the "faster" preset).
 // Timings and SSIM measurements were done on a quadcore Haswell i5 3.2 GHz
-// on the first 1000 frames of "Tears of Steel" in 1080p.
+// on the first 1000 frames of "Elephants Dream" in 1080p.
+// See experiments/measure-x264.pl for a way to reproduce.
 //
 // Note that the two first and the two last are also used for extrapolation
 // should the desired time be outside the range. Thus, it is disadvantageous if
@@ -89,83 +93,80 @@ static const sc_preset_t presets[SC_PRESETS] = {
 #define P4 X264_ANALYSE_PSUB8x8
 #define P8 X264_ANALYSE_PSUB16x16
 #define B8 X264_ANALYSE_BSUB16x16
-	// Preset 0: 14.179db, --preset superfast --b-adapt 0 --bframes 0
+	// Preset 0: 16.583db, --preset superfast --b-adapt 0 --bframes 0
 	{ .time= 1.000, .subme=1, .me=X264_ME_DIA, .refs=1, .mix=0, .trellis=0, .partitions=I8|I4, .badapt=0, .bframes=0, .direct=0, .merange=16 },
 
-	// Preset 1: 14.459db, --preset superfast
-	{ .time= 1.283, .subme=1, .me=X264_ME_DIA, .refs=1, .mix=0, .trellis=0, .partitions=I8|I4, .badapt=1, .bframes=3, .direct=1, .merange=16 },
-
-	// Preset 2: 14.761db, --preset superfast --subme 2
-	{ .time= 1.603, .subme=2, .me=X264_ME_DIA, .refs=1, .mix=0, .trellis=0, .partitions=I8|I4, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 1: 17.386db, --preset superfast
+	{ .time= 1.288, .subme=1, .me=X264_ME_DIA, .refs=1, .mix=0, .trellis=0, .partitions=I8|I4, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 3: 15.543db, --preset veryfast
-	{ .time= 1.843, .subme=2, .me=X264_ME_HEX, .refs=1, .mix=0, .trellis=0, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 2: 17.919db, --preset superfast --subme 2
+	{ .time= 2.231, .subme=2, .me=X264_ME_DIA, .refs=1, .mix=0, .trellis=0, .partitions=I8|I4, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 4: 15.716db, --preset veryfast --subme 3
-	{ .time= 2.452, .subme=3, .me=X264_ME_HEX, .refs=1, .mix=0, .trellis=0, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 3: 18.051db, --preset veryfast
+	{ .time= 2.403, .subme=2, .me=X264_ME_HEX, .refs=1, .mix=0, .trellis=0, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 5: 15.786db, --preset veryfast --subme 3 --ref 2
-	{ .time= 2.733, .subme=3, .me=X264_ME_HEX, .refs=2, .mix=0, .trellis=0, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 4: 18.422db, --preset veryfast --subme 3
+	{ .time= 2.636, .subme=3, .me=X264_ME_HEX, .refs=1, .mix=0, .trellis=0, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 6: 15.813db, --preset veryfast --subme 4 --ref 2
-	{ .time= 3.085, .subme=4, .me=X264_ME_HEX, .refs=2, .mix=0, .trellis=0, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 5: 18.514db, --preset veryfast --subme 3 --ref 2
+	{ .time= 2.844, .subme=3, .me=X264_ME_HEX, .refs=2, .mix=0, .trellis=0, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 7: 15.849db, --preset faster
-	{ .time= 3.101, .subme=4, .me=X264_ME_HEX, .refs=2, .mix=0, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 6: 18.564db, --preset veryfast --subme 4 --ref 2
+	{ .time= 3.366, .subme=4, .me=X264_ME_HEX, .refs=2, .mix=0, .trellis=0, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 8: 15.857db, --preset faster --mixed-refs
-	{ .time= 3.284, .subme=4, .me=X264_ME_HEX, .refs=2, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 7: 18.411db, --preset faster
+	{ .time= 3.450, .subme=4, .me=X264_ME_HEX, .refs=2, .mix=0, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 9: 15.869db, --preset faster --mixed-refs --subme 5
-	{ .time= 3.587, .subme=5, .me=X264_ME_HEX, .refs=2, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 8: 18.429db, --preset faster --mixed-refs
+	{ .time= 3.701, .subme=4, .me=X264_ME_HEX, .refs=2, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 10: 16.051db, --preset fast
-	{ .time= 3.947, .subme=6, .me=X264_ME_HEX, .refs=2, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 9: 18.454db, --preset faster --mixed-refs --subme 5
+	{ .time= 4.297, .subme=5, .me=X264_ME_HEX, .refs=2, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 11: 16.356db, --preset fast --subme 7
-	{ .time= 4.041, .subme=7, .me=X264_ME_HEX, .refs=2, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 10: 18.528db, --preset fast
+	{ .time= 5.181, .subme=6, .me=X264_ME_HEX, .refs=2, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 12: 16.418db, --preset fast --subme 7 --ref 3
-	{ .time= 4.406, .subme=7, .me=X264_ME_HEX, .refs=3, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 11: 18.762db, --preset fast --subme 7
+	{ .time= 5.357, .subme=7, .me=X264_ME_HEX, .refs=2, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 13: 16.460db, --preset medium
-	{ .time= 4.707, .subme=7, .me=X264_ME_HEX, .refs=3, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 12: 18.819db, --preset medium
+	{ .time= 6.040, .subme=7, .me=X264_ME_HEX, .refs=3, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 14: 16.517db, --preset medium --subme 8
-	{ .time= 5.133, .subme=8, .me=X264_ME_HEX, .refs=3, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 13: 18.889db, --preset medium --subme 8
+	{ .time= 7.408, .subme=8, .me=X264_ME_HEX, .refs=3, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 15: 16.523db, --preset medium --subme 8 --me umh
-	{ .time= 6.050, .subme=8, .me=X264_ME_UMH, .refs=3, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
+	// Preset 14: 19.127db, --preset medium --subme 8 --trellis 2
+	{ .time=10.124, .subme=8, .me=X264_ME_HEX, .refs=3, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=1, .merange=16 },
 
-	// Preset 16: 16.543db, --preset medium --subme 8 --me umh --direct auto --b-adapt 2
-	{ .time= 6.849, .subme=8, .me=X264_ME_UMH, .refs=3, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=2, .bframes=3, .direct=3, .merange=16 },
+	// Preset 15: 19.118db, --preset medium --subme 8 --trellis 2 --direct auto
+	{ .time=10.144, .subme=8, .me=X264_ME_HEX, .refs=3, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=3, .merange=16 },
 
-	// Preset 17: 16.613db, --preset slow
-	{ .time= 8.042, .subme=8, .me=X264_ME_UMH, .refs=5, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=2, .bframes=3, .direct=3, .merange=16 },
+	// Preset 16: 19.172db, --preset slow
+	{ .time=11.142, .subme=8, .me=X264_ME_HEX, .refs=5, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8, .badapt=1, .bframes=3, .direct=3, .merange=16 },
 
-	// Preset 18: 16.641db, --preset slow --subme 9
-	{ .time= 8.972, .subme=9, .me=X264_ME_UMH, .refs=5, .mix=1, .trellis=1, .partitions=I8|I4|P8|B8, .badapt=2, .bframes=3, .direct=3, .merange=16 },
+	// Preset 17: 19.309db, --preset slow --b-adapt 2 --subme 9
+	{ .time=11.168, .subme=9, .me=X264_ME_HEX, .refs=5, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8, .badapt=2, .bframes=3, .direct=3, .merange=16 },
 
-	// Preset 19: 16.895db, --preset slow --subme 9 --trellis 2
-	{ .time=10.073, .subme=9, .me=X264_ME_UMH, .refs=5, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8, .badapt=2, .bframes=3, .direct=3, .merange=16 },
+	// Preset 18: 19.316db, --preset slow --b-adapt 2 --subme 9 --me umh
+	{ .time=12.942, .subme=9, .me=X264_ME_UMH, .refs=5, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8, .badapt=2, .bframes=3, .direct=3, .merange=16 },
 
-	// Preset 20: 16.918db, --preset slow --subme 9 --trellis 2 --ref 6
-	{ .time=11.147, .subme=9, .me=X264_ME_UMH, .refs=6, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8, .badapt=2, .bframes=3, .direct=3, .merange=16 },
+	// Preset 19: 19.342db, --preset slow --b-adapt 2 --subme 9 --me umh --ref 6
+	{ .time=14.302, .subme=9, .me=X264_ME_UMH, .refs=6, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8, .badapt=2, .bframes=3, .direct=3, .merange=16 },
 
-	// Preset 21: 16.934db, --preset slow --subme 9 --trellis 2 --ref 7
-	{ .time=12.267, .subme=9, .me=X264_ME_UMH, .refs=7, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8, .badapt=2, .bframes=3, .direct=3, .merange=16 },
+	// Preset 20: 19.365db, --preset slow --b-adapt 2 --subme 9 --me umh --ref 7
+	{ .time=15.554, .subme=9, .me=X264_ME_UMH, .refs=7, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8, .badapt=2, .bframes=3, .direct=3, .merange=16 },
 
-	// Preset 22: 16.948db, --preset slower
-	{ .time=13.829, .subme=9, .me=X264_ME_UMH, .refs=8, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8|P4, .badapt=2, .bframes=3, .direct=3, .merange=16 },
+	// Preset 21: 19.396db, --preset slower
+	{ .time=17.551, .subme=9, .me=X264_ME_UMH, .refs=8, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8|P4, .badapt=2, .bframes=3, .direct=3, .merange=16 },
 
-	// Preset 23: 17.058db, --preset slower --subme 10
-	{ .time=14.831, .subme=10, .me=X264_ME_UMH, .refs=8, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8|P4, .badapt=2, .bframes=3, .direct=3, .merange=16 },
+	// Preset 22: 19.491db, --preset slower --subme 10
+	{ .time=21.321, .subme=10, .me=X264_ME_UMH, .refs=8, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8|P4, .badapt=2, .bframes=3, .direct=3, .merange=16 },
 
-	// Preset 24: 17.268db, --preset slower --subme 10 --bframes 8
-	{ .time=18.705, .subme=10, .me=X264_ME_UMH, .refs=8, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8|P4, .badapt=2, .bframes=8, .direct=3, .merange=16 },
+	// Preset 23: 19.764db, --preset slower --subme 10 --bframes 8
+	{ .time=23.200, .subme=10, .me=X264_ME_UMH, .refs=8, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8|P4, .badapt=2, .bframes=8, .direct=3, .merange=16 },
 
-	// Preset 25: 17.297db, --preset veryslow
-	{ .time=31.419, .subme=10, .me=X264_ME_UMH, .refs=16, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8|P4, .badapt=2, .bframes=8, .direct=3, .merange=24 },
+	// Preset 24: 19.807db, --preset veryslow
+	{ .time=36.922, .subme=10, .me=X264_ME_UMH, .refs=16, .mix=1, .trellis=2, .partitions=I8|I4|P8|B8|P4, .badapt=2, .bframes=8, .direct=3, .merange=24 },
 #undef I4
 #undef I8
 #undef P4
@@ -296,6 +297,7 @@ void X264SpeedControl::set_buffer_size(int new_buffer_size)
 	buffer_size = new_buffer_size * uspf;
 	cplx_decay = 1 - 1./new_buffer_size;
 	compensation_period = buffer_size/4;
+	metric_x264_speedcontrol_buffer_size_seconds = buffer_size * 1e-6;
 }
 
 int X264SpeedControl::dither_preset(float f)
@@ -337,5 +339,5 @@ void X264SpeedControl::apply_preset(int new_preset)
 	dyn.x264_encoder_reconfig(x264, &p);
 	preset = new_preset;
 
-	++metric_x264_speedcontrol_preset_used_frames[new_preset];
+	metric_x264_speedcontrol_preset_used_frames.count_event(new_preset);
 }