X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=x264_speed_control.cpp;h=141813203c61e4ae1e6d2ff0b5cb585ab2b8a5a7;hb=5cd2e667b7531777991c98dc6d3249e95b98314c;hp=3ed3ece8e5b95ed0a69d8788511d489eb39217eb;hpb=16c0e5da7fa7b4eeea79470c24697a1ba193f071;p=nageru

diff --git a/x264_speed_control.cpp b/x264_speed_control.cpp
index 3ed3ece..1418132 100644
--- a/x264_speed_control.cpp
+++ b/x264_speed_control.cpp
@@ -1,12 +1,18 @@
 #include "x264_speed_control.h"
 
-#include "flags.h"
-
-#include <time.h>
-
+#include <math.h>
+#include <stdio.h>
+#include <x264.h>
 #include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <ratio>
+#include <type_traits>
+
+#include "flags.h"
 
 using namespace std;
+using namespace std::chrono;
 
 X264SpeedControl::X264SpeedControl(x264_t *x264, float f_speed, int i_buffer_size, float f_buffer_init)
 	: x264(x264), f_speed(f_speed)
@@ -20,12 +26,14 @@ X264SpeedControl::X264SpeedControl(x264_t *x264, float f_speed, int i_buffer_siz
 	buffer_fill = buffer_size * f_buffer_init;
 	buffer_fill = max<int64_t>(buffer_fill, uspf);
 	buffer_fill = min(buffer_fill, buffer_size);
-	timestamp = mdate();
+	timestamp = steady_clock::now();
 	preset = -1;
 	cplx_num = 3e3; //FIXME estimate initial complexity
 	cplx_den = .1;
 	stat.min_buffer = buffer_size;
 	stat.max_buffer = 0;
+	stat.avg_preset = 0.0;
+	stat.den = 0;
 }
 
 X264SpeedControl::~X264SpeedControl()
@@ -162,40 +170,45 @@ void X264SpeedControl::before_frame(float new_buffer_fill, int new_buffer_size,
 	}
 	buffer_fill = buffer_size * new_buffer_fill;
 
-	int64_t t, delta_t;
+	steady_clock::time_point t;
 
 	// update buffer state after encoding and outputting the previous frame(s)
 	if (first) {
-		t = timestamp = mdate();
+		t = timestamp = steady_clock::now();
 		first = false;
 	} else {
-		t = mdate();
+		t = steady_clock::now();
 	}
 
-	delta_t = t - timestamp;
+	auto delta_t = t - timestamp;
 	timestamp = t;
 
 	// update the time predictor
-	int cpu_time = cpu_time_last_frame;
-	cplx_num *= cplx_decay;
-	cplx_den *= cplx_decay;
-	cplx_num += cpu_time / presets[preset].time;
-	++cplx_den;
-
-	stat.avg_preset += preset;
-	++stat.den;
+	if (preset >= 0) {
+		int cpu_time = duration_cast<microseconds>(cpu_time_last_frame).count();
+		cplx_num *= cplx_decay;
+		cplx_den *= cplx_decay;
+		cplx_num += cpu_time / presets[preset].time;
+		++cplx_den;
+
+		stat.avg_preset += preset;
+		++stat.den;
+	}
 
 	stat.min_buffer = min(buffer_fill, stat.min_buffer);
 	stat.max_buffer = max(buffer_fill, stat.max_buffer);
 
 	if (buffer_fill >= buffer_size) { // oops, cpu was idle
 		// not really an error, but we'll warn for debugging purposes
-		static int64_t idle_t = 0, print_interval = 0;
+		static int64_t idle_t = 0;
+		static steady_clock::time_point print_interval;
+		static bool first = false;
 		idle_t += buffer_fill - buffer_size;
-		if (t - print_interval > 1e6) {
+		if (first || duration<double>(t - print_interval).count() > 0.1) {
 			//fprintf(stderr, "speedcontrol idle (%.6f sec)\n", idle_t/1e6);
 			print_interval = t;
 			idle_t = 0;
+			first = false;
 		}
 		buffer_fill = buffer_size;
 	} else if (buffer_fill <= 0) {  // oops, we're late
@@ -243,8 +256,8 @@ void X264SpeedControl::before_frame(float new_buffer_fill, int new_buffer_size,
 		if (global_flags.x264_speedcontrol_verbose) {
 			static float cpu, wall, tgt, den;
 			const float decay = 1-1/100.;
-			cpu = cpu*decay + cpu_time_last_frame;
-			wall = wall*decay + delta_t;
+			cpu = cpu*decay + duration_cast<microseconds>(cpu_time_last_frame).count();
+			wall = wall*decay + duration_cast<microseconds>(delta_t).count();
 			tgt = tgt*decay + target;
 			den = den*decay + 1;
 			fprintf(stderr, "speed: %.2f+%.2f %d[%.5f] (t/c/w: %6.0f/%6.0f/%6.0f = %.4f) fps=%.2f\r",
@@ -257,7 +270,7 @@ void X264SpeedControl::before_frame(float new_buffer_fill, int new_buffer_size,
 
 void X264SpeedControl::after_frame()
 {
-	cpu_time_last_frame = mdate() - timestamp;
+	cpu_time_last_frame = steady_clock::now() - timestamp;
 }
 
 void X264SpeedControl::set_buffer_size(int new_buffer_size)
@@ -301,13 +314,9 @@ void X264SpeedControl::apply_preset(int new_preset)
 	p.analyse.b_mixed_references = s->mix;
 	p.analyse.i_direct_mv_pred = s->direct;
 	p.analyse.i_me_range = s->merange;
+	if (override_func) {
+		override_func(&p);
+	}
 	x264_encoder_reconfig(x264, &p);
 	preset = new_preset;
 }
-
-int64_t X264SpeedControl::mdate()
-{
-	timespec now;
-	clock_gettime(CLOCK_MONOTONIC, &now);
-	return now.tv_sec * 1000000 + now.tv_nsec / 1000;
-}