X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=ff501b17635cd8830ba36e084754577cd75902b5;hb=868450678563ed2c9fd5240dca704d87371d1478;hp=ace60701f5adda9af5fa4422ce77eee2ebdebefc;hpb=afe163c940b7239cab0577fa390796175cdc94a6;p=nageru diff --git a/mixer.h b/mixer.h index ace6070..ff501b1 100644 --- a/mixer.h +++ b/mixer.h @@ -139,6 +139,7 @@ public: // Call after picking out a frame, so 0 means starvation. void update_policy(std::chrono::steady_clock::time_point now, std::chrono::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); @@ -591,16 +592,8 @@ private: std::vector mode_scanlist[MAX_VIDEO_CARDS]; unsigned mode_scanlist_index[MAX_VIDEO_CARDS]{ 0 }; std::chrono::steady_clock::time_point last_mode_scan_change[MAX_VIDEO_CARDS]; - - // Metrics. - std::atomic metric_frames_output_total{0}; - std::atomic metric_frames_output_dropped{0}; - std::atomic metric_start_time_seconds{0.0 / 0.0}; - std::atomic metrics_memory_used_bytes{0}; - std::atomic metrics_memory_locked_limit_bytes{0.0 / 0.0}; }; extern Mixer *global_mixer; -extern bool uses_mlock; #endif // !defined(_MIXER_H)