4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libobs/media-io: Clean surround API

Browse source 
(also modifies obs-ffmpeg, audio-monitoring, win-wasapi, decklink,
obs-outputs)

Removes speaker layouts which are not exposed in UI.  The speaker
layouts selectable by users in the UI are the most common ones.  It is
not necessary to keep other layouts.  (This basically removes
5POINT1_SURROUND, 7POINT1_SURROUND, SURROUND =3.0).
This commit is contained in:
pkviet 2017-12-04 23:32:50 +01:00 • committed by jp9000
commit fb580535c9
10 changed files with 9 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/decklink/decklink-device-instance.cpp
View file

@ -34,9 +34,7 @@ static inline int ConvertChannelFormat(speaker_layout format)
case SPEAKERS_QUAD:
case SPEAKERS_4POINT1:
case SPEAKERS_5POINT1:
case SPEAKERS_5POINT1_SURROUND:
case SPEAKERS_7POINT1:
case SPEAKERS_7POINT1_SURROUND:
return 8;
default:
@ -53,10 +51,8 @@ static inline audio_repack_mode_t ConvertRepackFormat(speaker_layout format)
case SPEAKERS_4POINT1:
return repack_mode_8to5ch_swap23;
case SPEAKERS_5POINT1:
case SPEAKERS_5POINT1_SURROUND:
return repack_mode_8to6ch_swap23;
case SPEAKERS_7POINT1:
case SPEAKERS_7POINT1_SURROUND:
return repack_mode_8ch_swap23_swap46_swap57;
default:
assert(false && "No repack requested");