mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rdpsnd_pulse: Eliminate synchronous write loop

Browse Source 
Since complete sound frame is already available, just write it out to
pulseaudio stream using more efficient pa_stream_begin_write API.

This removes a few milliseconds of pure wait time from each play call and
makes audio playback a bit smoother.
This commit is contained in:
Igor V. Kovalenko 2023-11-01 20:27:43 +03:00 committed by akallabeth
parent d000d9e957
commit 087eb20431
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
channels/rdpsnd/client/pulse/rdpsnd_pulse.c
View File

@ -375,7 +375,7 @@ static BOOL rdpsnd_pulse_open(rdpsndDevicePlugin* device, const AUDIO_FORMAT* fo
if (pulse->latency > 0) if (pulse->latency > 0)
{ {
buffer_attr.maxlength = pa_usec_to_bytes(pulse->latency * 2 * 1000, &pulse->sample_spec); buffer_attr.maxlength = (UINT32)-1;
buffer_attr.tlength = pa_usec_to_bytes(pulse->latency * 1000, &pulse->sample_spec); buffer_attr.tlength = pa_usec_to_bytes(pulse->latency * 1000, &pulse->sample_spec);
buffer_attr.prebuf = (UINT32)-1; buffer_attr.prebuf = (UINT32)-1;
buffer_attr.minreq = (UINT32)-1; buffer_attr.minreq = (UINT32)-1;
@ -551,6 +551,7 @@ static BOOL rdpsnd_pulse_set_volume(rdpsndDevicePlugin* device, UINT32 value)
static UINT rdpsnd_pulse_play(rdpsndDevicePlugin* device, const BYTE* data, size_t size) static UINT rdpsnd_pulse_play(rdpsndDevicePlugin* device, const BYTE* data, size_t size)
{ {
size_t length; size_t length;
void* pa_data;
int status; int status;
pa_usec_t latency; pa_usec_t latency;
int negative; int negative;
@ -563,16 +564,16 @@ static UINT rdpsnd_pulse_play(rdpsndDevicePlugin* device, const BYTE* data, size
while (size > 0) while (size > 0)
{ {
while ((length = pa_stream_writable_size(pulse->stream)) == 0)
pa_threaded_mainloop_wait(pulse->mainloop);
if (length == (size_t)-1)
break;
if (length > size)
length = size; length = size;
status = pa_stream_write(pulse->stream, data, length, NULL, 0LL, PA_SEEK_RELATIVE); status = pa_stream_begin_write(pulse->stream, &pa_data, &length);
if (status < 0)
break;
memcpy(pa_data, data, length);
status = pa_stream_write(pulse->stream, pa_data, length, NULL, 0LL, PA_SEEK_RELATIVE);
if (status < 0) if (status < 0)
{ {