]> git.sesse.net Git - nageru/commitdiff
Support getting all 8 channels from DeckLink capture cards.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Wed, 25 Mar 2020 18:14:42 +0000 (19:14 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 28 Mar 2020 23:48:26 +0000 (00:48 +0100)
You could select channels 3–8 in the UI, but Nageru would simply
crash with an assertion failure.

nageru/decklink_capture.cpp

index 07031a10e23dcd7cfaa4ca4aa33149bd4e835b2c..eefb537cd1b3409d9f51593b1432e9360ff534b4 100644 (file)
@@ -283,12 +283,12 @@ HRESULT STDMETHODCALLTYPE DeckLinkCapture::VideoInputFrameArrived(
                if (current_audio_frame.data != nullptr) {
                        const uint8_t *src;
                        audio_frame->GetBytes((void **)&src);
                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;
 
                        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();
        }
                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();
        }
                fprintf(stderr, "Failed to enable audio input for card %d\n", card_index);
                abort();
        }