X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=f45880d321be6d2a1c17c5a61b7ba0babc28e846;hb=fa54f2630c56a1df0046923d6a77b1bd58abf240;hp=9c07dc5002b09c6d9cf6b99648e889c0c9b93b37;hpb=ece2a997307401c1d960c64dc738097cd72b2b7e;p=nageru diff --git a/mixer.cpp b/mixer.cpp index 9c07dc5..f45880d 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -31,6 +30,7 @@ #include "DeckLinkAPI.h" #include "LinuxCOM.h" #include "alsa_output.h" +#include "basic_stats.h" #include "bmusb/bmusb.h" #include "bmusb/fake_capture.h" #include "chroma_subsampler.h" @@ -61,7 +61,6 @@ using namespace std::placeholders; using namespace bmusb; Mixer *global_mixer = nullptr; -bool uses_mlock = false; namespace { @@ -256,10 +255,12 @@ void QueueLengthPolicy::unregister_metrics(const vector> &l void QueueLengthPolicy::update_policy(steady_clock::time_point now, steady_clock::time_point expected_next_frame, + int64_t input_frame_duration, int64_t master_frame_duration, double max_input_card_jitter_seconds, double max_master_card_jitter_seconds) { + double input_frame_duration_seconds = input_frame_duration / double(TIMEBASE); double master_frame_duration_seconds = master_frame_duration / double(TIMEBASE); // Figure out when we can expect the next frame for this card, assuming @@ -279,8 +280,8 @@ void QueueLengthPolicy::update_policy(steady_clock::time_point now, // We account for this by looking at the situation five frames ahead, // assuming everything else is the same. double frames_allowed; - if (max_master_card_jitter_seconds < max_input_card_jitter_seconds) { - frames_allowed = frames_needed + 5 * (max_input_card_jitter_seconds - max_master_card_jitter_seconds) / master_frame_duration_seconds; + if (master_frame_duration < input_frame_duration) { + frames_allowed = frames_needed + 5 * (input_frame_duration_seconds - master_frame_duration_seconds) / master_frame_duration_seconds; } else { frames_allowed = frames_needed; } @@ -352,7 +353,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) theme.reset(new Theme(global_flags.theme_filename, global_flags.theme_dirs, resource_pool.get(), num_cards)); // Start listening for clients only once VideoEncoder has written its header, if any. - httpd.start(9095); + httpd.start(global_flags.http_port); // First try initializing the then PCI devices, then USB, then // fill up with fake cards until we have the desired number of cards. @@ -370,7 +371,10 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) 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); - output->set_device(decklink); + if (!output->set_device(decklink)) { + delete output; + output = nullptr; + } configure_card(card_index, capture, CardType::LIVE_CARD, output); ++num_pci_devices; } @@ -458,14 +462,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) set_output_card_internal(global_flags.output_card); } - metric_start_time_seconds = get_timestamp_for_metrics(); - output_jitter_history.register_metrics({{ "card", "output" }}); - global_metrics.add("frames_output_total", &metric_frames_output_total); - global_metrics.add("frames_output_dropped", &metric_frames_output_dropped); - global_metrics.add("start_time_seconds", &metric_start_time_seconds, Metrics::TYPE_GAUGE); - global_metrics.add("memory_used_bytes", &metrics_memory_used_bytes); - global_metrics.add("memory_locked_limit_bytes", &metrics_memory_locked_limit_bytes); } Mixer::~Mixer() @@ -729,7 +726,9 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, } while (!success); } - audio_mixer.add_audio(device, audio_frame.data + audio_offset, num_samples, audio_format, frame_length, audio_frame.received_timestamp); + if (num_samples > 0) { + audio_mixer.add_audio(device, audio_frame.data + audio_offset, num_samples, audio_format, frame_length, audio_frame.received_timestamp); + } // Done with the audio, so release it. if (audio_frame.owner) { @@ -943,9 +942,7 @@ void Mixer::thread_func() } } - steady_clock::time_point start, now; - start = steady_clock::now(); - + BasicStats basic_stats(/*verbose=*/true); int stats_dropped_frames = 0; while (!should_quit) { @@ -1022,54 +1019,8 @@ void Mixer::thread_func() ++frame_num; pts_int += frame_duration; - now = steady_clock::now(); - double elapsed = duration(now - start).count(); - - metric_frames_output_total = frame_num; - metric_frames_output_dropped = stats_dropped_frames; - - if (frame_num % 100 == 0) { - printf("%d frames (%d dropped) in %.3f seconds = %.1f fps (%.1f ms/frame)", - frame_num, stats_dropped_frames, elapsed, frame_num / elapsed, - 1e3 * elapsed / frame_num); - // chain->print_phase_timing(); - - // Check our memory usage, to see if we are close to our mlockall() - // limit (if at all set). - rusage used; - if (getrusage(RUSAGE_SELF, &used) == -1) { - perror("getrusage(RUSAGE_SELF)"); - assert(false); - } - - if (uses_mlock) { - rlimit limit; - if (getrlimit(RLIMIT_MEMLOCK, &limit) == -1) { - perror("getrlimit(RLIMIT_MEMLOCK)"); - assert(false); - } - - if (limit.rlim_cur == 0) { - printf(", using %ld MB memory (locked)", - long(used.ru_maxrss / 1024)); - } else { - printf(", using %ld / %ld MB lockable memory (%.1f%%)", - long(used.ru_maxrss / 1024), - long(limit.rlim_cur / 1048576), - float(100.0 * (used.ru_maxrss * 1024.0) / limit.rlim_cur)); - } - metrics_memory_locked_limit_bytes = limit.rlim_cur; - } else { - printf(", using %ld MB memory (not locked)", - long(used.ru_maxrss / 1024)); - metrics_memory_locked_limit_bytes = 0.0 / 0.0; - } - - printf("\n"); - - metrics_memory_used_bytes = used.ru_maxrss * 1024; - } - + basic_stats.update(frame_num, stats_dropped_frames); + // if (frame_num % 100 == 0) chain->print_phase_timing(); if (should_cut.exchange(false)) { // Test and clear. video_encoder->do_cut(frame_num); @@ -1204,6 +1155,7 @@ start: card->queue_length_policy.update_policy( output_frame_info.frame_timestamp, card->jitter_history.get_expected_next_frame(), + new_frames[master_card_index].length, output_frame_info.frame_duration, card->jitter_history.estimate_max_jitter(), output_jitter_history.estimate_max_jitter());