X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=d1bf79519452113a49183e7539596f6c96600010;hb=c094b73565559282001764edfbf0f4926d3197fb;hp=aa3baac2fff99e90b1113f61af65e7f82761f42e;hpb=2f4224d7c48b3b22bcb24eb622fe6705fa16375f;p=nageru

diff --git a/mixer.h b/mixer.h
index aa3baac..d1bf795 100644
--- a/mixer.h
+++ b/mixer.h
@@ -288,8 +288,8 @@ public:
 	}
 
 	// Note: You can also get this through the global variable global_audio_mixer.
-	AudioMixer *get_audio_mixer() { return &audio_mixer; }
-	const AudioMixer *get_audio_mixer() const { return &audio_mixer; }
+	AudioMixer *get_audio_mixer() { return audio_mixer.get(); }
+	const AudioMixer *get_audio_mixer() const { return audio_mixer.get(); }
 
 	void schedule_cut()
 	{
@@ -322,6 +322,11 @@ public:
 		return cards[card_index].output != nullptr;
 	}
 
+	bool card_is_ffmpeg(unsigned card_index) const {
+		assert(card_index < num_cards + num_video_inputs);
+		return cards[card_index].type == CardType::FFMPEG_INPUT;
+	}
+
 	std::map<uint32_t, bmusb::VideoMode> get_available_video_modes(unsigned card_index) const {
 		assert(card_index < num_cards);
 		return cards[card_index].capture->get_available_video_modes();
@@ -369,6 +374,10 @@ public:
 		cards[card_index].capture->set_audio_input(input);
 	}
 
+	std::string get_ffmpeg_filename(unsigned card_index) const;
+
+	void set_ffmpeg_filename(unsigned card_index, const std::string &filename);
+
 	void change_x264_bitrate(unsigned rate_kbit) {
 		video_encoder->change_x264_bitrate(rate_kbit);
 	}
@@ -403,13 +412,25 @@ public:
 		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);
+	}
+
+	void wait_for_next_frame();
+
 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.
@@ -432,7 +453,7 @@ private:
 	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;
@@ -463,7 +484,10 @@ private:
 	movit::YCbCrInput *display_input;
 
 	int64_t pts_int = 0;  // In TIMEBASE units.
-	unsigned frame_num = 0;
+
+	mutable std::mutex frame_num_mutex;
+	std::condition_variable frame_num_updated;
+	unsigned frame_num = 0;  // Under <frame_num_mutex>.
 
 	// Accumulated errors in number of 1/TIMEBASE audio samples. If OUTPUT_FREQUENCY divided by
 	// frame rate is integer, will always stay zero.
@@ -477,6 +501,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
@@ -529,7 +562,7 @@ private:
 	JitterHistory output_jitter_history;
 	CaptureCard cards[MAX_VIDEO_CARDS];  // Protected by <card_mutex>.
 	YCbCrInterpretation ycbcr_interpretation[MAX_VIDEO_CARDS];  // Protected by <card_mutex>.
-	AudioMixer audio_mixer;  // Same as global_audio_mixer (see audio_mixer.h).
+	std::unique_ptr<AudioMixer> audio_mixer;  // Same as global_audio_mixer (see audio_mixer.h).
 	bool input_card_is_master_clock(unsigned card_index, unsigned master_card_index) const;
 	struct OutputFrameInfo {
 		int dropped_frames;  // Since last frame.