X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=24f2a8091c941a8f9338964902be0c988a7a6ba9;hb=c574aef4437253dcf0e6c1fed4c9cab1033b33f9;hp=857d62bf4fc2ab5367ba2bf1f3332fa2728fc616;hpb=8cefe0ef1926be7931d4a9bbfed93ee6e85f3540;p=nageru diff --git a/mixer.cpp b/mixer.cpp index 857d62b..24f2a80 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,8 +198,17 @@ 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) { + metric_input_queue_length_frames = queue_length; + if (queue_length == 0) { // Starvation. if (been_at_safe_point_since_last_starvation && safe_queue_length < unsigned(global_flags.max_input_queue_frames)) { ++safe_queue_length; @@ -207,6 +217,8 @@ 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; return; } if (queue_length >= safe_queue_length) { @@ -214,6 +226,7 @@ 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; @@ -388,6 +401,12 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards) desired_output_card_index = global_flags.output_card; set_output_card_internal(global_flags.output_card); } + + global_metrics.add("frames_output_total", &metric_frames_output_total); + global_metrics.add("frames_output_dropped", &metric_frames_output_dropped); + global_metrics.add("uptime_seconds", &metric_uptime_seconds); + global_metrics.add("memory_used_bytes", &metrics_memory_used_bytes); + global_metrics.add("metrics_memory_locked_limit_bytes", &metrics_memory_locked_limit_bytes); } Mixer::~Mixer() @@ -427,7 +446,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT PixelFormat pixel_format; if (card_type == CardType::FFMPEG_INPUT) { - pixel_format = PixelFormat_8BitBGRA; + pixel_format = capture->get_current_pixel_format(); } else if (global_flags.ten_bit_input) { pixel_format = PixelFormat_10BitYCbCr; } else { @@ -453,6 +472,39 @@ 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(); + + // 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_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); } void Mixer::set_output_card_internal(int card_index) @@ -518,6 +570,15 @@ 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_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 +628,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 { @@ -643,6 +706,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, // 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; @@ -714,6 +778,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: @@ -863,6 +934,11 @@ 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; + metric_uptime_seconds = elapsed; + 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, @@ -893,12 +969,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; } @@ -966,6 +1046,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",