X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fdecklink_capture.cpp;h=722221ea21f3f68a2e1179c958a093188e94cd18;hb=f34a3e1bbc207541842e0b54d5418d95bafc8e5b;hp=07031a10e23dcd7cfaa4ca4aa33149bd4e835b2c;hpb=fc130015fa36ffc34bc9bc7db927f7980d451d8d;p=nageru

diff --git a/nageru/decklink_capture.cpp b/nageru/decklink_capture.cpp
index 07031a1..722221e 100644
--- a/nageru/decklink_capture.cpp
+++ b/nageru/decklink_capture.cpp
@@ -246,7 +246,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);
@@ -283,12 +283,12 @@ HRESULT STDMETHODCALLTYPE DeckLinkCapture::VideoInputFrameArrived(
 		if (current_audio_frame.data != nullptr) {
 			const uint8_t *src;
 			audio_frame->GetBytes((void **)&src);
-			current_audio_frame.len = sizeof(int32_t) * 2 * num_samples;
+			current_audio_frame.len = sizeof(int32_t) * 8 * num_samples;
 
 			memcpy(current_audio_frame.data, src, current_audio_frame.len);
 
 			audio_format.bits_per_sample = 32;
-			audio_format.num_channels = 2;
+			audio_format.num_channels = 8;
 		}
 	}
 
@@ -328,7 +328,7 @@ void DeckLinkCapture::start_bm_capture()
 		fprintf(stderr, "Failed to set video mode 0x%04x for card %d\n", current_video_mode, card_index);
 		abort();
 	}
-	if (input->EnableAudioInput(48000, bmdAudioSampleType32bitInteger, 2) != S_OK) {
+	if (input->EnableAudioInput(48000, bmdAudioSampleType32bitInteger, 8) != S_OK) {
 		fprintf(stderr, "Failed to enable audio input for card %d\n", card_index);
 		abort();
 	}
@@ -350,14 +350,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;
 }