mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-04-16 04:28:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

decklink: Remove inactive audio channels (linux, macOs)

Browse Source 
Decklink cards accept 2, 8 or 16 audio channels.
If obs audio output is setup to n channels ( 8 >= n > 2), and the
decklink card captures n channels, one needs to squash the silent
channels (n+1, .., 8) or sampling issues occur.
This had been done on windows but is required also on macOs and linux.
The commit adds the fix for macOS and linux.
Some code factoring has also been done.

Closes obsproject/obs-studio#1350
This commit is contained in:
pkviet
2018-06-28 02:11:15 +02:00
committed by jp9000
parent 8c4b496ea0
commit c7dab6c92b
3 changed files with 26 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,12 +9,6 @@
#define LOG(level, message, ...) blog(level, "%s: " message, \
obs_source_get_name(this->decklink->GetSource()), ##__VA_ARGS__)
#ifdef _WIN32
#define IS_WIN 1
#else
#define IS_WIN 0
#endif
static inline enum video_format ConvertPixelFormat(BMDPixelFormat format)
{
switch (format) {
@@ -47,15 +41,14 @@ static inline audio_repack_mode_t ConvertRepackFormat(speaker_layout format)
{
switch (format) {
case SPEAKERS_2POINT1:
return repack_mode_8to3ch_swap23;
return repack_mode_8to3ch;
case SPEAKERS_4POINT0:
return repack_mode_8to4ch_swap23;
return repack_mode_8to4ch;
case SPEAKERS_4POINT1:
return repack_mode_8to5ch_swap23;
return repack_mode_8to5ch;
case SPEAKERS_5POINT1:
return repack_mode_8to6ch_swap23;
return repack_mode_8to6ch;
case SPEAKERS_7POINT1:
return repack_mode_8ch_swap23_swap46_swap57;
default:
assert(false && "No repack requested");
return (audio_repack_mode_t)-1;
@@ -100,13 +93,12 @@ void DeckLinkDeviceInstance::HandleAudioPacket(
}
int maxdevicechannel = device->GetMaxChannel();
bool isWin = IS_WIN;
if (channelFormat != SPEAKERS_UNKNOWN &&
channelFormat != SPEAKERS_MONO &&
channelFormat != SPEAKERS_STEREO &&
maxdevicechannel >= 8 &&
isWin) {
channelFormat != SPEAKERS_7POINT1 &&
maxdevicechannel >= 8) {
if (audioRepacker->repack((uint8_t *)bytes, frameCount) < 0) {
LOG(LOG_ERROR, "Failed to convert audio packet data");
@@ -235,7 +227,6 @@ bool DeckLinkDeviceInstance::StartCapture(DeckLinkDeviceMode *mode_)
currentPacket.speakers = channelFormat;
int maxdevicechannel = device->GetMaxChannel();
bool isWin = IS_WIN;
if (channelFormat != SPEAKERS_UNKNOWN) {
const int channel = ConvertChannelFormat(channelFormat);
@@ -248,8 +239,8 @@ bool DeckLinkDeviceInstance::StartCapture(DeckLinkDeviceMode *mode_)
if (channelFormat != SPEAKERS_UNKNOWN &&
channelFormat != SPEAKERS_MONO &&
channelFormat != SPEAKERS_STEREO &&
maxdevicechannel >= 8 &&
isWin) {
channelFormat != SPEAKERS_7POINT1 &&
maxdevicechannel >= 8) {
const audio_repack_mode_t repack_mode = ConvertRepackFormat
(channelFormat);