github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

rdpsnd/alsa: better buffer size against requested latency.

Browse Source
This commit is contained in:
Vic Lee 2011-09-25 13:41:38 +08:00
parent 7b2f737cee
commit c82dfa2a0b
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
channels/rdpsnd/alsa/rdpsnd_alsa.c
View File

@ -73,7 +73,12 @@ static void rdpsnd_alsa_set_params(rdpsndAlsaPlugin* alsa)
&alsa->actual_rate, NULL); &alsa->actual_rate, NULL);
snd_pcm_hw_params_set_channels_near(alsa->out_handle, hw_params, snd_pcm_hw_params_set_channels_near(alsa->out_handle, hw_params,
&alsa->actual_channels); &alsa->actual_channels);
frames = alsa->actual_rate * 4; if (alsa->latency < 0)
frames = alsa->actual_rate * 4; /* Default to 4-second buffer */
else
frames = alsa->latency * alsa->actual_rate * 2 / 1000; /* Double of the latency */
if (frames < alsa->actual_rate / 2)
frames = alsa->actual_rate / 2; /* Minimum 0.5-second buffer */
snd_pcm_hw_params_set_buffer_size_near(alsa->out_handle, hw_params, snd_pcm_hw_params_set_buffer_size_near(alsa->out_handle, hw_params,
&frames); &frames);
snd_pcm_hw_params(alsa->out_handle, hw_params); snd_pcm_hw_params(alsa->out_handle, hw_params);
@ -86,12 +91,10 @@ static void rdpsnd_alsa_set_params(rdpsndAlsaPlugin* alsa)
return; return;
} }
snd_pcm_sw_params_current(alsa->out_handle, sw_params); snd_pcm_sw_params_current(alsa->out_handle, sw_params);
if (alsa->latency < 0) if (alsa->latency == 0)
start_threshold = frames / 2; start_threshold = 0;
else else
start_threshold = alsa->latency * alsa->actual_rate / 1000; start_threshold = frames / 2;
if (start_threshold > frames)
start_threshold = frames;
snd_pcm_sw_params_set_start_threshold(alsa->out_handle, sw_params, start_threshold); snd_pcm_sw_params_set_start_threshold(alsa->out_handle, sw_params, start_threshold);
snd_pcm_sw_params(alsa->out_handle, sw_params); snd_pcm_sw_params(alsa->out_handle, sw_params);
snd_pcm_sw_params_free(sw_params); snd_pcm_sw_params_free(sw_params);