]> git.sesse.net Git - nageru/blobdiff - nageru/mixer.cpp
Move texture uploading out of a lambda.
[nageru] / nageru / mixer.cpp
index 915ae0eb7b9bb988cd5de06fa50ed4f951c5726d..3f5119a43d74c7de00a58d1152290315837e77b8 100644 (file)
@@ -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<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.
@@ -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<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;
 }
 
@@ -870,8 +1010,16 @@ 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 y_offset, cbcr_offset;
        size_t expected_length = video_format.stride * (video_format.height + video_format.extra_lines_top + video_format.extra_lines_bottom);
        if (userdata != nullptr && userdata->pixel_format == PixelFormat_8BitYCbCrPlanar) {
                // The calculation above is wrong for planar Y'CbCr, so just override it.
@@ -880,16 +1028,12 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                expected_length = video_frame.len;
 
                userdata->ycbcr_format = (static_cast<FFmpegCapture *>(card->capture.get()))->get_current_frame_ycbcr_format();
-               cbcr_width = video_format.width / userdata->ycbcr_format.chroma_subsampling_x;
-               cbcr_height = video_format.height / userdata->ycbcr_format.chroma_subsampling_y;
-               cbcr_offset = video_format.width * video_format.height;
                y_offset = 0;
+               cbcr_offset = video_format.width * video_format.height;
        } else {
                // All the other Y'CbCr formats are 4:2:2.
-               cbcr_width = video_format.width / 2;
-               cbcr_height = video_format.height;
-               cbcr_offset = video_offset / 2;
                y_offset = video_frame.size / 2 + video_offset / 2;
+               cbcr_offset = video_offset / 2;
        }
        if (video_frame.len - video_offset == 0 ||
            video_frame.len - video_offset != expected_length) {
@@ -920,19 +1064,14 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 
        unsigned num_fields = video_format.interlaced ? 2 : 1;
        steady_clock::time_point frame_upload_start;
-       bool interlaced_stride = false;
        if (video_format.interlaced) {
                // Send the two fields along as separate frames; the other side will need to add
                // a deinterlacer to actually get this right.
                assert(video_format.height % 2 == 0);
                video_format.height /= 2;
-               cbcr_height /= 2;
                assert(frame_length % 2 == 0);
                frame_length /= 2;
                num_fields = 2;
-               if (video_format.second_field_start == 1) {
-                       interlaced_stride = true;
-               }
                frame_upload_start = steady_clock::now();
        }
        assert(userdata != nullptr);
@@ -943,79 +1082,15 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
        userdata->last_frame_rate_den = video_format.frame_rate_den;
        RefCountedFrame frame(video_frame);
 
-       // Upload the textures.
+       // Send the frames on to the main thread, which will upload and process htem.
+       // It is entirely possible to upload them in the same thread (and it might even be
+       // faster, depending on the GPU and driver), but it appears to be trickling
+       // driver bugs very easily.
+       //
+       // Note that this means we must hold on to the actual frame data in <userdata>
+       // until the upload is done, but we hold on to <frame> much longer than that
+       // (in fact, all the way until we no longer use the texture in rendering).
        for (unsigned field = 0; field < num_fields; ++field) {
-               // Put the actual texture upload in a lambda that is executed in the main thread.
-               // It is entirely possible to do this in the same thread (and it might even be
-               // faster, depending on the GPU and driver), but it appears to be trickling
-               // driver bugs very easily.
-               //
-               // Note that this means we must hold on to the actual frame data in <userdata>
-               // until the upload command is run, but we hold on to <frame> much longer than that
-               // (in fact, all the way until we no longer use the texture in rendering).
-               auto upload_func = [this, field, video_format, y_offset, video_offset, cbcr_offset, cbcr_width, cbcr_height, interlaced_stride, userdata]() {
-                       unsigned field_start_line;
-                       if (field == 1) {
-                               field_start_line = video_format.second_field_start;
-                       } else {
-                               field_start_line = video_format.extra_lines_top;
-                       }
-
-                       // For anything not FRAME_FORMAT_YCBCR_10BIT, v210_width will be nonsensical but not used.
-                       size_t v210_width = video_format.stride / sizeof(uint32_t);
-                       ensure_texture_resolution(userdata, field, video_format.width, video_format.height, cbcr_width, cbcr_height, v210_width);
-
-                       glBindBuffer(GL_PIXEL_UNPACK_BUFFER, userdata->pbo);
-                       check_error();
-
-                       switch (userdata->pixel_format) {
-                       case PixelFormat_10BitYCbCr: {
-                               size_t field_start = video_offset + video_format.stride * field_start_line;
-                               upload_texture(userdata->tex_v210[field], v210_width, video_format.height, video_format.stride, interlaced_stride, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, field_start);
-                               v210_converter->convert(userdata->tex_v210[field], userdata->tex_444[field], video_format.width, video_format.height);
-                               break;
-                       }
-                       case PixelFormat_8BitYCbCr: {
-                               size_t field_y_start = y_offset + video_format.width * field_start_line;
-                               size_t field_cbcr_start = cbcr_offset + cbcr_width * field_start_line * sizeof(uint16_t);
-
-                               // Make up our own strides, since we are interleaving.
-                               upload_texture(userdata->tex_y[field], video_format.width, video_format.height, video_format.width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_y_start);
-                               upload_texture(userdata->tex_cbcr[field], cbcr_width, cbcr_height, cbcr_width * sizeof(uint16_t), interlaced_stride, GL_RG, GL_UNSIGNED_BYTE, field_cbcr_start);
-                               break;
-                       }
-                       case PixelFormat_8BitYCbCrPlanar: {
-                               assert(field_start_line == 0);  // We don't really support interlaced here.
-                               size_t field_y_start = y_offset;
-                               size_t field_cb_start = cbcr_offset;
-                               size_t field_cr_start = cbcr_offset + cbcr_width * cbcr_height;
-
-                               // Make up our own strides, since we are interleaving.
-                               upload_texture(userdata->tex_y[field], video_format.width, video_format.height, video_format.width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_y_start);
-                               upload_texture(userdata->tex_cb[field], cbcr_width, cbcr_height, cbcr_width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_cb_start);
-                               upload_texture(userdata->tex_cr[field], cbcr_width, cbcr_height, cbcr_width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_cr_start);
-                               break;
-                       }
-                       case PixelFormat_8BitBGRA: {
-                               size_t field_start = video_offset + video_format.stride * field_start_line;
-                               upload_texture(userdata->tex_rgba[field], video_format.width, video_format.height, video_format.stride, interlaced_stride, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, field_start);
-                               // These could be asked to deliver mipmaps at any time.
-                               glBindTexture(GL_TEXTURE_2D, userdata->tex_rgba[field]);
-                               check_error();
-                               glGenerateMipmap(GL_TEXTURE_2D);
-                               check_error();
-                               glBindTexture(GL_TEXTURE_2D, 0);
-                               check_error();
-                               break;
-                       }
-                       default:
-                               assert(false);
-                       }
-
-                       glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-                       check_error();
-               };
-
                if (field == 1) {
                        // Don't upload the second field as fast as we can; wait until
                        // the field time has approximately passed. (Otherwise, we could
@@ -1035,12 +1110,13 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                        new_frame.length = frame_length;
                        new_frame.field = field;
                        new_frame.interlaced = video_format.interlaced;
-                       new_frame.upload_func = upload_func;
                        new_frame.dropped_frames = dropped_frames;
                        new_frame.received_timestamp = video_frame.received_timestamp;  // Ignore the audio timestamp.
                        new_frame.video_format = video_format;
+                       new_frame.video_offset = video_offset;
                        new_frame.y_offset = y_offset;
                        new_frame.cbcr_offset = cbcr_offset;
+                       new_frame.texture_uploaded = false;
                        if (card->type == CardType::FFMPEG_INPUT) {
                                FFmpegCapture *ffmpeg_capture = static_cast<FFmpegCapture *>(card->capture.get());
                                new_frame.neutral_color = ffmpeg_capture->get_last_neutral_color();
@@ -1053,6 +1129,87 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
        }
 }
 
+void Mixer::upload_texture_for_frame(
+       int field, bmusb::VideoFormat video_format,
+       size_t y_offset, size_t cbcr_offset, size_t video_offset, PBOFrameAllocator::Userdata *userdata)
+{
+       size_t cbcr_width, cbcr_height;
+       if (userdata != nullptr && userdata->pixel_format == PixelFormat_8BitYCbCrPlanar) {
+               cbcr_width = video_format.width / userdata->ycbcr_format.chroma_subsampling_x;
+               cbcr_height = video_format.height / userdata->ycbcr_format.chroma_subsampling_y;
+       } else {
+               // All the other Y'CbCr formats are 4:2:2.
+               cbcr_width = video_format.width / 2;
+               cbcr_height = video_format.height;
+       }
+
+       bool interlaced_stride = video_format.interlaced && (video_format.second_field_start == 1);
+       if (video_format.interlaced) {
+               cbcr_height /= 2;
+       }
+
+       unsigned field_start_line;
+       if (field == 1) {
+               field_start_line = video_format.second_field_start;
+       } else {
+               field_start_line = video_format.extra_lines_top;
+       }
+
+       // For anything not FRAME_FORMAT_YCBCR_10BIT, v210_width will be nonsensical but not used.
+       size_t v210_width = video_format.stride / sizeof(uint32_t);
+       ensure_texture_resolution(userdata, field, video_format.width, video_format.height, cbcr_width, cbcr_height, v210_width);
+
+       glBindBuffer(GL_PIXEL_UNPACK_BUFFER, userdata->pbo);
+       check_error();
+
+       switch (userdata->pixel_format) {
+               case PixelFormat_10BitYCbCr: {
+                       size_t field_start = video_offset + video_format.stride * field_start_line;
+                       upload_texture(userdata->tex_v210[field], v210_width, video_format.height, video_format.stride, interlaced_stride, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, field_start);
+                       v210_converter->convert(userdata->tex_v210[field], userdata->tex_444[field], video_format.width, video_format.height);
+                       break;
+               }
+               case PixelFormat_8BitYCbCr: {
+                       size_t field_y_start = y_offset + video_format.width * field_start_line;
+                       size_t field_cbcr_start = cbcr_offset + cbcr_width * field_start_line * sizeof(uint16_t);
+
+                       // Make up our own strides, since we are interleaving.
+                       upload_texture(userdata->tex_y[field], video_format.width, video_format.height, video_format.width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_y_start);
+                       upload_texture(userdata->tex_cbcr[field], cbcr_width, cbcr_height, cbcr_width * sizeof(uint16_t), interlaced_stride, GL_RG, GL_UNSIGNED_BYTE, field_cbcr_start);
+                       break;
+               }
+               case PixelFormat_8BitYCbCrPlanar: {
+                       assert(field_start_line == 0);  // We don't really support interlaced here.
+                       size_t field_y_start = y_offset;
+                       size_t field_cb_start = cbcr_offset;
+                       size_t field_cr_start = cbcr_offset + cbcr_width * cbcr_height;
+
+                       // Make up our own strides, since we are interleaving.
+                       upload_texture(userdata->tex_y[field], video_format.width, video_format.height, video_format.width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_y_start);
+                       upload_texture(userdata->tex_cb[field], cbcr_width, cbcr_height, cbcr_width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_cb_start);
+                       upload_texture(userdata->tex_cr[field], cbcr_width, cbcr_height, cbcr_width, interlaced_stride, GL_RED, GL_UNSIGNED_BYTE, field_cr_start);
+                       break;
+               }
+               case PixelFormat_8BitBGRA: {
+                       size_t field_start = video_offset + video_format.stride * field_start_line;
+                       upload_texture(userdata->tex_rgba[field], video_format.width, video_format.height, video_format.stride, interlaced_stride, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, field_start);
+                       // These could be asked to deliver mipmaps at any time.
+                       glBindTexture(GL_TEXTURE_2D, userdata->tex_rgba[field]);
+                       check_error();
+                       glGenerateMipmap(GL_TEXTURE_2D);
+                       check_error();
+                       glBindTexture(GL_TEXTURE_2D, 0);
+                       check_error();
+                       break;
+               }
+               default:
+                       assert(false);
+       }
+
+       glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+       check_error();
+}
+
 void Mixer::bm_hotplug_add(libusb_device *dev)
 {
        lock_guard<mutex> lock(hotplug_mutex);
@@ -1151,9 +1308,10 @@ void Mixer::thread_func()
                        check_error();
 
                        // The new texture might need uploading before use.
-                       if (new_frame->upload_func) {
-                               new_frame->upload_func();
-                               new_frame->upload_func = nullptr;
+                       if (!new_frame->texture_uploaded) {
+                               upload_texture_for_frame(new_frame->field, new_frame->video_format, new_frame->y_offset, new_frame->cbcr_offset,
+                                       new_frame->video_offset, (PBOFrameAllocator::Userdata *)new_frame->frame->userdata);
+                               new_frame->texture_uploaded = true;
                        }
 
                        // Only set the white balance if it actually changed. This means that the user
@@ -1366,7 +1524,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 +1586,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 +1632,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 +2122,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;