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

AAudio: Potential fix for a failed assertion.

Browse Source 
Public issue https://github.com/mackron/miniaudio/issues/833
This commit is contained in:
David Reid
2024-04-29 08:52:12 +10:00
parent 88436b25ef
commit 1b35118e31
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+20 -2
View File
@@ -37736,7 +37736,9 @@ static ma_aaudio_data_callback_result_t ma_stream_data_callback_capture__aaudio(
ma_device* pDevice = (ma_device*)pUserData; ma_device* pDevice = (ma_device*)pUserData;
MA_ASSERT(pDevice != NULL); MA_ASSERT(pDevice != NULL);
ma_device_handle_backend_data_callback(pDevice, NULL, pAudioData, frameCount); if (frameCount > 0) {
ma_device_handle_backend_data_callback(pDevice, NULL, pAudioData, (ma_uint32)frameCount);
}
(void)pStream; (void)pStream;
return MA_AAUDIO_CALLBACK_RESULT_CONTINUE; return MA_AAUDIO_CALLBACK_RESULT_CONTINUE;
@@ -37747,7 +37749,14 @@ static ma_aaudio_data_callback_result_t ma_stream_data_callback_playback__aaudio
ma_device* pDevice = (ma_device*)pUserData; ma_device* pDevice = (ma_device*)pUserData;
MA_ASSERT(pDevice != NULL); MA_ASSERT(pDevice != NULL);
ma_device_handle_backend_data_callback(pDevice, pAudioData, NULL, frameCount); /*
I've had a report that AAudio can sometimes post a frame count of 0. We need to check for that here
so we don't get any errors at a deeper level. I'm doing the same with the capture side for safety,
though I've not yet had any reports about that one.
*/
if (frameCount > 0) {
ma_device_handle_backend_data_callback(pDevice, pAudioData, NULL, (ma_uint32)frameCount);
}
(void)pStream; (void)pStream;
return MA_AAUDIO_CALLBACK_RESULT_CONTINUE; return MA_AAUDIO_CALLBACK_RESULT_CONTINUE;
@@ -42635,6 +42644,15 @@ MA_API ma_result ma_device_handle_backend_data_callback(ma_device* pDevice, void
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
} }
/*
There is an assert deeper in the code that checks that frameCount > 0. Since this is a public facing
API we'll need to check for that here. I've had reports that AAudio can sometimes post a frame count
of 0.
*/
if (frameCount == 0) {
return MA_INVALID_ARGS;
}
if (pDevice->type == ma_device_type_duplex) { if (pDevice->type == ma_device_type_duplex) {
if (pInput != NULL) { if (pInput != NULL) {
ma_device__handle_duplex_callback_capture(pDevice, frameCount, pInput, &pDevice->duplexRB.rb); ma_device__handle_duplex_callback_capture(pDevice, frameCount, pInput, &pDevice->duplexRB.rb);