X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=deaa8e73079710b7f13b8dffd6a9f084f0ae9b4c;hb=45df960fe0d2f60194ffd9f4c77fae426f63db2d;hp=23658103e222d94383525e20f07911573c451e4d;hpb=80a2892bbe07a4e065704830e9e7244d2b1139fa;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index 2365810..deaa8e7 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -499,14 +499,10 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 
 Mixer::~Mixer()
 {
+	httpd.stop();
 	BMUSBCapture::stop_bm_thread();
 
 	for (unsigned card_index = 0; card_index < num_cards + num_video_inputs + num_html_inputs; ++card_index) {
-		{
-			unique_lock<mutex> lock(card_mutex);
-			cards[card_index].should_quit = true;  // Unblock thread.
-			cards[card_index].new_frames_changed.notify_all();
-		}
 		cards[card_index].capture->stop_dequeue_thread();
 		if (cards[card_index].output) {
 			cards[card_index].output->end_output();
@@ -689,18 +685,22 @@ int unwrap_timecode(uint16_t current_wrapped, int last)
 	}
 }
 
+DeviceSpec card_index_to_device(unsigned card_index, unsigned num_cards)
+{
+	if (card_index >= num_cards) {
+		return DeviceSpec{InputSourceType::FFMPEG_VIDEO_INPUT, card_index - num_cards};
+	} else {
+		return DeviceSpec{InputSourceType::CAPTURE_CARD, card_index};
+	}
+}
+
 }  // namespace
 
 void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                      FrameAllocator::Frame video_frame, size_t video_offset, VideoFormat video_format,
 		     FrameAllocator::Frame audio_frame, size_t audio_offset, AudioFormat audio_format)
 {
-	DeviceSpec device;
-	if (card_index >= num_cards) {
-		device = DeviceSpec{InputSourceType::FFMPEG_VIDEO_INPUT, card_index - num_cards};
-	} else {
-		device = DeviceSpec{InputSourceType::CAPTURE_CARD, card_index};
-	}
+	DeviceSpec device = card_index_to_device(card_index, num_cards);
 	CaptureCard *card = &cards[card_index];
 
 	++card->metric_input_received_frames;
@@ -992,7 +992,7 @@ void Mixer::thread_func()
 		}
 	}
 
-	BasicStats basic_stats(/*verbose=*/true);
+	BasicStats basic_stats(/*verbose=*/true, /*use_opengl=*/true);
 	int stats_dropped_frames = 0;
 
 	while (!should_quit) {
@@ -1018,7 +1018,7 @@ void Mixer::thread_func()
 		} else {
 			master_card_is_output = false;
 			master_card_index = theme->map_signal(master_clock_channel);
-			assert(master_card_index < num_cards);
+			assert(master_card_index < num_cards + num_video_inputs);
 		}
 
 		OutputFrameInfo	output_frame_info = get_one_frame_from_each_card(master_card_index, master_card_is_output, new_frames, has_new_frame);
@@ -1028,6 +1028,7 @@ void Mixer::thread_func()
 		handle_hotplugged_cards();
 
 		for (unsigned card_index = 0; card_index < num_cards + num_video_inputs + num_html_inputs; ++card_index) {
+			DeviceSpec device = card_index_to_device(card_index, num_cards);
 			if (card_index == master_card_index || !has_new_frame[card_index]) {
 				continue;
 			}
@@ -1035,8 +1036,8 @@ void Mixer::thread_func()
 				++new_frames[card_index].dropped_frames;
 			}
 			if (new_frames[card_index].dropped_frames > 0) {
-				printf("Card %u dropped %d frames before this\n",
-					card_index, int(new_frames[card_index].dropped_frames));
+				printf("%s dropped %d frames before this\n",
+					spec_to_string(device).c_str(), int(new_frames[card_index].dropped_frames));
 			}
 		}
 
@@ -1066,7 +1067,11 @@ void Mixer::thread_func()
 
 		int64_t frame_duration = output_frame_info.frame_duration;
 		render_one_frame(frame_duration);
-		++frame_num;
+		{
+			lock_guard<mutex> lock(frame_num_mutex);
+			++frame_num;
+		}
+		frame_num_updated.notify_all();
 		pts_int += frame_duration;
 
 		basic_stats.update(frame_num, stats_dropped_frames);
@@ -1587,6 +1592,25 @@ map<uint32_t, VideoMode> Mixer::get_available_output_video_modes() const
 	return cards[desired_output_card_index].output->get_available_video_modes();
 }
 
+string Mixer::get_ffmpeg_filename(unsigned card_index) const
+{
+	assert(card_index >= num_cards && card_index < num_cards + num_video_inputs);
+	return ((FFmpegCapture *)(cards[card_index].capture.get()))->get_filename();
+}
+
+void Mixer::set_ffmpeg_filename(unsigned card_index, const string &filename) {
+	assert(card_index >= num_cards && card_index < num_cards + num_video_inputs);
+	((FFmpegCapture *)(cards[card_index].capture.get()))->change_filename(filename);
+}
+
+void Mixer::wait_for_next_frame()
+{
+	unique_lock<mutex> lock(frame_num_mutex);
+	unsigned old_frame_num = frame_num;
+	frame_num_updated.wait_for(lock, seconds(1),  // Timeout is just in case.
+		[old_frame_num, this]{ return this->frame_num > old_frame_num; });
+}
+
 Mixer::OutputChannel::~OutputChannel()
 {
 	if (has_current_frame) {