Fix so that you can't right-click on non-signal channels anymore.

[nageru] / x264_encoder.cpp

diff --git a/x264_encoder.cpp b/x264_encoder.cpp
index 9d108a0604989a87d4898dd970071a3495136bd3..70b50e4b94f7369f9d1e8447c17a784a4e194fa7 100644 (file)
--- a/x264_encoder.cpp
+++ b/x264_encoder.cpp
@@ -7,7 +7,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <x264.h>
+#include <atomic>
 #include <cstdint>
+#include <mutex>
 
 #include "defs.h"
 #include "flags.h"
@@ -29,6 +31,18 @@ using namespace std::chrono;
 
 namespace {
 
+// X264Encoder can be restarted if --record-x264-video is set, so make these
+// metrics global.
+atomic<int64_t> metric_x264_queued_frames{0};
+atomic<int64_t> metric_x264_max_queued_frames{X264_QUEUE_LENGTH};
+atomic<int64_t> metric_x264_dropped_frames{0};
+atomic<int64_t> metric_x264_output_frames_i{0};
+atomic<int64_t> metric_x264_output_frames_p{0};
+atomic<int64_t> metric_x264_output_frames_b{0};
+Histogram metric_x264_crf;
+LatencyHistogram x264_latency_histogram;
+once_flag x264_metrics_inited;
+
 void update_vbv_settings(x264_param_t *param)
 {
        if (global_flags.x264_bitrate == -1) {
@@ -52,20 +66,25 @@ X264Encoder::X264Encoder(AVOutputFormat *oformat)
        : wants_global_headers(oformat->flags & AVFMT_GLOBALHEADER),
          dyn(load_x264_for_bit_depth(global_flags.x264_bit_depth))
 {
+       call_once(x264_metrics_inited, [](){
+               global_metrics.add("x264_queued_frames", &metric_x264_queued_frames, Metrics::TYPE_GAUGE);
+               global_metrics.add("x264_max_queued_frames", &metric_x264_max_queued_frames, Metrics::TYPE_GAUGE);
+               global_metrics.add("x264_dropped_frames", &metric_x264_dropped_frames);
+               global_metrics.add("x264_output_frames", {{ "type", "i" }}, &metric_x264_output_frames_i);
+               global_metrics.add("x264_output_frames", {{ "type", "p" }}, &metric_x264_output_frames_p);
+               global_metrics.add("x264_output_frames", {{ "type", "b" }}, &metric_x264_output_frames_b);
+
+               metric_x264_crf.init_uniform(50);
+               global_metrics.add("x264_crf", &metric_x264_crf);
+               x264_latency_histogram.init("x264");
+       });
+
        size_t bytes_per_pixel = global_flags.x264_bit_depth > 8 ? 2 : 1;
        frame_pool.reset(new uint8_t[global_flags.width * global_flags.height * 2 * bytes_per_pixel * X264_QUEUE_LENGTH]);
        for (unsigned i = 0; i < X264_QUEUE_LENGTH; ++i) {
                free_frames.push(frame_pool.get() + i * (global_flags.width * global_flags.height * 2 * bytes_per_pixel));
        }
        encoder_thread = thread(&X264Encoder::encoder_thread_func, this);
-
-       global_metrics.add("x264_queued_frames", &metric_x264_queued_frames, Metrics::TYPE_GAUGE);
-       global_metrics.add("x264_max_queued_frames", &metric_x264_max_queued_frames, Metrics::TYPE_GAUGE);
-       global_metrics.add("x264_dropped_frames", &metric_x264_dropped_frames);
-       global_metrics.add("x264_output_frames", {{ "type", "i" }}, &metric_x264_output_frames_i);
-       global_metrics.add("x264_output_frames", {{ "type", "p" }}, &metric_x264_output_frames_p);
-       global_metrics.add("x264_output_frames", {{ "type", "b" }}, &metric_x264_output_frames_b);
-       global_metrics.add_histogram("x264_crf", {}, metric_x264_crf, &metric_x264_crf_sum, crf_buckets);
 }
 
 X264Encoder::~X264Encoder()
@@ -134,7 +153,7 @@ void X264Encoder::init_x264()
        param.vui.i_vidformat = 5;  // Unspecified.
        param.vui.b_fullrange = 0;
        param.vui.i_colorprim = 1;  // BT.709.
-       param.vui.i_transfer = 2;  // Unspecified (since we use sRGB).
+       param.vui.i_transfer = 13;  // sRGB.
        if (global_flags.ycbcr_rec709_coefficients) {
                param.vui.i_colmatrix = 1;  // BT.709.
        } else {
@@ -364,15 +383,7 @@ void X264Encoder::encode_frame(X264Encoder::QueuedFrame qf)
                ++metric_x264_output_frames_p;
        }
 
-       if (pic.prop.f_crf_avg <= 0.0) {
-               ++metric_x264_crf[0];
-       } else if (pic.prop.f_crf_avg <= crf_buckets - 1) {
-               ++metric_x264_crf[int(floor(pic.prop.f_crf_avg))];
-       } else {
-               // Just clamp; this isn't ideal, but at least the total count will be right.
-               ++metric_x264_crf[crf_buckets - 1];
-       }
-       metric_x264_crf_sum = metric_x264_crf_sum + pic.prop.f_crf_avg;
+       metric_x264_crf.count_event(pic.prop.f_crf_avg);
 
        if (frames_being_encoded.count(pic.i_pts)) {
                ReceivedTimestamps received_ts = frames_being_encoded[pic.i_pts];
@@ -381,7 +392,7 @@ void X264Encoder::encode_frame(X264Encoder::QueuedFrame qf)
                static int frameno = 0;
                print_latency("Current x264 latency (video inputs → network mux):",
                        received_ts, (pic.i_type == X264_TYPE_B || pic.i_type == X264_TYPE_BREF),
-                       &frameno);
+                       &frameno, &x264_latency_histogram);
        } else {
                assert(false);
        }