X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.cpp;h=5de75c6db2d826c66bbd050e819362d7ca5eeac9;hb=refs%2Fheads%2Fkaeru-cef-overlay-hack;hp=c6f126fc6682ef78fa23757205a4ceaff0a36526;hpb=c9f0f678e20f095885b08ee2c55e356ba777b197;p=nageru diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp index c6f126f..5de75c6 100644 --- a/nageru/mixer.cpp +++ b/nageru/mixer.cpp @@ -41,6 +41,7 @@ #include "shared/context.h" #include "decklink_capture.h" #include "decklink_output.h" +#include "decklink_util.h" #include "defs.h" #include "shared/disk_space_estimator.h" #include "ffmpeg_capture.h" @@ -233,6 +234,16 @@ void JitterHistory::unregister_metrics(const vector> &label void JitterHistory::frame_arrived(steady_clock::time_point now, int64_t frame_duration, size_t dropped_frames) { + if (frame_duration != last_duration) { + // If the frame rate changed, the input clock is also going to change, + // so our historical data doesn't make much sense anymore. + // Also, format changes typically introduce blips that are not representative + // of the typical frame stream. (We make the assumption that format changes + // don't happen all the time in regular use; if they did, we should probably + // rather keep the history so that we take jitter they may introduce into account.) + clear(); + last_duration = frame_duration; + } if (expected_timestamp > steady_clock::time_point::min()) { expected_timestamp += dropped_frames * nanoseconds(frame_duration * 1000000000 / TIMEBASE); double jitter_seconds = fabs(duration(expected_timestamp - now).count()); @@ -276,7 +287,7 @@ void QueueLengthPolicy::unregister_metrics(const vector> &l } void QueueLengthPolicy::update_policy(steady_clock::time_point now, - steady_clock::time_point expected_next_frame, + steady_clock::time_point expected_next_input_frame, int64_t input_frame_duration, int64_t master_frame_duration, double max_input_card_jitter_seconds, @@ -287,7 +298,7 @@ void QueueLengthPolicy::update_policy(steady_clock::time_point now, // Figure out when we can expect the next frame for this card, assuming // worst-case jitter (ie., the frame is maximally late). - double seconds_until_next_frame = max(duration(expected_next_frame - now).count() + max_input_card_jitter_seconds, 0.0); + double seconds_until_next_frame = max(duration(expected_next_input_frame - now).count() + max_input_card_jitter_seconds, 0.0); // How many times are the master card expected to tick in that time? // We assume the master clock has worst-case jitter but not any rate @@ -410,9 +421,15 @@ Mixer::Mixer(const QSurfaceFormat &format) break; } + if (!decklink_card_is_active(decklink, card_index)) { + fprintf(stderr, "DeckLink card %u is inactive in current profile, skipping (try changing it in Desktop Video Setup)\n", card_index); + decklink->Release(); + continue; + } + DeckLinkCapture *capture = new DeckLinkCapture(decklink, card_index); DeckLinkOutput *output = new DeckLinkOutput(resource_pool.get(), decklink_output_surface, global_flags.width, global_flags.height, card_index); - if (!output->set_device(decklink)) { + if (!output->set_device(decklink, capture->get_input())) { delete output; output = nullptr; } @@ -492,10 +509,6 @@ Mixer::Mixer(const QSurfaceFormat &format) } #endif - for (unsigned card_index = 0; card_index < MAX_VIDEO_CARDS; ++card_index) { - cards[card_index].queue_length_policy.reset(card_index); - } - chroma_subsampler.reset(new ChromaSubsampler(resource_pool.get())); if (global_flags.ten_bit_input) { @@ -530,6 +543,7 @@ Mixer::Mixer(const QSurfaceFormat &format) if (global_flags.enable_alsa_output) { alsa.reset(new ALSAOutput(OUTPUT_FREQUENCY, /*num_channels=*/2)); } + output_card_is_master = global_flags.output_card_is_master; if (global_flags.output_card != -1) { desired_output_card_index = global_flags.output_card; set_output_card_internal(global_flags.output_card); @@ -883,10 +897,10 @@ void Mixer::set_output_card_internal(int card_index) card->parked_capture = move(card->capture); CaptureInterface *fake_capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio); configure_card(card_index, fake_capture, CardType::FAKE_CAPTURE, card->output.release(), /*is_srt_card=*/false); - card->queue_length_policy.reset(card_index); + card->jitter_history.clear(); card->capture->start_bm_capture(); desired_output_video_mode = output_video_mode = card->output->pick_video_mode(desired_output_video_mode); - card->output->start_output(desired_output_video_mode, pts_int); + card->output->start_output(desired_output_video_mode, pts_int, /*is_master_card=*/output_card_is_master); } output_card_index = card_index; output_jitter_history.clear(); @@ -1273,7 +1287,12 @@ void Mixer::thread_func() DeckLinkOutput *output = cards[output_card_index].output.get(); output->end_output(); desired_output_video_mode = output_video_mode = output->pick_video_mode(desired_output_video_mode); - output->start_output(desired_output_video_mode, pts_int); + output->start_output(desired_output_video_mode, pts_int, /*is_master_card=*/output_card_is_master); + } + + { + lock_guard lock(card_mutex); + handle_hotplugged_cards(); } CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS]; @@ -1281,7 +1300,7 @@ void Mixer::thread_func() bool master_card_is_output; unsigned master_card_index; - if (output_card_index != -1) { + if (output_card_index != -1 && output_card_is_master) { master_card_is_output = true; master_card_index = output_card_index; } else { @@ -1290,11 +1309,6 @@ void Mixer::thread_func() assert(master_card_index < MAX_VIDEO_CARDS); } - { - lock_guard lock(card_mutex); - handle_hotplugged_cards(); - } - vector raw_audio[MAX_VIDEO_CARDS]; // For MJPEG encoding. OutputFrameInfo output_frame_info = get_one_frame_from_each_card(master_card_index, master_card_is_output, new_frames, has_new_frame, raw_audio); schedule_audio_resampling_tasks(output_frame_info.dropped_frames, output_frame_info.num_samples, output_frame_info.frame_duration, output_frame_info.is_preroll, output_frame_info.frame_timestamp); @@ -1393,7 +1407,7 @@ void Mixer::thread_func() bool Mixer::input_card_is_master_clock(unsigned card_index, unsigned master_card_index) const { - if (output_card_index != -1) { + if (output_card_index != -1 && output_card_is_master) { // The output card (ie., cards[output_card_index].output) is the master clock, // so no input card (ie., cards[card_index].capture) is. return false; @@ -1471,7 +1485,7 @@ pair Mixer::get_channel_color_http(unsigned channel_idx) Mixer::OutputFrameInfo Mixer::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], vector raw_audio[MAX_VIDEO_CARDS]) { OutputFrameInfo output_frame_info; - constexpr steady_clock::duration master_card_timeout = milliseconds(100); + constexpr steady_clock::duration master_card_timeout = milliseconds(200); start: unique_lock lock(card_mutex, defer_lock); bool timed_out = false; @@ -1485,18 +1499,20 @@ start: lock.lock(); timed_out = !cards[master_card_index].new_frames_changed.wait_for(lock, master_card_timeout, - [this, master_card_index]{ + [this, master_card_index] { return !cards[master_card_index].new_frames.empty() || + cards[master_card_index].capture == nullptr || cards[master_card_index].capture->get_disconnected(); }); if (timed_out) { - fprintf(stderr, "WARNING: Master card (%s) did not deliver a frame for 100 ms, creating a fake one.\n", - description_for_card(master_card_index).c_str()); + fprintf(stderr, "WARNING: Master card (%s) did not deliver a frame for %u ms, creating a fake one.\n", + description_for_card(master_card_index).c_str(), + unsigned(duration_cast(master_card_timeout).count())); } } if (timed_out) { - // The master card stalled for 100 ms (possible when it's e.g. + // The master card stalled for 200 ms (possible when it's e.g. // an SRT card). Send a frame no matter what; this also makes sure // any other cards get to empty their queues, and in general, // that we make _some_ sort of forward progress. @@ -1506,7 +1522,8 @@ start: } else if (cards[master_card_index].new_frames.empty()) { // We were woken up, but not due to a new frame. Deal with it // and then restart. - assert(cards[master_card_index].capture->get_disconnected()); + assert(cards[master_card_index].capture == nullptr || + cards[master_card_index].capture->get_disconnected()); handle_hotplugged_cards(); lock.unlock(); goto start; @@ -1593,11 +1610,23 @@ void Mixer::handle_hotplugged_cards() for (unsigned card_index = 0; card_index < MAX_VIDEO_CARDS; ++card_index) { CaptureCard *card = &cards[card_index]; if (card->capture != nullptr && card->capture->get_disconnected()) { - fprintf(stderr, "Card %u went away, replacing with a fake card.\n", card_index); - FakeCapture *capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio); - configure_card(card_index, capture, CardType::FAKE_CAPTURE, /*output=*/nullptr, /*is_srt_card=*/false); - card->queue_length_policy.reset(card_index); - card->capture->start_bm_capture(); + bool is_active = card_index < unsigned(global_flags.min_num_cards) || cards[card_index].force_active; + if (is_active) { + fprintf(stderr, "Card %u went away, replacing with a fake card.\n", card_index); + FakeCapture *capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio); + configure_card(card_index, capture, CardType::FAKE_CAPTURE, /*output=*/nullptr, /*is_srt_card=*/false); + card->jitter_history.clear(); + card->capture->start_bm_capture(); + } else { + // NOTE: The theme might end up forcing the card back at some later point + // (ie., force_active is false now, but might immediately be true again on + // e.g. the next frame). That should be rare, though, so we don't bother + // adjusting the message. + fprintf(stderr, "Card %u went away, removing. (To keep a fake card, increase --num-cards.)\n", card_index); + theme->remove_card(card_index); + configure_card(card_index, /*capture=*/nullptr, CardType::FAKE_CAPTURE, /*output=*/nullptr, /*is_srt_card=*/false); + card->jitter_history.clear(); + } } } @@ -1643,7 +1672,7 @@ void Mixer::handle_hotplugged_cards() CaptureCard *card = &cards[free_card_index]; BMUSBCapture *capture = new BMUSBCapture(free_card_index, new_dev); configure_card(free_card_index, capture, CardType::LIVE_CARD, /*output=*/nullptr, /*is_srt_card=*/false); - card->queue_length_policy.reset(free_card_index); + card->jitter_history.clear(); capture->set_card_disconnected_callback(bind(&Mixer::bm_hotplug_remove, this, free_card_index)); capture->start_bm_capture(); } @@ -1699,7 +1728,7 @@ void Mixer::handle_hotplugged_cards() configure_card(free_card_index, capture, CardType::FFMPEG_INPUT, /*output=*/nullptr, /*is_srt_card=*/true); update_srt_stats(sock, card); // Initial zero stats. card->last_srt_stream_id = stream_id; - card->queue_length_policy.reset(free_card_index); + card->jitter_history.clear(); capture->set_card_disconnected_callback(bind(&Mixer::bm_hotplug_remove, this, free_card_index)); capture->start_bm_capture(); } @@ -1712,7 +1741,7 @@ void Mixer::handle_hotplugged_cards() if (card->capture == nullptr && card->force_active) { FakeCapture *capture = new FakeCapture(global_flags.width, global_flags.height, FAKE_FPS, OUTPUT_FREQUENCY, card_index, global_flags.fake_cards_audio); configure_card(card_index, capture, CardType::FAKE_CAPTURE, /*output=*/nullptr, /*is_srt_card=*/false); - card->queue_length_policy.reset(card_index); + card->jitter_history.clear(); card->capture->start_bm_capture(); } } @@ -1958,7 +1987,7 @@ void Mixer::quit() if (global_flags.srt_port >= 0) { // There's seemingly no other reasonable way to wake up the thread // (libsrt's epoll equivalent is busy-waiting). - int sock = srt_socket(AF_INET6, 0, 0); + int sock = srt_create_socket(); if (sock != -1) { sockaddr_in6 addr; memset(&addr, 0, sizeof(addr)); @@ -2167,7 +2196,7 @@ void Mixer::OutputChannel::set_color_updated_callback(Mixer::color_updated_callb #ifdef HAVE_SRT void Mixer::start_srt() { - SRTSOCKET sock = srt_socket(AF_INET6, 0, 0); + SRTSOCKET sock = srt_create_socket(); sockaddr_in6 addr; memset(&addr, 0, sizeof(addr)); addr.sin6_family = AF_INET6;