From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 25 Mar 2020 18:14:42 +0000 (+0100)
Subject: Support getting all 8 channels from DeckLink capture cards.
X-Git-Tag: 1.9.2~5
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=3e4002cd9c16df872b4f4fd67816814a3696403a

Support getting all 8 channels from DeckLink capture cards.

You could select channels 3–8 in the UI, but Nageru would simply
crash with an assertion failure.
---

diff --git a/nageru/decklink_capture.cpp b/nageru/decklink_capture.cpp
index 07031a1..eefb537 100644
--- a/nageru/decklink_capture.cpp
+++ b/nageru/decklink_capture.cpp
@@ -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();
 	}