X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=decklink_capture.cpp;h=80aedc18664336506b77695db05f5cedb247876a;hb=96943efedcea66dab5ab6500358951e9f249aef2;hp=f2731acae422c9dbe9d259b77917ebe679a30621;hpb=ec8449f020f4659791f509b50ac70bc426de2ec9;p=nageru

diff --git a/decklink_capture.cpp b/decklink_capture.cpp
index f2731ac..80aedc1 100644
--- a/decklink_capture.cpp
+++ b/decklink_capture.cpp
@@ -206,8 +206,7 @@ DeckLinkCapture::DeckLinkCapture(IDeckLink *card, int card_index)
 		video_modes.insert(make_pair(id, mode));
 	}
 
-	// TODO: Make the user mode selectable.
-	set_video_mode(bmdModeHD720p5994);
+	set_video_mode_no_restart(bmdModeHD720p5994);
 
 	if (input->EnableAudioInput(48000, bmdAudioSampleType32bitInteger, 2) != S_OK) {
 		fprintf(stderr, "Failed to enable audio input for card %d\n", card_index);
@@ -365,6 +364,21 @@ void DeckLinkCapture::stop_dequeue_thread()
 }
 
 void DeckLinkCapture::set_video_mode(uint32_t video_mode_id)
+{
+	if (input->StopStreams() != S_OK) {
+		fprintf(stderr, "StopStreams failed\n");
+		exit(1);
+	}
+
+	set_video_mode_no_restart(video_mode_id);
+
+	if (input->StartStreams() != S_OK) {
+		fprintf(stderr, "StartStreams failed\n");
+		exit(1);
+	}
+}
+
+void DeckLinkCapture::set_video_mode_no_restart(uint32_t video_mode_id)
 {
 	BMDDisplayModeSupport support;
 	IDeckLinkDisplayMode *display_mode;
@@ -384,7 +398,7 @@ void DeckLinkCapture::set_video_mode(uint32_t video_mode_id)
 	}
 
 	if (input->EnableVideoInput(video_mode_id, bmdFormat8BitYUV, 0) != S_OK) {
-		fprintf(stderr, "Failed to set 720p59.94 connection for card %d\n", card_index);
+		fprintf(stderr, "Failed to set video mode 0x%04x for card %d\n", video_mode_id, card_index);
 		exit(1);
 	}