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

Experimental improvements for the ALSA backend.

Browse Source
This commit is contained in:
David Reid
2019-08-26 19:51:39 +10:00
parent 14507ba617
commit bfb19f2938
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+2 -11
View File
@@ -13538,20 +13538,11 @@ ma_result ma_device_init_by_type__alsa(ma_context* pContext, const ma_device_con
return ma_post_error(pDevice, MA_LOG_LEVEL_ERROR, "[ALSA] Failed to initialize software parameters. snd_pcm_sw_params_current() failed.", MA_FAILED_TO_CONFIGURE_BACKEND_DEVICE); return ma_post_error(pDevice, MA_LOG_LEVEL_ERROR, "[ALSA] Failed to initialize software parameters. snd_pcm_sw_params_current() failed.", MA_FAILED_TO_CONFIGURE_BACKEND_DEVICE);
} }
if (deviceType == ma_device_type_capture) { if (((ma_snd_pcm_sw_params_set_avail_min_proc)pContext->alsa.snd_pcm_sw_params_set_avail_min)(pPCM, pSWParams, ma_prev_power_of_2(internalBufferSizeInFrames/internalPeriods)) != 0) {
if (((ma_snd_pcm_sw_params_set_avail_min_proc)pContext->alsa.snd_pcm_sw_params_set_avail_min)(pPCM, pSWParams, 1) != 0) {
ma_free(pSWParams); ma_free(pSWParams);
((ma_snd_pcm_close_proc)pDevice->pContext->alsa.snd_pcm_close)(pPCM); ((ma_snd_pcm_close_proc)pDevice->pContext->alsa.snd_pcm_close)(pPCM);
return ma_post_error(pDevice, MA_LOG_LEVEL_ERROR, "[ALSA] snd_pcm_sw_params_set_avail_min() failed.", MA_FORMAT_NOT_SUPPORTED); return ma_post_error(pDevice, MA_LOG_LEVEL_ERROR, "[ALSA] snd_pcm_sw_params_set_avail_min() failed.", MA_FORMAT_NOT_SUPPORTED);
} }
} else {
if (((ma_snd_pcm_sw_params_set_avail_min_proc)pContext->alsa.snd_pcm_sw_params_set_avail_min)(pPCM, pSWParams, 1) != 0) {
ma_free(pSWParams);
((ma_snd_pcm_close_proc)pDevice->pContext->alsa.snd_pcm_close)(pPCM);
return ma_post_error(pDevice, MA_LOG_LEVEL_ERROR, "[ALSA] snd_pcm_sw_params_set_avail_min() failed.", MA_FORMAT_NOT_SUPPORTED);
}
}
if (((ma_snd_pcm_sw_params_get_boundary_proc)pContext->alsa.snd_pcm_sw_params_get_boundary)(pSWParams, &bufferBoundary) < 0) { if (((ma_snd_pcm_sw_params_get_boundary_proc)pContext->alsa.snd_pcm_sw_params_get_boundary)(pSWParams, &bufferBoundary) < 0) {
bufferBoundary = internalBufferSizeInFrames; bufferBoundary = internalBufferSizeInFrames;
@@ -13564,7 +13555,7 @@ ma_result ma_device_init_by_type__alsa(ma_context* pContext, const ma_device_con
Subtle detail here with the start threshold. When in playback-only mode (no full-duplex) we can set the start threshold to Subtle detail here with the start threshold. When in playback-only mode (no full-duplex) we can set the start threshold to
the size of a period. But for full-duplex we need to set it such that it is at least two periods. the size of a period. But for full-duplex we need to set it such that it is at least two periods.
*/ */
if (((ma_snd_pcm_sw_params_set_start_threshold_proc)pContext->alsa.snd_pcm_sw_params_set_start_threshold)(pPCM, pSWParams, internalBufferSizeInFrames) != 0) { if (((ma_snd_pcm_sw_params_set_start_threshold_proc)pContext->alsa.snd_pcm_sw_params_set_start_threshold)(pPCM, pSWParams, (internalBufferSizeInFrames/internalPeriods)*2) != 0) {
ma_free(pSWParams); ma_free(pSWParams);
((ma_snd_pcm_close_proc)pDevice->pContext->alsa.snd_pcm_close)(pPCM); ((ma_snd_pcm_close_proc)pDevice->pContext->alsa.snd_pcm_close)(pPCM);
return ma_post_error(pDevice, MA_LOG_LEVEL_ERROR, "[ALSA] Failed to set start threshold for playback device. snd_pcm_sw_params_set_start_threshold() failed.", MA_FAILED_TO_CONFIGURE_BACKEND_DEVICE); return ma_post_error(pDevice, MA_LOG_LEVEL_ERROR, "[ALSA] Failed to set start threshold for playback device. snd_pcm_sw_params_set_start_threshold() failed.", MA_FAILED_TO_CONFIGURE_BACKEND_DEVICE);
tests/ma_duplex.c
+9 -3
View File
@@ -7,7 +7,7 @@
#define DR_WAV_IMPLEMENTATION #define DR_WAV_IMPLEMENTATION
#include "../extras/dr_wav.h" #include "../extras/dr_wav.h"
#define OUTPUT_WAV 1 #define OUTPUT_WAV 0
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
void main_loop__em() void main_loop__em()
@@ -63,11 +63,12 @@ int main(int argc, char** argv)
#endif #endif
ma_backend backend = ma_backend_winmm; ma_backend backend = ma_backend_alsa;
ma_context_config contextConfig = ma_context_config_init(); ma_context_config contextConfig = ma_context_config_init();
contextConfig.logCallback = log_callback; contextConfig.logCallback = log_callback;
contextConfig.alsa.useVerboseDeviceEnumeration = MA_TRUE; contextConfig.alsa.useVerboseDeviceEnumeration = MA_TRUE;
contextConfig.threadPriority = ma_thread_priority_realtime;
ma_context context; ma_context context;
result = ma_context_init(&backend, 1, &contextConfig, &context); result = ma_context_init(&backend, 1, &contextConfig, &context);
@@ -107,13 +108,15 @@ int main(int argc, char** argv)
deviceConfig.playback.format = ma_format_s16; deviceConfig.playback.format = ma_format_s16;
deviceConfig.playback.channels = 2; deviceConfig.playback.channels = 2;
deviceConfig.playback.shareMode = ma_share_mode_shared; deviceConfig.playback.shareMode = ma_share_mode_shared;
deviceConfig.sampleRate = 50000; deviceConfig.sampleRate = 0;
//deviceConfig.bufferSizeInMilliseconds = 60; //deviceConfig.bufferSizeInMilliseconds = 60;
deviceConfig.bufferSizeInFrames = 4096; deviceConfig.bufferSizeInFrames = 4096;
//deviceConfig.periods = 3; //deviceConfig.periods = 3;
deviceConfig.dataCallback = data_callback; deviceConfig.dataCallback = data_callback;
deviceConfig.stopCallback = stop_callback; deviceConfig.stopCallback = stop_callback;
#if defined(OUTPUT_WAV) && OUTPUT_WAV==1
deviceConfig.pUserData = &wav; deviceConfig.pUserData = &wav;
#endif
ma_device device; ma_device device;
result = ma_device_init(&context, &deviceConfig, &device); result = ma_device_init(&context, &deviceConfig, &device);
@@ -135,7 +138,10 @@ int main(int argc, char** argv)
#endif #endif
ma_device_uninit(&device); ma_device_uninit(&device);
#if defined(OUTPUT_WAV) && OUTPUT_WAV==1
drwav_uninit(&wav); drwav_uninit(&wav);
#endif
(void)argc; (void)argc;
(void)argv; (void)argv;