X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fdecklink_capture.cpp;h=9bf1a0e1a8f66b1889b279c0c075093ad364a065;hb=46526573fd6c4e89b4493aae9d1fb05e07c3a0cf;hp=eefb537cd1b3409d9f51593b1432e9360ff534b4;hpb=3e4002cd9c16df872b4f4fd67816814a3696403a;p=nageru

diff --git a/nageru/decklink_capture.cpp b/nageru/decklink_capture.cpp
index eefb537..9bf1a0e 100644
--- a/nageru/decklink_capture.cpp
+++ b/nageru/decklink_capture.cpp
@@ -24,8 +24,6 @@
 #include "shared/memcpy_interleaved.h"
 #include "v210_converter.h"
 
-#define FRAME_SIZE (8 << 20)  // 8 MB.
-
 using namespace std;
 using namespace std::chrono;
 using namespace std::placeholders;
@@ -246,7 +244,7 @@ HRESULT STDMETHODCALLTYPE DeckLinkCapture::VideoInputFrameArrived(
 		const int stride = video_frame->GetRowBytes();
 		const BMDPixelFormat format = video_frame->GetPixelFormat();
 		assert(format == pixel_format_to_bmd(current_pixel_format));
-		if (global_flags.ten_bit_input) {
+		if (global_flags.bit_depth > 8) {
 			assert(stride == int(v210Converter::get_v210_stride(width)));
 		} else {
 			assert(stride == width * 2);
@@ -350,14 +348,12 @@ void DeckLinkCapture::stop_dequeue_thread()
 		fprintf(stderr, "StopStreams failed with error 0x%x\n", result);
 		abort();
 	}
-	if (input->DisableVideoInput() != S_OK) {
-		fprintf(stderr, "Failed to disable video input for card %d\n", card_index);
-		exit(1);
-	}
-	if (input->DisableAudioInput() != S_OK) {
-		fprintf(stderr, "Failed to disable audio input for card %d\n", card_index);
-		exit(1);
-	}
+
+	// We could call DisableVideoInput() and DisableAudioInput() here,
+	// but they seem to be taking a really long time, and we only do this
+	// during shutdown anyway (except when switching to output mode,
+	// where DeckLinkOutput does the disabling), so StopStreams() will suffice.
+
 	running = false;
 }