X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fx264_speed_control.cpp;h=0c7e7e8632b689fd06460cc6dae7486a53f24d95;hb=f81ae3be1aae619fe4ad022f55d95a4a83ace076;hp=81e98a7d39f4966e0e88a6c693a7dc9fb57cc2cf;hpb=f34a3e1bbc207541842e0b54d5418d95bafc8e5b;p=nageru diff --git a/nageru/x264_speed_control.cpp b/nageru/x264_speed_control.cpp index 81e98a7..0c7e7e8 100644 --- a/nageru/x264_speed_control.cpp +++ b/nageru/x264_speed_control.cpp @@ -3,15 +3,15 @@ #include #include #include +#include #include #include #include #include -#include -#include #include "flags.h" #include "shared/metrics.h" +#include "x264_dynamic.h" using namespace std; using namespace std::chrono; @@ -208,17 +208,6 @@ void X264SpeedControl::before_frame(float new_buffer_fill, int new_buffer_size, 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; - static steady_clock::time_point print_interval; - static bool first = false; - idle_t += buffer_fill - buffer_size; - if (first || duration(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; metric_x264_speedcontrol_buffer_available_seconds = buffer_fill * 1e-6; ++metric_x264_speedcontrol_idle_frames;