mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-04-13 11:10:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

decklink: Fix FC<->LFE channel swap for some devices

Browse Source 
Fixes mantis issue https://obsproject.com/mantis/view.php?id=1379
For some devices with hdmi input, the Front Center channel and the LFE
channel are swapped. For some others they are not.
To solve the issue a new swap setting is added so that the user can
swap the two channels if needed.
This commit is contained in:
pkv
2019-03-01 09:59:58 +01:00
parent 748067c930
commit 05508ac895
9 changed files with 64 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/decklink/decklink-device-instance.cpp
View File

@@ -38,7 +38,7 @@ static inline int ConvertChannelFormat(speaker_layout format)
}
}
static inline audio_repack_mode_t ConvertRepackFormat(speaker_layout format)
static inline audio_repack_mode_t ConvertRepackFormat(speaker_layout format, bool swap)
{
switch (format) {
case SPEAKERS_2POINT1:
@@ -46,10 +46,11 @@ static inline audio_repack_mode_t ConvertRepackFormat(speaker_layout format)
case SPEAKERS_4POINT0:
return repack_mode_8to4ch;
case SPEAKERS_4POINT1:
return repack_mode_8to5ch;
return swap? repack_mode_8to5ch_swap:repack_mode_8to5ch;
case SPEAKERS_5POINT1:
return repack_mode_8to6ch;
return swap ? repack_mode_8to6ch_swap : repack_mode_8to6ch;
case SPEAKERS_7POINT1:
return swap ? repack_mode_8ch_swap: repack_mode_8ch;
default:
assert(false && "No repack requested");
return (audio_repack_mode_t)-1;
@@ -98,8 +99,8 @@ void DeckLinkDeviceInstance::HandleAudioPacket(
if (channelFormat != SPEAKERS_UNKNOWN &&
channelFormat != SPEAKERS_MONO &&
channelFormat != SPEAKERS_STEREO &&
channelFormat != SPEAKERS_7POINT1 &&
maxdevicechannel >= 8) {
(channelFormat != SPEAKERS_7POINT1 || static_cast<DeckLinkInput*>(decklink)->swap)
&& maxdevicechannel >= 8) {
if (audioRepacker->repack((uint8_t *)bytes, frameCount) < 0) {
LOG(LOG_ERROR, "Failed to convert audio packet data");
@@ -226,6 +227,7 @@ bool DeckLinkDeviceInstance::StartCapture(DeckLinkDeviceMode *mode_)
channelFormat = static_cast<DeckLinkInput*>(decklink)->GetChannelFormat();
currentPacket.speakers = channelFormat;
swap = static_cast<DeckLinkInput*>(decklink)->swap;
int maxdevicechannel = device->GetMaxChannel();
@@ -240,11 +242,11 @@ bool DeckLinkDeviceInstance::StartCapture(DeckLinkDeviceMode *mode_)
if (channelFormat != SPEAKERS_UNKNOWN &&
channelFormat != SPEAKERS_MONO &&
channelFormat != SPEAKERS_STEREO &&
channelFormat != SPEAKERS_7POINT1 &&
maxdevicechannel >= 8) {
(channelFormat != SPEAKERS_7POINT1 || swap)
&& maxdevicechannel >= 8) {
const audio_repack_mode_t repack_mode = ConvertRepackFormat
(channelFormat);
(channelFormat, swap);
audioRepacker = new AudioRepacker(repack_mode);
}
}