X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=9f549e968b7eb173f872d55fc316f7c1982ccc3e;hb=525665b0f6639686dad77785e81f31a5a9d87bc8;hp=421efea9f13a096a16b8460ae42152ead88fa164;hpb=9ba511b7edf9d6875040a0b959d97bd7867ce159;p=nageru diff --git a/mixer.cpp b/mixer.cpp index 421efea..9f549e9 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -42,6 +42,7 @@ #include "ffmpeg_capture.h" #include "flags.h" #include "input_mapping.h" +#include "metrics.h" #include "pbo_frame_allocator.h" #include "ref_counted_gl_sync.h" #include "resampling_queue.h" @@ -197,6 +198,13 @@ void upload_texture(GLuint tex, GLuint width, GLuint height, GLuint stride, bool } // namespace +void QueueLengthPolicy::register_metrics(const vector> &labels) +{ + global_metrics.add("input_queue_length_frames", labels, &metric_input_queue_length_frames, Metrics::TYPE_GAUGE); + global_metrics.add("input_queue_safe_length_frames", labels, &metric_input_queue_safe_length_frames, Metrics::TYPE_GAUGE); + global_metrics.add("input_queue_duped_frames", labels, &metric_input_duped_frames); +} + void QueueLengthPolicy::update_policy(unsigned queue_length) { if (queue_length == 0) { // Starvation. @@ -207,6 +215,9 @@ void QueueLengthPolicy::update_policy(unsigned queue_length) } frames_with_at_least_one = 0; been_at_safe_point_since_last_starvation = false; + ++metric_input_duped_frames; + metric_input_queue_safe_length_frames = safe_queue_length; + metric_input_queue_length_frames = 0; return; } if (queue_length >= safe_queue_length) { @@ -214,10 +225,12 @@ void QueueLengthPolicy::update_policy(unsigned queue_length) } if (++frames_with_at_least_one >= 1000 && safe_queue_length > 1) { --safe_queue_length; + metric_input_queue_safe_length_frames = safe_queue_length; fprintf(stderr, "Card %u: Spare frames for more than 1000 frames, reducing safe limit to %u frame(s)\n", card_index, safe_queue_length); frames_with_at_least_one = 0; } + metric_input_queue_length_frames = min(queue_length, safe_queue_length); // The caller will drop frames for us if needed. } Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) @@ -226,9 +239,9 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) mixer_surface(create_surface(format)), h264_encoder_surface(create_surface(format)), decklink_output_surface(create_surface(format)), - ycbcr_interpretation(global_flags.ycbcr_interpretation), audio_mixer(num_cards) { + memcpy(ycbcr_interpretation, global_flags.ycbcr_interpretation, sizeof(ycbcr_interpretation)); CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF)); check_error(); @@ -388,6 +401,14 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) desired_output_card_index = global_flags.output_card; set_output_card_internal(global_flags.output_card); } + + metric_start_time_seconds = get_timestamp_for_metrics(); + + 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() @@ -453,6 +474,59 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT audio_mixer.reset_resampler(device); audio_mixer.set_display_name(device, card->capture->get_description()); audio_mixer.trigger_state_changed_callback(); + + // Unregister old metrics, if any. + if (!card->labels.empty()) { + const vector> &labels = card->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_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); + } + + // Register metrics. + vector> labels; + char card_name[64]; + snprintf(card_name, sizeof(card_name), "%d", card_index); + labels.emplace_back("card", card_name); + + switch (card_type) { + case CardType::LIVE_CARD: + labels.emplace_back("cardtype", "live"); + break; + case CardType::FAKE_CAPTURE: + labels.emplace_back("cardtype", "fake"); + break; + case CardType::FFMPEG_INPUT: + labels.emplace_back("cardtype", "ffmpeg"); + break; + default: + assert(false); + } + card->queue_length_policy.register_metrics(labels); + global_metrics.add("input_received_frames", labels, &card->metric_input_received_frames); + global_metrics.add("input_dropped_frames_jitter", labels, &card->metric_input_dropped_frames_jitter); + global_metrics.add("input_dropped_frames_error", labels, &card->metric_input_dropped_frames_error); + global_metrics.add("input_dropped_frames_resets", labels, &card->metric_input_resets); + + global_metrics.add("input_has_signal_bool", labels, &card->metric_input_has_signal_bool, Metrics::TYPE_GAUGE); + global_metrics.add("input_is_connected_bool", labels, &card->metric_input_is_connected_bool, Metrics::TYPE_GAUGE); + global_metrics.add("input_interlaced_bool", labels, &card->metric_input_interlaced_bool, Metrics::TYPE_GAUGE); + global_metrics.add("input_width_pixels", labels, &card->metric_input_width_pixels, Metrics::TYPE_GAUGE); + global_metrics.add("input_height_pixels", labels, &card->metric_input_height_pixels, Metrics::TYPE_GAUGE); + 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); + card->labels = labels; } void Mixer::set_output_card_internal(int card_index) @@ -518,6 +592,16 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, DeviceSpec device{InputSourceType::CAPTURE_CARD, card_index}; CaptureCard *card = &cards[card_index]; + ++card->metric_input_received_frames; + card->metric_input_has_signal_bool = video_format.has_signal; + card->metric_input_is_connected_bool = video_format.is_connected; + card->metric_input_interlaced_bool = video_format.interlaced; + card->metric_input_width_pixels = video_format.width; + card->metric_input_height_pixels = video_format.height; + card->metric_input_frame_rate_nom = video_format.frame_rate_nom; + card->metric_input_frame_rate_den = video_format.frame_rate_den; + card->metric_input_sample_rate_hz = audio_format.sample_rate; + if (is_mode_scanning[card_index]) { if (video_format.has_signal) { // Found a stable signal, so stop scanning. @@ -567,10 +651,12 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, card_index, card->last_timecode, timecode); audio_mixer.reset_resampler(device); dropped_frames = 0; + ++card->metric_input_resets; } else if (dropped_frames > 0) { // Insert silence as needed. fprintf(stderr, "Card %d dropped %d frame(s) (before timecode 0x%04x), inserting silence.\n", card_index, dropped_frames, timecode); + card->metric_input_dropped_frames_error += dropped_frames; bool success; do { @@ -715,6 +801,13 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, 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: @@ -864,6 +957,10 @@ void Mixer::thread_func() 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, @@ -894,12 +991,16 @@ void Mixer::thread_func() 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; } @@ -967,6 +1068,8 @@ void Mixer::trim_queue(CaptureCard *card, unsigned card_index) ++dropped_frames; } + card->metric_input_dropped_frames_jitter += dropped_frames; + #if 0 if (dropped_frames > 0) { fprintf(stderr, "Card %u dropped %u frame(s) to keep latency down.\n", @@ -1000,6 +1103,7 @@ start: // and then restart. assert(cards[master_card_index].capture->get_disconnected()); handle_hotplugged_cards(); + lock.unlock(); goto start; }