Fix an issue where the mixer lagging too much behind CEF would cause us to display...

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index ace60701f5adda9af5fa4422ce77eee2ebdebefc..940dc1308c04445c166b3956aeda6b36cbaa3287 100644 (file)
--- 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);
@@ -398,13 +399,18 @@ public:
                display_timecode_on_stdout = enable;
        }
 
+       int64_t get_num_connected_clients() const {
+               return httpd.get_num_connected_clients();
+       }
+
 private:
        struct CaptureCard;
 
        enum class CardType {
                LIVE_CARD,
                FAKE_CAPTURE,
-               FFMPEG_INPUT
+               FFMPEG_INPUT,
+               CEF_INPUT,
        };
        void configure_card(unsigned card_index, bmusb::CaptureInterface *capture, CardType card_type, DeckLinkOutput *output);
        void set_output_card_internal(int card_index);  // Should only be called from the mixer thread.
@@ -423,9 +429,11 @@ private:
        void release_display_frame(DisplayFrame *frame);
        double pts() { return double(pts_int) / TIMEBASE; }
        void trim_queue(CaptureCard *card, size_t safe_queue_length);
+       std::pair<std::string, std::string> get_channels_json();
+       std::pair<std::string, std::string> get_channel_color_http(unsigned channel_idx);
 
        HTTPD httpd;
-       unsigned num_cards, num_video_inputs;
+       unsigned num_cards, num_video_inputs, num_html_inputs;
 
        QSurface *mixer_surface, *h264_encoder_surface, *decklink_output_surface;
        std::unique_ptr<movit::ResourcePool> resource_pool;
@@ -543,7 +551,7 @@ private:
        class OutputChannel {
        public:
                ~OutputChannel();
-               void output_frame(DisplayFrame frame);
+               void output_frame(DisplayFrame &&frame);
                bool get_display_frame(DisplayFrame *frame);
                void add_frame_ready_callback(void *key, new_frame_ready_callback_t callback);
                void remove_frame_ready_callback(void *key);
@@ -591,16 +599,8 @@ private:
        std::vector<uint32_t> 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<int64_t> metric_frames_output_total{0};
-       std::atomic<int64_t> metric_frames_output_dropped{0};
-       std::atomic<double> metric_start_time_seconds{0.0 / 0.0};
-       std::atomic<int64_t> metrics_memory_used_bytes{0};
-       std::atomic<double> metrics_memory_locked_limit_bytes{0.0 / 0.0};
 };
 
 extern Mixer *global_mixer;
-extern bool uses_mlock;
 
 #endif  // !defined(_MIXER_H)