kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Audio Output] Correctly configure WAVE layouts 

Correctly configure AVFoundation with the channel layouts supported by
WAVEFORMATEXTENSIBLE speaker position flags, which includes varied
formats supported by FFmpeg and Core Audio inputs.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
swiftingly
Christopher Snowhill 2022-06-24 23:12:14 -07:00
parent b55955ef1c
commit 86d8f04966
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Audio/Output/OutputAVFoundation.m
View File

@ -588,37 +588,38 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
- (void)updateStreamFormat { - (void)updateStreamFormat {
/* Set the channel layout for the audio queue */ /* Set the channel layout for the audio queue */
AudioChannelLayoutTag tag = 0; AudioChannelLayoutTag tag = 0;
AudioChannelLayout layout = { 0 }; AudioChannelLayout layout = { 0 };
switch(streamFormat.mChannelsPerFrame) { switch(streamChannelConfig) {
case 1: case AudioConfigMono:
tag = kAudioChannelLayoutTag_Mono; tag = kAudioChannelLayoutTag_Mono;
deviceChannelConfig = AudioConfigMono; deviceChannelConfig = AudioConfigMono;
break; break;
case 2: case AudioConfigStereo:
tag = kAudioChannelLayoutTag_Stereo; tag = kAudioChannelLayoutTag_Stereo;
deviceChannelConfig = AudioConfigStereo; deviceChannelConfig = AudioConfigStereo;
break; break;
case 3: case AudioConfig3Point0:
tag = kAudioChannelLayoutTag_WAVE_3_0; tag = kAudioChannelLayoutTag_WAVE_3_0;
deviceChannelConfig = AudioConfig3Point0; deviceChannelConfig = AudioConfig3Point0;
break; break;
case 4: case AudioConfig4Point0:
tag = kAudioChannelLayoutTag_WAVE_4_0_A; tag = kAudioChannelLayoutTag_WAVE_4_0_A;
deviceChannelConfig = AudioConfig4Point0; deviceChannelConfig = AudioConfig4Point0;
break; break;
case 5: case AudioConfig5Point0:
tag = kAudioChannelLayoutTag_WAVE_5_0_A; tag = kAudioChannelLayoutTag_WAVE_5_0_A;
deviceChannelConfig = AudioConfig5Point0; deviceChannelConfig = AudioConfig5Point0;
break; break;
case 6: case AudioConfig5Point1:
tag = kAudioChannelLayoutTag_WAVE_5_1_A; tag = kAudioChannelLayoutTag_WAVE_5_1_A;
deviceChannelConfig = AudioConfig5Point1; deviceChannelConfig = AudioConfig5Point1;
break; break;
case 7: case AudioConfig6Point1:
tag = kAudioChannelLayoutTag_WAVE_6_1; tag = kAudioChannelLayoutTag_WAVE_6_1;
deviceChannelConfig = AudioConfig6Point1; deviceChannelConfig = AudioConfig6Point1;
break; break;
case 8: case AudioConfig7Point1:
tag = kAudioChannelLayoutTag_WAVE_7_1; tag = kAudioChannelLayoutTag_WAVE_7_1;
deviceChannelConfig = AudioConfig7Point1; deviceChannelConfig = AudioConfig7Point1;
break; break;
@ -632,6 +633,9 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
if(tag) { if(tag) {
layout.mChannelLayoutTag = tag; layout.mChannelLayoutTag = tag;
} else {
layout.mChannelLayoutTag = kAudioChannelLayoutTag_UseChannelBitmap;
layout.mChannelBitmap = streamChannelConfig;
} }
if(CMAudioFormatDescriptionCreate(kCFAllocatorDefault, &streamFormat, sizeof(layout), &layout, 0, NULL, NULL, &audioFormatDescription) != noErr) { if(CMAudioFormatDescriptionCreate(kCFAllocatorDefault, &streamFormat, sizeof(layout), &layout, 0, NULL, NULL, &audioFormatDescription) != noErr) {