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

Fix an edge case where the newly re-routed stream gets disconnected and fails to start. Re-routing (again) solves this very rare error.

Browse Source
This commit is contained in:
znakeeye
2024-12-30 17:08:17 +01:00
committed by David Reid
parent 1b6d634299
commit 546e23c0fb
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+26 -14
View File
@@ -37735,11 +37735,26 @@ static ma_aaudio_allowed_capture_policy_t ma_to_allowed_capture_policy__aaudio(m
return MA_AAUDIO_ALLOW_CAPTURE_BY_ALL; return MA_AAUDIO_ALLOW_CAPTURE_BY_ALL;
} }
static void ma_stream_error_callback__aaudio(ma_AAudioStream* pStream, void* pUserData, ma_aaudio_result_t error) static void ma_post_reroute_job__aaudio(ma_device* pDevice, ma_device_type deviceType)
{ {
ma_result result; ma_result result;
ma_job job; ma_job job;
job = ma_job_init(MA_JOB_TYPE_DEVICE_AAUDIO_REROUTE);
job.data.device.aaudio.reroute.pDevice = pDevice;
job.data.device.aaudio.reroute.deviceType = deviceType;
result = ma_device_job_thread_post(&pDevice->pContext->aaudio.jobThread, &job);
if (result != MA_SUCCESS) {
ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Device Disconnected. Failed to post job for rerouting.\n");
}
}
static void ma_stream_error_callback__aaudio(ma_AAudioStream* pStream, void* pUserData, ma_aaudio_result_t error)
{
ma_device* pDevice = (ma_device*)pUserData; ma_device* pDevice = (ma_device*)pUserData;
ma_device_type deviceType;
MA_ASSERT(pDevice != NULL); MA_ASSERT(pDevice != NULL);
(void)error; (void)error;
@@ -37751,21 +37766,13 @@ static void ma_stream_error_callback__aaudio(ma_AAudioStream* pStream, void* pUs
we cannot do this from the error callback. Therefore we are going to use an event thread for the AAudio backend to do this we cannot do this from the error callback. Therefore we are going to use an event thread for the AAudio backend to do this
cleanly and safely. cleanly and safely.
*/ */
job = ma_job_init(MA_JOB_TYPE_DEVICE_AAUDIO_REROUTE);
job.data.device.aaudio.reroute.pDevice = pDevice;
if (pStream == pDevice->aaudio.pStreamCapture) { if (pStream == pDevice->aaudio.pStreamCapture) {
job.data.device.aaudio.reroute.deviceType = ma_device_type_capture; deviceType = ma_device_type_capture;
} } else {
else { deviceType = ma_device_type_playback;
job.data.device.aaudio.reroute.deviceType = ma_device_type_playback;
} }
result = ma_device_job_thread_post(&pDevice->pContext->aaudio.jobThread, &job); ma_post_reroute_job__aaudio(pDevice, deviceType);
if (result != MA_SUCCESS) {
ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Device Disconnected. Failed to post job for rerouting.\n");
return;
}
} }
static ma_aaudio_data_callback_result_t ma_stream_data_callback_capture__aaudio(ma_AAudioStream* pStream, void* pUserData, void* pAudioData, int32_t frameCount) static ma_aaudio_data_callback_result_t ma_stream_data_callback_capture__aaudio(ma_AAudioStream* pStream, void* pUserData, void* pAudioData, int32_t frameCount)
@@ -38388,7 +38395,12 @@ static ma_result ma_device_reinit__aaudio(ma_device* pDevice, ma_device_type dev
/* If the device is started, start the streams. Maybe make this configurable? */ /* If the device is started, start the streams. Maybe make this configurable? */
if (ma_device_get_state(pDevice) == ma_device_state_started) { if (ma_device_get_state(pDevice) == ma_device_state_started) {
if (pDevice->aaudio.noAutoStartAfterReroute == MA_FALSE) { if (pDevice->aaudio.noAutoStartAfterReroute == MA_FALSE) {
ma_device_start__aaudio(pDevice); result = ma_device_start__aaudio(pDevice);
if (result != MA_SUCCESS) {
ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_INFO, "[AAudio] Failed to start stream after route change.");
ma_post_reroute_job__aaudio(pDevice, deviceType); /* Bad luck! We got disconnected again. Retry re-routing! */
return result;
}
} else { } else {
ma_device_stop(pDevice); /* Do a full device stop so we set internal state correctly. */ ma_device_stop(pDevice); /* Do a full device stop so we set internal state correctly. */
} }