mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-24 01:04:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Core Audio: Update to the new device info system.

Browse Source
This commit is contained in:
David Reid
2026-01-15 19:06:41 +10:00
parent 17a3941c94
commit 01b69f7323
1 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+19 -27
View File
@@ -35117,6 +35117,8 @@ static ma_device_enumeration_result ma_context_enumerate_device_by_AudioObjectID
ma_uint32 iSampleRate; ma_uint32 iSampleRate;
UInt32 sampleRateRangeCount; UInt32 sampleRateRangeCount;
AudioValueRange* pSampleRateRanges; AudioValueRange* pSampleRateRanges;
ma_uint32 minSampleRate = 0xFFFFFFFF;
ma_uint32 maxSampleRate = 0;
result = ma_format_from_AudioStreamBasicDescription(&pStreamDescriptions[iStreamDescription].mFormat, &format); result = ma_format_from_AudioStreamBasicDescription(&pStreamDescriptions[iStreamDescription].mFormat, &format);
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
@@ -35126,7 +35128,7 @@ static ma_device_enumeration_result ma_context_enumerate_device_by_AudioObjectID
MA_ASSERT(format != ma_format_unknown); MA_ASSERT(format != ma_format_unknown);
/* Make sure the format isn't already in the output list. */ /* Make sure the format isn't already in the output list. */
for (iOutputFormat = 0; iOutputFormat < uniqueFormatCount; ++iOutputFormat) { for (iOutputFormat = 0; iOutputFormat < uniqueFormatCount; iOutputFormat += 1) {
if (uniqueFormats[iOutputFormat] == format) { if (uniqueFormats[iOutputFormat] == format) {
hasFormatBeenHandled = MA_TRUE; hasFormatBeenHandled = MA_TRUE;
break; break;
@@ -35148,33 +35150,20 @@ static ma_device_enumeration_result ma_context_enumerate_device_by_AudioObjectID
} }
/* /*
Annoyingly Core Audio reports a sample rate range. We just get all the standard rates that are Core Audio reports a sample rate range. We'll grab the min and max values and report those.
between this range.
*/ */
for (iSampleRate = 0; iSampleRate < sampleRateRangeCount; ++iSampleRate) { for (iSampleRate = 0; iSampleRate < sampleRateRangeCount; iSampleRate += 1) {
ma_uint32 iStandardSampleRate; if (minSampleRate > pSampleRateRanges[iSampleRate].mMinimum) {
for (iStandardSampleRate = 0; iStandardSampleRate < ma_countof(ma_standard_sample_rates); iStandardSampleRate += 1) { minSampleRate = pSampleRateRanges[iSampleRate].mMinimum;
ma_uint32 standardSampleRate = ma_standard_sample_rates[iStandardSampleRate]; }
if (standardSampleRate >= pSampleRateRanges[iSampleRate].mMinimum && standardSampleRate <= pSampleRateRanges[iSampleRate].mMaximum) { if (maxSampleRate < pSampleRateRanges[iSampleRate].mMaximum) {
/* We have a new data format. Add it to the list. */ maxSampleRate = pSampleRateRanges[iSampleRate].mMaximum;
deviceInfo.nativeDataFormats[deviceInfo.nativeDataFormatCount].format = format;
deviceInfo.nativeDataFormats[deviceInfo.nativeDataFormatCount].channels = channels;
deviceInfo.nativeDataFormats[deviceInfo.nativeDataFormatCount].sampleRate = standardSampleRate;
deviceInfo.nativeDataFormats[deviceInfo.nativeDataFormatCount].flags = 0;
deviceInfo.nativeDataFormatCount += 1;
if (deviceInfo.nativeDataFormatCount >= ma_countof(deviceInfo.nativeDataFormats)) {
break; /* No more room for any more formats. */
}
}
} }
} }
ma_free(pSampleRateRanges, &pContext->allocationCallbacks); ma_free(pSampleRateRanges, &pContext->allocationCallbacks);
if (deviceInfo.nativeDataFormatCount >= ma_countof(deviceInfo.nativeDataFormats)) { ma_device_info_add_native_data_format_2(&deviceInfo, format, channels, channels, minSampleRate, maxSampleRate);
break; /* No more room for any more formats. */
}
} }
ma_free(pStreamDescriptions, &pContext->allocationCallbacks); ma_free(pStreamDescriptions, &pContext->allocationCallbacks);
@@ -35196,6 +35185,9 @@ static ma_device_enumeration_result ma_context_enumerate_device_by_AVAudioSessio
AudioUnitElement formatElement; AudioUnitElement formatElement;
AudioStreamBasicDescription bestFormat; AudioStreamBasicDescription bestFormat;
UInt32 propSize; UInt32 propSize;
ma_format format;
ma_uint32 channels;
ma_uint32 sampleRate;
MA_ZERO_OBJECT(&deviceInfo); MA_ZERO_OBJECT(&deviceInfo);
@@ -35245,14 +35237,12 @@ static ma_device_enumeration_result ma_context_enumerate_device_by_AVAudioSessio
audioUnit = NULL; audioUnit = NULL;
/* Only a single format is being reported for iOS. */ /* Only a single format is being reported for iOS. */
deviceInfo.nativeDataFormatCount = 1; result = ma_format_from_AudioStreamBasicDescription(&bestFormat, &format);
result = ma_format_from_AudioStreamBasicDescription(&bestFormat, &deviceInfo.nativeDataFormats[0].format);
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
return MA_DEVICE_ENUMERATION_CONTINUE; return MA_DEVICE_ENUMERATION_CONTINUE;
} }
deviceInfo.nativeDataFormats[0].channels = bestFormat.mChannelsPerFrame; channels = bestFormat.mChannelsPerFrame;
/* /*
It looks like Apple are wanting to push the whole AVAudioSession thing. Thus, we need to use that to determine device settings. To do It looks like Apple are wanting to push the whole AVAudioSession thing. Thus, we need to use that to determine device settings. To do
@@ -35262,9 +35252,11 @@ static ma_device_enumeration_result ma_context_enumerate_device_by_AVAudioSessio
AVAudioSession* pAudioSession = [AVAudioSession sharedInstance]; AVAudioSession* pAudioSession = [AVAudioSession sharedInstance];
MA_ASSERT(pAudioSession != NULL); MA_ASSERT(pAudioSession != NULL);
deviceInfo.nativeDataFormats[0].sampleRate = (ma_uint32)pAudioSession.sampleRate; sampleRate = (ma_uint32)pAudioSession.sampleRate;
} }
ma_device_info_add_native_data_format_2(&deviceInfo, format, channels, channels, sampleRate, sampleRate);
return callback(deviceType, &deviceInfo, pUserData); return callback(deviceType, &deviceInfo, pUserData);
} }
#endif #endif