X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.cpp;h=a5206c9b3ea48edf27c9d8db2462a8933465927f;hb=1a7e004368f4f5221e91bf53e17a8c0f7e1ceeb8;hp=915ae0eb7b9bb988cd5de06fa50ed4f951c5726d;hpb=4df45e479ddbc8e2247be8aab7f2bab5ddaa1b74;p=nageru diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp index 915ae0e..a5206c9 100644 --- a/nageru/mixer.cpp +++ b/nageru/mixer.cpp @@ -48,6 +48,7 @@ #include "image_input.h" #include "input_mapping.h" #include "shared/metrics.h" +#include "shared/va_display.h" #include "mjpeg_encoder.h" #include "pbo_frame_allocator.h" #include "shared/ref_counted_gl_sync.h" @@ -55,7 +56,6 @@ #include "shared/timebase.h" #include "timecode_renderer.h" #include "v210_converter.h" -#include "va_display_with_cleanup.h" #include "video_encoder.h" #undef Status @@ -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); @@ -559,6 +559,9 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT } card->capture.reset(capture); card->is_fake_capture = (card_type == CardType::FAKE_CAPTURE); + if (card->is_fake_capture) { + card->fake_capture_counter = fake_capture_counter++; + } card->is_cef_capture = (card_type == CardType::CEF_INPUT); card->may_have_dropped_last_frame = false; card->type = card_type; @@ -601,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}; @@ -620,21 +623,87 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT const vector> &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> 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. @@ -651,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"); @@ -676,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> 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; } @@ -870,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(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); @@ -1366,7 +1514,7 @@ start: // This might get off by a fractional sample when changing master card // between ones with different frame rates, but that's fine. - int num_samples_times_timebase = OUTPUT_FREQUENCY * output_frame_info.frame_duration + fractional_samples; + int64_t num_samples_times_timebase = int64_t(OUTPUT_FREQUENCY) * output_frame_info.frame_duration + fractional_samples; output_frame_info.num_samples = num_samples_times_timebase / TIMEBASE; fractional_samples = num_samples_times_timebase % TIMEBASE; assert(output_frame_info.num_samples >= 0); @@ -1428,22 +1576,35 @@ void Mixer::handle_hotplugged_cards() #ifdef HAVE_SRT // Same, for SRT inputs. // TODO: On disconnect and reconnect, we might want to use the stream ID - // to find the slot it used to go into? for (SRTSOCKET sock : hotplugged_srt_cards_copy) { - // Look for a fake capture card where we can stick this in. - int free_card_index = -1; - for (unsigned card_index = 0; card_index < num_cards; ++card_index) { - if (cards[card_index].is_fake_capture) { - free_card_index = card_index; - break; - } - } - char name[256]; int namelen = sizeof(name); srt_getsockopt(sock, /*ignored=*/0, SRTO_STREAMID, name, &namelen); string stream_id(name, namelen); + // Look for a fake capture card where we can stick this in. + // Prioritize ones that previously held SRT streams with the + // same stream ID, if any exist -- and it multiple exist, + // take the one that disconnected the last. + int first_free_card_index = -1, last_matching_free_card_index = -1; + for (unsigned card_index = 0; card_index < num_cards; ++card_index) { + CaptureCard *card = &cards[card_index]; + if (!card->is_fake_capture) { + continue; + } + if (first_free_card_index == -1) { + first_free_card_index = card_index; + } + if (card->last_srt_stream_id == stream_id && + (last_matching_free_card_index == -1 || + card->fake_capture_counter > + cards[last_matching_free_card_index].fake_capture_counter)) { + last_matching_free_card_index = card_index; + } + } + + const int free_card_index = (last_matching_free_card_index != -1) + ? last_matching_free_card_index : first_free_card_index; if (free_card_index == -1) { if (stream_id.empty()) { stream_id = "no name"; @@ -1461,6 +1622,8 @@ 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)); capture->start_bm_capture(); @@ -1949,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;