Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-08-10 09:11:31 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[client] audio: recover immediately from provider underruns

Browse Source 
Treat a negative provider-controlled playback ring as a timeline
discontinuity rather than carrying its underrun debt.

Rebase to the normal low-water target and reset feedback correction so
guest stalls resume at low latency instead of discarding audio for
seconds.
This commit is contained in:
Geoffrey McRae
2026-08-10 05:29:16 +10:00
parent 73b15e4723
commit d660574a93
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/src/audio.c
View File

@@ -1525,7 +1525,16 @@ static void playbackData(const void * data, size_t frameCount,
inputFrames = sourceData->framesIn; inputFrames = sourceData->framesIn;
} }
bool discontinuity = sourceClock && sourceClock->discontinuity; const bool providerRateControl =
audio.playback.rateControl == PLAYBACK_RATE_PROVIDER;
/* Do not carry an underrun as buffer debt. Provider feedback is bounded,
* so repaying a guest stall by rate correction would discard resumed audio
* for many seconds. Rebase at the first packet instead. */
const bool providerUnderrun =
providerRateControl && playbackGetState() == STREAM_STATE_RUN &&
ringbuffer_getCount(audio.playback.buffer) < 0;
bool discontinuity =
providerUnderrun || (sourceClock && sourceClock->discontinuity);
const int64_t packetTime = const int64_t packetTime =
playbackMapMediaTime(sourceData, sourceClock, frames, playbackMapMediaTime(sourceData, sourceClock, frames,
audio.playback.sampleRate, now, &discontinuity); audio.playback.sampleRate, now, &discontinuity);
@@ -1556,8 +1565,6 @@ static void playbackData(const void * data, size_t frameCount,
const bool sourceRateWasValid = const bool sourceRateWasValid =
sourceData->sourceRateValid; sourceData->sourceRateValid;
const bool providerRateControl =
audio.playback.rateControl == PLAYBACK_RATE_PROVIDER;
const int64_t sourceRateTimeMs = providerRateControl ? const int64_t sourceRateTimeMs = providerRateControl ?
(now - sourceData->mediaLocalOrigin) / INT64_C(1000000) : (now - sourceData->mediaLocalOrigin) / INT64_C(1000000) :
sourceData->mediaTimeMs; sourceData->mediaTimeMs;
@@ -1719,6 +1726,11 @@ static void playbackData(const void * data, size_t frameCount,
sourceData->offsetError = 0.0; sourceData->offsetError = 0.0;
sourceData->offsetErrorIntegral = 0.0; sourceData->offsetErrorIntegral = 0.0;
sourceData->ratioIntegral = 0.0; sourceData->ratioIntegral = 0.0;
if (providerUnderrun)
{
sourceData->lastRatio = 1.0;
sourceData->nextFeedbackTime = 0;
}
playbackSetState(STREAM_STATE_RUN); playbackSetState(STREAM_STATE_RUN);
} }
else if ((discontinuity || else if ((discontinuity ||