X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=32a1ea476f21547137e680fb13675c80b6b42835;hb=refs%2Ftags%2F1.7.4;hp=d8a9c8badf527e0e6dfcf2867156a10ad4677c9c;hpb=80a2892bbe07a4e065704830e9e7244d2b1139fa;p=nageru

diff --git a/mixer.h b/mixer.h
index d8a9c8b..32a1ea4 100644
--- a/mixer.h
+++ b/mixer.h
@@ -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);
 	}
@@ -412,6 +421,8 @@ public:
 		theme->set_theme_menu_callback(callback);
 	}
 
+	void wait_for_next_frame();
+
 private:
 	struct CaptureCard;
 
@@ -473,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.
@@ -518,8 +532,7 @@ private:
 			std::chrono::steady_clock::time_point received_timestamp = std::chrono::steady_clock::time_point::min();
 		};
 		std::deque<NewFrame> new_frames;
-		bool should_quit = false;
-		std::condition_variable new_frames_changed;  // Set whenever new_frames (or should_quit) is changed.
+		std::condition_variable new_frames_changed;  // Set whenever new_frames is changed.
 
 		QueueLengthPolicy queue_length_policy;  // Refers to the "new_frames" queue.