X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=adfb7cf361f24ea22554c3deab545cbd9de87ad5;hb=327534a3031a332423411c9599c741f2f81657df;hp=ace60701f5adda9af5fa4422ce77eee2ebdebefc;hpb=afe163c940b7239cab0577fa390796175cdc94a6;p=nageru

diff --git a/mixer.h b/mixer.h
index ace6070..adfb7cf 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);
@@ -398,13 +399,27 @@ public:
 		display_timecode_on_stdout = enable;
 	}
 
+	int64_t get_num_connected_clients() const {
+		return httpd.get_num_connected_clients();
+	}
+
+	std::vector<Theme::MenuEntry> get_theme_menu() { return theme->get_theme_menu(); }
+
+	void theme_menu_entry_clicked(int lua_ref) { return theme->theme_menu_entry_clicked(lua_ref); }
+
+	void set_theme_menu_callback(std::function<void()> callback)
+	{
+		theme->set_theme_menu_callback(callback);
+	}
+
 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 +438,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 = 0;
 
 	QSurface *mixer_surface, *h264_encoder_surface, *decklink_output_surface;
 	std::unique_ptr<movit::ResourcePool> resource_pool;
@@ -470,6 +487,15 @@ private:
 		CardType type;
 		std::unique_ptr<DeckLinkOutput> output;
 
+		// CEF only delivers frames when it actually has a change.
+		// If we trim the queue for latency reasons, we could thus
+		// end up in a situation trimming a frame that was meant to
+		// be displayed for a long time, which is really suboptimal.
+		// Thus, if we drop the last frame we have, may_have_dropped_last_frame
+		// is set to true, and the next starvation event will trigger
+		// us requestin a CEF repaint.
+		bool is_cef_capture, may_have_dropped_last_frame = false;
+
 		// If this card is used for output (ie., output_card_index points to it),
 		// it cannot simultaneously be uesd for capture, so <capture> gets replaced
 		// by a FakeCapture. However, since reconstructing the real capture object
@@ -543,7 +569,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 +617,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)