Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 13:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] audio/pw: increase startup latency

Browse Source 
PipeWire startup latency varies wildly depending on what else is, or was
last using the audio device. In the worst case, PipeWire can request two
full buffers within a very short period of time immediately at the start of
playback, so make sure we've got enough data in the buffer to support this.
This commit is contained in:
Chris Spencer 2022-01-30 13:53:46 +00:00 committed by Geoffrey McRae
parent e1e60fdaa6
commit 05ca59ed48
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/audiodevs/PipeWire/pipewire.c
View File

@ -51,7 +51,7 @@ struct PipeWire
int sampleRate; int sampleRate;
int stride; int stride;
LG_AudioPullFn pullFn; LG_AudioPullFn pullFn;
int startFrames; int maxPeriodFrames;
StreamState state; StreamState state;
} }
@ -196,7 +196,7 @@ static void pipewire_playbackSetup(int channels, int sampleRate,
pw.playback.channels == channels && pw.playback.channels == channels &&
pw.playback.sampleRate == sampleRate) pw.playback.sampleRate == sampleRate)
{ {
*maxPeriodFrames = pw.playback.startFrames; *maxPeriodFrames = pw.playback.maxPeriodFrames;
return; return;
} }
@ -253,12 +253,12 @@ static void pipewire_playbackSetup(int channels, int sampleRate,
pw_stream_update_properties(pw.playback.stream, pw_stream_update_properties(pw.playback.stream,
&SPA_DICT_INIT_ARRAY(items)); &SPA_DICT_INIT_ARRAY(items));
pw.playback.startFrames = defaultLatencyFrames; pw.playback.maxPeriodFrames = defaultLatencyFrames;
} }
else else
pw.playback.startFrames = num; pw.playback.maxPeriodFrames = num;
*maxPeriodFrames = pw.playback.startFrames; *maxPeriodFrames = pw.playback.maxPeriodFrames;
if (!pw.playback.stream) if (!pw.playback.stream)
{ {
@ -301,8 +301,12 @@ static bool pipewire_playbackStart(int framesBuffered)
switch (pw.playback.state) switch (pw.playback.state)
{ {
case STREAM_STATE_INACTIVE: case STREAM_STATE_INACTIVE:
if (framesBuffered >= max(pw.playback.startFrames, // PipeWire startup latency varies wildly depending on what else is, or
pw.playback.sampleRate / 20)) //50ms // was last using the audio device. In the worst case, PipeWire can
// request two full buffers within a very short period of time
// immediately at the start of playback, so make sure we've got enough
// data in the buffer to support this
if (framesBuffered >= pw.playback.maxPeriodFrames * 2)
{ {
pw_stream_set_active(pw.playback.stream, true); pw_stream_set_active(pw.playback.stream, true);
pw.playback.state = STREAM_STATE_ACTIVE; pw.playback.state = STREAM_STATE_ACTIVE;