Export SRT statistics as Prometheus metrics.

Note that there are some bugs in libsrt 1.4.0 that are fixed in
1.4.1, e.g. receive buffer sizes are negative.

diff --git a/nageru/ffmpeg_capture.h b/nageru/ffmpeg_capture.h
index 35673122b01ccbc55e3e3a3549adc70bdd95d88f..4cddbfddf757bce77a1f49b6c21b52bd7b57675b 100644 (file)
--- a/nageru/ffmpeg_capture.h
+++ b/nageru/ffmpeg_capture.h
@@ -213,6 +213,7 @@ public:
        void start_bm_capture() override;
        void stop_dequeue_thread() override;
        bool get_disconnected() const override { return disconnected; }  // Only if play_once == true.
+       int get_srt_sock() const { return srt_sock; }
 
        std::map<uint32_t, bmusb::VideoMode> get_available_video_modes() const override;
        void set_video_mode(uint32_t video_mode_id) override {}  // Ignore.

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index a773d6c60db99cb59530301f95f21b0f6f299120..ba1f3347f4876d209fdd18a6d836a7f05969482d 100644 (file)
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -549,7 +549,7 @@ Mixer::~Mixer()
        video_encoder.reset(nullptr);
 }
 
-void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardType card_type, DeckLinkOutput *output, bool override_card_as_live)
+void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardType card_type, DeckLinkOutput *output, bool is_srt_card)
 {
        printf("Configuring card %d...\n", card_index);
 
@@ -604,12 +604,12 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
 
        // NOTE: start_bm_capture() happens in thread_func().
 
-       if (override_card_as_live) {
+       if (is_srt_card) {
                assert(card_type == CardType::FFMPEG_INPUT);
        }
 
        DeviceSpec device;
-       if (card_type == CardType::FFMPEG_INPUT && !override_card_as_live) {
+       if (card_type == CardType::FFMPEG_INPUT && !is_srt_card) {
                device = DeviceSpec{InputSourceType::FFMPEG_VIDEO_INPUT, card_index - num_cards};
        } else {
                device = DeviceSpec{InputSourceType::CAPTURE_CARD, card_index};
@@ -623,21 +623,87 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
                const vector<pair<string, string>> &labels = card->labels;
                card->jitter_history.unregister_metrics(labels);
                card->queue_length_policy.unregister_metrics(labels);
-               global_metrics.remove("input_received_frames", labels);
-               global_metrics.remove("input_dropped_frames_jitter", labels);
-               global_metrics.remove("input_dropped_frames_error", labels);
-               global_metrics.remove("input_dropped_frames_resets", labels);
-               global_metrics.remove("input_queue_length_frames", labels);
-               global_metrics.remove("input_queue_duped_frames", labels);
-
-               global_metrics.remove("input_has_signal_bool", labels);
-               global_metrics.remove("input_is_connected_bool", labels);
-               global_metrics.remove("input_interlaced_bool", labels);
-               global_metrics.remove("input_width_pixels", labels);
-               global_metrics.remove("input_height_pixels", labels);
-               global_metrics.remove("input_frame_rate_nom", labels);
-               global_metrics.remove("input_frame_rate_den", labels);
-               global_metrics.remove("input_sample_rate_hz", labels);
+               global_metrics.remove_if_exists("input_received_frames", labels);
+               global_metrics.remove_if_exists("input_dropped_frames_jitter", labels);
+               global_metrics.remove_if_exists("input_dropped_frames_error", labels);
+               global_metrics.remove_if_exists("input_dropped_frames_resets", labels);
+               global_metrics.remove_if_exists("input_queue_length_frames", labels);
+               global_metrics.remove_if_exists("input_queue_duped_frames", labels);
+
+               global_metrics.remove_if_exists("input_has_signal_bool", labels);
+               global_metrics.remove_if_exists("input_is_connected_bool", labels);
+               global_metrics.remove_if_exists("input_interlaced_bool", labels);
+               global_metrics.remove_if_exists("input_width_pixels", labels);
+               global_metrics.remove_if_exists("input_height_pixels", labels);
+               global_metrics.remove_if_exists("input_frame_rate_nom", labels);
+               global_metrics.remove_if_exists("input_frame_rate_den", labels);
+               global_metrics.remove_if_exists("input_sample_rate_hz", labels);
+
+               // SRT metrics.
+
+               // Global measurements (counters).
+               global_metrics.remove_if_exists("srt_uptime_seconds", labels);
+               global_metrics.remove_if_exists("srt_send_duration_seconds", labels);
+               global_metrics.remove_if_exists("srt_sent_bytes", labels);
+               global_metrics.remove_if_exists("srt_received_bytes", labels);
+
+               vector<pair<string, string>> packet_labels = card->labels;
+               packet_labels.emplace_back("type", "normal");
+               global_metrics.remove_if_exists("srt_sent_packets", packet_labels);
+               global_metrics.remove_if_exists("srt_received_packets", packet_labels);
+
+               packet_labels.back().second = "lost";
+               global_metrics.remove_if_exists("srt_sent_packets", packet_labels);
+               global_metrics.remove_if_exists("srt_received_packets", packet_labels);
+
+               packet_labels.back().second = "retransmitted";
+               global_metrics.remove_if_exists("srt_sent_packets", packet_labels);
+               global_metrics.remove_if_exists("srt_sent_bytes", packet_labels);
+
+               packet_labels.back().second = "ack";
+               global_metrics.remove_if_exists("srt_sent_packets", packet_labels);
+               global_metrics.remove_if_exists("srt_received_packets", packet_labels);
+
+               packet_labels.back().second = "nak";
+               global_metrics.remove_if_exists("srt_sent_packets", packet_labels);
+               global_metrics.remove_if_exists("srt_received_packets", packet_labels);
+
+               packet_labels.back().second = "dropped";
+               global_metrics.remove_if_exists("srt_sent_packets", packet_labels);
+               global_metrics.remove_if_exists("srt_received_packets", packet_labels);
+               global_metrics.remove_if_exists("srt_sent_bytes", packet_labels);
+               global_metrics.remove_if_exists("srt_received_bytes", packet_labels);
+
+               packet_labels.back().second = "undecryptable";
+               global_metrics.remove_if_exists("srt_received_packets", packet_labels);
+               global_metrics.remove_if_exists("srt_received_bytes", packet_labels);
+
+               global_metrics.remove_if_exists("srt_filter_sent_extra_packets", labels);
+               global_metrics.remove_if_exists("srt_filter_received_extra_packets", labels);
+               global_metrics.remove_if_exists("srt_filter_received_rebuilt_packets", labels);
+               global_metrics.remove_if_exists("srt_filter_received_lost_packets", labels);
+
+               // Instant measurements (gauges).
+               global_metrics.remove_if_exists("srt_packet_sending_period_seconds", labels);
+               global_metrics.remove_if_exists("srt_flow_window_packets", labels);
+               global_metrics.remove_if_exists("srt_congestion_window_packets", labels);
+               global_metrics.remove_if_exists("srt_flight_size_packets", labels);
+               global_metrics.remove_if_exists("srt_rtt_seconds", labels);
+               global_metrics.remove_if_exists("srt_estimated_bandwidth_bits_per_second", labels);
+               global_metrics.remove_if_exists("srt_bandwidth_ceiling_bits_per_second", labels);
+               global_metrics.remove_if_exists("srt_send_buffer_available_bytes", labels);
+               global_metrics.remove_if_exists("srt_receive_buffer_available_bytes", labels);
+               global_metrics.remove_if_exists("srt_mss_bytes", labels);
+
+               global_metrics.remove_if_exists("srt_sender_unacked_packets", labels);
+               global_metrics.remove_if_exists("srt_sender_unacked_bytes", labels);
+               global_metrics.remove_if_exists("srt_sender_unacked_timespan_seconds", labels);
+               global_metrics.remove_if_exists("srt_sender_delivery_delay_seconds", labels);
+
+               global_metrics.remove_if_exists("srt_receiver_unacked_packets", labels);
+               global_metrics.remove_if_exists("srt_receiver_unacked_bytes", labels);
+               global_metrics.remove_if_exists("srt_receiver_unacked_timespan_seconds", labels);
+               global_metrics.remove_if_exists("srt_receiver_delivery_delay_seconds", labels);
        }
 
        // Register metrics.
@@ -654,7 +720,11 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
                labels.emplace_back("cardtype", "fake");
                break;
        case CardType::FFMPEG_INPUT:
-               labels.emplace_back("cardtype", "ffmpeg");
+               if (is_srt_card) {
+                       labels.emplace_back("cardtype", "srt");
+               } else {
+                       labels.emplace_back("cardtype", "ffmpeg");
+               }
                break;
        case CardType::CEF_INPUT:
                labels.emplace_back("cardtype", "cef");
@@ -679,6 +749,73 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
        global_metrics.add("input_frame_rate_nom", labels, &card->metric_input_frame_rate_nom, Metrics::TYPE_GAUGE);
        global_metrics.add("input_frame_rate_den", labels, &card->metric_input_frame_rate_den, Metrics::TYPE_GAUGE);
        global_metrics.add("input_sample_rate_hz", labels, &card->metric_input_sample_rate_hz, Metrics::TYPE_GAUGE);
+
+       if (is_srt_card) {
+               // Global measurements (counters).
+               global_metrics.add("srt_uptime_seconds", labels, &card->metric_srt_uptime_seconds);
+               global_metrics.add("srt_send_duration_seconds", labels, &card->metric_srt_send_duration_seconds);
+               global_metrics.add("srt_sent_bytes", labels, &card->metric_srt_sent_bytes);
+               global_metrics.add("srt_received_bytes", labels, &card->metric_srt_received_bytes);
+
+               vector<pair<string, string>> packet_labels = labels;
+               packet_labels.emplace_back("type", "normal");
+               global_metrics.add("srt_sent_packets", packet_labels, &card->metric_srt_sent_packets_normal);
+               global_metrics.add("srt_received_packets", packet_labels, &card->metric_srt_received_packets_normal);
+
+               packet_labels.back().second = "lost";
+               global_metrics.add("srt_sent_packets", packet_labels, &card->metric_srt_sent_packets_lost);
+               global_metrics.add("srt_received_packets", packet_labels, &card->metric_srt_received_packets_lost);
+
+               packet_labels.back().second = "retransmitted";
+               global_metrics.add("srt_sent_packets", packet_labels, &card->metric_srt_sent_packets_retransmitted);
+               global_metrics.add("srt_sent_bytes", packet_labels, &card->metric_srt_sent_bytes_retransmitted);
+
+               packet_labels.back().second = "ack";
+               global_metrics.add("srt_sent_packets", packet_labels, &card->metric_srt_sent_packets_ack);
+               global_metrics.add("srt_received_packets", packet_labels, &card->metric_srt_received_packets_ack);
+
+               packet_labels.back().second = "nak";
+               global_metrics.add("srt_sent_packets", packet_labels, &card->metric_srt_sent_packets_nak);
+               global_metrics.add("srt_received_packets", packet_labels, &card->metric_srt_received_packets_nak);
+
+               packet_labels.back().second = "dropped";
+               global_metrics.add("srt_sent_packets", packet_labels, &card->metric_srt_sent_packets_dropped);
+               global_metrics.add("srt_received_packets", packet_labels, &card->metric_srt_received_packets_dropped);
+               global_metrics.add("srt_sent_bytes", packet_labels, &card->metric_srt_sent_bytes_dropped);
+               global_metrics.add("srt_received_bytes", packet_labels, &card->metric_srt_received_bytes_dropped);
+
+               packet_labels.back().second = "undecryptable";
+               global_metrics.add("srt_received_packets", packet_labels, &card->metric_srt_received_packets_undecryptable);
+               global_metrics.add("srt_received_bytes", packet_labels, &card->metric_srt_received_bytes_undecryptable);
+
+               global_metrics.add("srt_filter_sent_extra_packets", labels, &card->metric_srt_filter_sent_packets);
+               global_metrics.add("srt_filter_received_extra_packets", labels, &card->metric_srt_filter_received_extra_packets);
+               global_metrics.add("srt_filter_received_rebuilt_packets", labels, &card->metric_srt_filter_received_rebuilt_packets);
+               global_metrics.add("srt_filter_received_lost_packets", labels, &card->metric_srt_filter_received_lost_packets);
+
+               // Instant measurements (gauges).
+               global_metrics.add("srt_packet_sending_period_seconds", labels, &card->metric_srt_packet_sending_period_seconds, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_flow_window_packets", labels, &card->metric_srt_flow_window_packets, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_congestion_window_packets", labels, &card->metric_srt_congestion_window_packets, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_flight_size_packets", labels, &card->metric_srt_flight_size_packets, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_rtt_seconds", labels, &card->metric_srt_rtt_seconds, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_estimated_bandwidth_bits_per_second", labels, &card->metric_srt_estimated_bandwidth_bits_per_second, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_bandwidth_ceiling_bits_per_second", labels, &card->metric_srt_bandwidth_ceiling_bits_per_second, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_send_buffer_available_bytes", labels, &card->metric_srt_send_buffer_available_bytes, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_receive_buffer_available_bytes", labels, &card->metric_srt_receive_buffer_available_bytes, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_mss_bytes", labels, &card->metric_srt_mss_bytes, Metrics::TYPE_GAUGE);
+
+               global_metrics.add("srt_sender_unacked_packets", labels, &card->metric_srt_sender_unacked_packets, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_sender_unacked_bytes", labels, &card->metric_srt_sender_unacked_bytes, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_sender_unacked_timespan_seconds", labels, &card->metric_srt_sender_unacked_timespan_seconds, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_sender_delivery_delay_seconds", labels, &card->metric_srt_sender_delivery_delay_seconds, Metrics::TYPE_GAUGE);
+
+               global_metrics.add("srt_receiver_unacked_packets", labels, &card->metric_srt_receiver_unacked_packets, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_receiver_unacked_bytes", labels, &card->metric_srt_receiver_unacked_bytes, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_receiver_unacked_timespan_seconds", labels, &card->metric_srt_receiver_unacked_timespan_seconds, Metrics::TYPE_GAUGE);
+               global_metrics.add("srt_receiver_delivery_delay_seconds", labels, &card->metric_srt_receiver_delivery_delay_seconds, Metrics::TYPE_GAUGE);
+       }
+
        card->labels = labels;
 }
 
@@ -873,6 +1010,14 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                userdata->has_last_subtitle = ffmpeg_capture->get_has_last_subtitle();
                userdata->last_subtitle = ffmpeg_capture->get_last_subtitle();
        }
+#ifdef HAVE_SRT
+       if (card->type == CardType::FFMPEG_INPUT) {
+               int srt_sock = static_cast<FFmpegCapture *>(card->capture.get())->get_srt_sock();
+               if (srt_sock != -1) {
+                       update_srt_stats(srt_sock, card);
+               }
+       }
+#endif
 
        size_t cbcr_width, cbcr_height, cbcr_offset, y_offset;
        size_t expected_length = video_format.stride * (video_format.height + video_format.extra_lines_top + video_format.extra_lines_bottom);
@@ -1477,6 +1622,7 @@ void Mixer::handle_hotplugged_cards()
                        FFmpegCapture *capture = new FFmpegCapture(sock, stream_id);
                        capture->set_card_index(free_card_index);
                        configure_card(free_card_index, capture, CardType::FFMPEG_INPUT, /*output=*/nullptr, /*override_card_as_live=*/true);
+                       update_srt_stats(sock, card);  // Initial zero stats.
                        card->last_srt_stream_id = stream_id;
                        card->queue_length_policy.reset(free_card_index);
                        capture->set_card_disconnected_callback(bind(&Mixer::bm_hotplug_remove, this, free_card_index));
@@ -1966,4 +2112,57 @@ void Mixer::start_srt()
 }
 #endif
 
+#ifdef HAVE_SRT
+void Mixer::update_srt_stats(int srt_sock, Mixer::CaptureCard *card)
+{
+       SRT_TRACEBSTATS stats;
+       srt_bistats(srt_sock, &stats, /*clear=*/0, /*instantaneous=*/1);
+
+       card->metric_srt_uptime_seconds = stats.msTimeStamp * 1e-3;
+       card->metric_srt_send_duration_seconds = stats.usSndDurationTotal * 1e-6;
+       card->metric_srt_sent_bytes = stats.byteSentTotal;
+       card->metric_srt_received_bytes = stats.byteRecvTotal;
+       card->metric_srt_sent_packets_normal = stats.pktSentTotal;
+       card->metric_srt_received_packets_normal = stats.pktRecvTotal;
+       card->metric_srt_sent_packets_lost = stats.pktSndLossTotal;
+       card->metric_srt_received_packets_lost = stats.pktRcvLossTotal;
+       card->metric_srt_sent_packets_retransmitted = stats.pktRetransTotal;
+       card->metric_srt_sent_bytes_retransmitted = stats.byteRetransTotal;
+       card->metric_srt_sent_packets_ack = stats.pktSentACKTotal;
+       card->metric_srt_received_packets_ack = stats.pktRecvACKTotal;
+       card->metric_srt_sent_packets_nak = stats.pktSentNAKTotal;
+       card->metric_srt_received_packets_nak = stats.pktRecvNAKTotal;
+       card->metric_srt_sent_packets_dropped = stats.pktSndDropTotal;
+       card->metric_srt_received_packets_dropped = stats.pktRcvDropTotal;
+       card->metric_srt_sent_bytes_dropped = stats.byteSndDropTotal;
+       card->metric_srt_received_bytes_dropped = stats.byteRcvDropTotal;
+       card->metric_srt_received_packets_undecryptable = stats.pktRcvUndecryptTotal;
+       card->metric_srt_received_bytes_undecryptable = stats.byteRcvUndecryptTotal;
+       card->metric_srt_filter_sent_packets = stats.pktSndFilterExtraTotal;
+       card->metric_srt_filter_received_extra_packets = stats.pktRcvFilterExtraTotal;
+       card->metric_srt_filter_received_rebuilt_packets = stats.pktRcvFilterSupplyTotal;
+       card->metric_srt_filter_received_lost_packets = stats.pktRcvFilterLossTotal;
+
+       // Gauges.
+       card->metric_srt_packet_sending_period_seconds = stats.usPktSndPeriod * 1e-6;
+       card->metric_srt_flow_window_packets = stats.pktFlowWindow;
+       card->metric_srt_congestion_window_packets = stats.pktCongestionWindow;
+       card->metric_srt_flight_size_packets = stats.pktFlightSize;
+       card->metric_srt_rtt_seconds = stats.msRTT * 1e-3;
+       card->metric_srt_estimated_bandwidth_bits_per_second = stats.mbpsBandwidth * 1e6;
+       card->metric_srt_bandwidth_ceiling_bits_per_second = stats.mbpsMaxBW * 1e6;
+       card->metric_srt_send_buffer_available_bytes = stats.byteAvailSndBuf;
+       card->metric_srt_receive_buffer_available_bytes = stats.byteAvailRcvBuf;
+       card->metric_srt_mss_bytes = stats.byteMSS;
+       card->metric_srt_sender_unacked_packets = stats.pktSndBuf;
+       card->metric_srt_sender_unacked_bytes = stats.byteSndBuf;
+       card->metric_srt_sender_unacked_timespan_seconds = stats.msSndBuf * 1e-3;
+       card->metric_srt_sender_delivery_delay_seconds = stats.msSndTsbPdDelay * 1e-3;
+       card->metric_srt_receiver_unacked_packets = stats.pktRcvBuf;
+       card->metric_srt_receiver_unacked_bytes = stats.byteRcvBuf;
+       card->metric_srt_receiver_unacked_timespan_seconds = stats.msRcvBuf * 1e-3;
+       card->metric_srt_receiver_delivery_delay_seconds = stats.msRcvTsbPdDelay * 1e-3;
+}
+#endif
+
 mutex RefCountedGLsync::fence_lock;

diff --git a/nageru/mixer.h b/nageru/mixer.h
index 235dd8da3fba1bf1b9c4325f89c7bf0a6c11b130..af07f8896665044291a281918af5bbd51961cd0a 100644 (file)
--- a/nageru/mixer.h
+++ b/nageru/mixer.h
@@ -445,7 +445,7 @@ private:
                FFMPEG_INPUT,
                CEF_INPUT,
        };
-       void configure_card(unsigned card_index, bmusb::CaptureInterface *capture, CardType card_type, DeckLinkOutput *output, bool override_ffmpeg_to_live = false);
+       void configure_card(unsigned card_index, bmusb::CaptureInterface *capture, CardType card_type, DeckLinkOutput *output, bool is_srt_card = false);
        void set_output_card_internal(int card_index);  // Should only be called from the mixer thread.
        void bm_frame(unsigned card_index, uint16_t timecode,
                bmusb::FrameAllocator::Frame video_frame, size_t video_offset, bmusb::VideoFormat video_format,
@@ -590,6 +590,53 @@ private:
                std::atomic<int64_t> metric_input_frame_rate_nom{-1};
                std::atomic<int64_t> metric_input_frame_rate_den{-1};
                std::atomic<int64_t> metric_input_sample_rate_hz{-1};
+
+               // SRT metrics.
+               std::atomic<double> metric_srt_uptime_seconds{0.0 / 0.0};
+               std::atomic<double> metric_srt_send_duration_seconds{0.0 / 0.0};
+               std::atomic<int64_t> metric_srt_sent_bytes{-1};
+               std::atomic<int64_t> metric_srt_received_bytes{-1};
+               std::atomic<int64_t> metric_srt_sent_packets_normal{-1};
+               std::atomic<int64_t> metric_srt_received_packets_normal{-1};
+               std::atomic<int64_t> metric_srt_sent_packets_lost{-1};
+               std::atomic<int64_t> metric_srt_received_packets_lost{-1};
+               std::atomic<int64_t> metric_srt_sent_packets_retransmitted{-1};
+               std::atomic<int64_t> metric_srt_sent_bytes_retransmitted{-1};
+               std::atomic<int64_t> metric_srt_sent_packets_ack{-1};
+               std::atomic<int64_t> metric_srt_received_packets_ack{-1};
+               std::atomic<int64_t> metric_srt_sent_packets_nak{-1};
+               std::atomic<int64_t> metric_srt_received_packets_nak{-1};
+               std::atomic<int64_t> metric_srt_sent_packets_dropped{-1};
+               std::atomic<int64_t> metric_srt_received_packets_dropped{-1};
+               std::atomic<int64_t> metric_srt_sent_bytes_dropped{-1};
+               std::atomic<int64_t> metric_srt_received_bytes_dropped{-1};
+               std::atomic<int64_t> metric_srt_received_packets_undecryptable{-1};
+               std::atomic<int64_t> metric_srt_received_bytes_undecryptable{-1};
+
+               std::atomic<int64_t> metric_srt_filter_received_extra_packets{-1};
+               std::atomic<int64_t> metric_srt_filter_received_rebuilt_packets{-1};
+               std::atomic<int64_t> metric_srt_filter_received_lost_packets{-1};
+
+               std::atomic<double> metric_srt_packet_sending_period_seconds{0.0 / 0.0};
+               std::atomic<int64_t> metric_srt_flow_window_packets{-1};
+               std::atomic<int64_t> metric_srt_congestion_window_packets{-1};
+               std::atomic<int64_t> metric_srt_flight_size_packets{-1};
+               std::atomic<double> metric_srt_rtt_seconds{0.0 / 0.0};
+               std::atomic<double> metric_srt_estimated_bandwidth_bits_per_second{0.0 / 0.0};
+               std::atomic<double> metric_srt_bandwidth_ceiling_bits_per_second{0.0 / 0.0};
+               std::atomic<int64_t> metric_srt_send_buffer_available_bytes{-1};
+               std::atomic<int64_t> metric_srt_receive_buffer_available_bytes{-1};
+               std::atomic<int64_t> metric_srt_mss_bytes{-1};
+               std::atomic<int64_t> metric_srt_sender_unacked_packets{-1};
+               std::atomic<int64_t> metric_srt_sender_unacked_bytes{-1};
+               std::atomic<double> metric_srt_sender_unacked_timespan_seconds{0.0 / 0.0};
+               std::atomic<double> metric_srt_sender_delivery_delay_seconds{0.0 / 0.0};
+               std::atomic<int64_t> metric_srt_receiver_unacked_packets{-1};
+               std::atomic<int64_t> metric_srt_receiver_unacked_bytes{-1};
+               std::atomic<double> metric_srt_receiver_unacked_timespan_seconds{0.0 / 0.0};
+               std::atomic<double> metric_srt_receiver_delivery_delay_seconds{0.0 / 0.0};
+               std::atomic<int64_t> metric_srt_filter_sent_packets{-1};
+
        };
        JitterHistory output_jitter_history;
        CaptureCard cards[MAX_VIDEO_CARDS];  // Protected by <card_mutex>.
@@ -606,6 +653,10 @@ private:
        };
        OutputFrameInfo get_one_frame_from_each_card(unsigned master_card_index, bool master_card_is_output, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS], std::vector<int32_t> raw_audio[MAX_VIDEO_CARDS]);
 
+#ifdef HAVE_SRT
+       void update_srt_stats(int srt_sock, Mixer::CaptureCard *card);
+#endif
+
        InputState input_state;
 
        // Cards we have been noticed about being hotplugged, but haven't tried adding yet.

diff --git a/shared/metrics.cpp b/shared/metrics.cpp
index 248da38a277992289e9ae703bd1442f16ce077e5..91b03e83483e1335d85d747dca730d607ff10438 100644 (file)
--- a/shared/metrics.cpp
+++ b/shared/metrics.cpp
@@ -106,6 +106,23 @@ void Metrics::remove(const string &name, const vector<pair<string, string>> &lab
        metrics.erase(it);
 }
 
+void Metrics::remove_if_exists(const string &name, const vector<pair<string, string>> &labels)
+{
+       lock_guard<mutex> lock(mu);
+       auto it = metrics.find(MetricKey(name, labels));
+       if (it == metrics.end()) {
+               return;
+       }
+
+       // If this is the last metric with this name, remove the type as well.
+       if (!((it != metrics.begin() && prev(it)->first.name == name) ||
+             (it != metrics.end() && next(it) != metrics.end() && next(it)->first.name == name))) {
+               types.erase(name);
+       }
+
+       metrics.erase(it);
+}
+
 string Metrics::serialize() const
 {
        stringstream ss;

diff --git a/shared/metrics.h b/shared/metrics.h
index 1f130c981ba65684d77b44c627832a3b93d1be40..858853f8c0ce976bd07997a7725a5554109cb3c5 100644 (file)
--- a/shared/metrics.h
+++ b/shared/metrics.h
@@ -75,6 +75,8 @@ public:
 
        void remove(const std::string &name, const std::vector<std::pair<std::string, std::string>> &labels);
 
+       void remove_if_exists(const std::string &name, const std::vector<std::pair<std::string, std::string>> &labels);
+
        std::string serialize() const;
 
 private: