Support getting all 8 channels from DeckLink capture cards.

[nageru] / nageru / decklink_capture.cpp

diff --git a/nageru/decklink_capture.cpp b/nageru/decklink_capture.cpp
index ab5e1ec818f720c6fba4dc35935c1986df1aaaba..eefb537cd1b3409d9f51593b1432e9360ff534b4 100644 (file)
--- 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();
        }
@@ -350,11 +350,14 @@ void DeckLinkCapture::stop_dequeue_thread()
                fprintf(stderr, "StopStreams failed with error 0x%x\n", result);
                abort();
        }
-
-       // 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, so StopStreams() will suffice.
-
+       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);
+       }
        running = false;
 }