Skip to content

Commit 5bc0077

Browse files
committed
disp/decklink: always set max_aud_chans to value of 'mach'
set always max_aud_chans to BMDDeckLinkMaximumAudioChannels Setting it to BMDDeckLinkMaximumAnalogAudioOutputChannels ('aach') for analog output was incorrect, because eg. BMD Studio 4K has mach=16 but aach=4. This subsequently crashes on assert, because IDeckLinkOutput::EnableAudioOutput accepts only 2, 8, 16, 32 or 64 channels.
1 parent 4807355 commit 5bc0077

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

src/video_display/decklink.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,10 +1286,7 @@ set_audio_props(state_decklink *s,
12861286

12871287
int64_t max_aud_chans = 0;
12881288
HRESULT result = s->deckLinkAttributes->GetInt(
1289-
audio_output == DISPLAY_FLAG_AUDIO_EMBEDDED
1290-
? BMDDeckLinkMaximumAudioChannels
1291-
: BMDDeckLinkMaximumAnalogAudioOutputChannels,
1292-
&max_aud_chans);
1289+
BMDDeckLinkMaximumAudioChannels, &max_aud_chans);
12931290
if (result != S_OK) {
12941291
MSG(WARNING, "Cannot get maximum audio channels: %s\n",
12951292
bmd_hresult_to_string(result).c_str());

0 commit comments

Comments
 (0)