mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-02 05:18:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

libobs/media-io: Replace quad with 4.0

Browse Source 
(also obs, deps/media-playback, libobs/audio-monitoring, decklink,
linux-alsa, linux-pulseaudio, mac-capture, obs-ffmpeg, win-dshow,
win-wasapi)

Default channel layout for 4 channels is 4.0 in FFmpeg.
Replacing quad with 4.0 will improve compatibility since FFmpeg has
better support of its default channel layouts.
This commit is contained in:
pkviet
2017-12-01 17:10:05 +01:00
committed by jp9000
parent fb580535c9
commit 67e48ecc2c
19 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
UI/window-basic-settings.cpp
View File

@@ -1390,7 +1390,7 @@ static inline bool IsSurround(const char *speakers)
{
static const char *surroundLayouts[] = {
"2.1",
"4.0 Quad",
"4.0",
"4.1",
"5.1",
"7.1",
@@ -2109,7 +2109,7 @@ void OBSBasicSettings::LoadAudioSettings()
ui->channelSetup->setCurrentIndex(0);
else if (strcmp(speakers, "2.1") == 0)
ui->channelSetup->setCurrentIndex(2);
else if (strcmp(speakers, "4.0 Quad") == 0)
else if (strcmp(speakers, "4.0") == 0)
ui->channelSetup->setCurrentIndex(3);
else if (strcmp(speakers, "4.1") == 0)
ui->channelSetup->setCurrentIndex(4);
@@ -3015,7 +3015,7 @@ void OBSBasicSettings::SaveAudioSettings()
channelSetup = "2.1";
break;
case 3:
channelSetup = "4.0 Quad";
channelSetup = "4.0";
break;
case 4:
channelSetup = "4.1";