Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-11-12 14:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client/idd] audio: prevent recording transport stalls

Browse Source 
Give microphone data priority over replaceable clock feedback and
reduce feedback traffic on the shared client-to-host FIFO.

Retry short FIFO stalls outside the realtime thread and coalesce
consecutive packets in the existing fixed Windows buffers.

Avoid one broker write per tiny PipeWire quantum without adding
allocations or intentional capture latency.
This commit is contained in:
Geoffrey McRae
2026-09-05 07:55:23 +10:00
parent efc9952e74
commit 56f3305fe8
5 changed files with 116 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/audio.c
View File

@@ -74,7 +74,7 @@
#define PLAYBACK_DEVICE_RATE_STABLE_DELTA_PPM 50.0
#define PLAYBACK_DEVICE_RATE_MAX_ACQUIRE_SEC 20.0
#define PLAYBACK_MAX_SOURCE_PACKET_MS 100
#define PLAYBACK_FEEDBACK_INTERVAL_NS INT64_C(1000000)
#define PLAYBACK_FEEDBACK_INTERVAL_NS INT64_C(10000000)
#define PLAYBACK_FEEDBACK_FAILURE_NS INT64_C(100000000)
#define PLAYBACK_GRAPH_INTERVAL_NS INT64_C(25000000)

55
client/transports/LGMP/audio.c
View File

@@ -41,6 +41,8 @@
#define AUDIO_CLAIM_RETRY_US 200000U
#define AUDIO_OWNER_RETRY_US 1200000U
#define AUDIO_DRAIN_MAX 32U
#define AUDIO_CAPTURE_WRITE_TIMEOUT_US 5000U
#define AUDIO_CAPTURE_WRITE_MAX_WAIT_US 250U
#define AUDIO_CAPABILITIES \
(KVMFR_AUDIO_CAP_PLAYBACK | KVMFR_AUDIO_CAP_CAPTURE | \
@@ -2226,12 +2228,7 @@ static bool recordData(void * opaque, uint32_t generation,
if (!generation || !data || !frames ||
frames > KVMFR_AUDIO_MAX_FRAMES_PER_PACKET)
return false;
if (!tryWriteGate(audio))
{
atomic_store_explicit(
&audio->captureDiscontinuity, true, memory_order_release);
return false;
}
lockWriteGate(audio);
if (!audio->publicDataAllowed || !audio->writeBound ||
generation != audio->writeCaptureLocalGeneration ||
@@ -2271,10 +2268,43 @@ static bool recordData(void * opaque, uint32_t generation,
&audio->captureDiscontinuity, false, memory_order_acq_rel))
flags |= KVMFR_AUDIO_MESSAGE_DISCONTINUITY;
const enum WriteResult result = writeMessageLocked(audio,
enum WriteResult result = writeMessageLocked(audio,
KVMFR_AUDIO_MESSAGE_CAPTURE_DATA,
audio->writeCaptureGeneration, flags, position, timeNs, rateQ32,
(uint32_t)frames, data, (uint32_t)bytes);
if (result == WRITE_FULL)
{
LGMPStreamPollState streamPoll;
const LGMP_STATUS pollStatus = lgmpStreamPollInit(&streamPoll,
(struct LGMPStreamPollConfig)
{
.spinCount = 64U,
.minWaitUs = AUDIO_ACTIVE_POLL_US,
.maxWaitUs = AUDIO_CAPTURE_WRITE_MAX_WAIT_US,
});
DEBUG_ASSERT(pollStatus == LGMP_OK);
const uint64_t deadline =
microtime() + AUDIO_CAPTURE_WRITE_TIMEOUT_US;
while (result == WRITE_FULL && pollStatus == LGMP_OK)
{
const uint64_t now = microtime();
if (now >= deadline)
break;
uint32_t waitUs = lgmpStreamPollIdle(&streamPoll);
const uint64_t remainingUs = deadline - now;
if (waitUs > remainingUs)
waitUs = (uint32_t)remainingUs;
if (waitUs)
nsleep((uint64_t)waitUs * 1000U);
result = writeMessageLocked(audio,
KVMFR_AUDIO_MESSAGE_CAPTURE_DATA,
audio->writeCaptureGeneration, flags, position, timeNs, rateQ32,
(uint32_t)frames, data, (uint32_t)bytes);
}
}
if (result != WRITE_OK)
{
if (result == WRITE_FULL)
@@ -2298,11 +2328,7 @@ static bool clockFeedback(void * opaque, uint32_t generation,
return false;
if (!tryWriteGate(audio))
{
atomic_store_explicit(
&audio->captureDiscontinuity, true, memory_order_release);
return false;
}
LG_LOCK(audio->lock);
const bool supported = audio->phase == AUDIO_PHASE_BOUND &&
!audio->releaseRequested && audio->statusAvailable &&
@@ -2338,13 +2364,6 @@ static bool clockFeedback(void * opaque, uint32_t generation,
audio->writePlaybackGeneration, flags,
playbackClock->position, playbackClock->time, rateQ32, 0,
&feedback, sizeof(feedback));
if (result != WRITE_OK)
{
if (result == WRITE_FULL)
++audio->clientSequence;
atomic_store_explicit(
&audio->captureDiscontinuity, true, memory_order_release);
}
unlockWriteGate(audio);
return result == WRITE_OK;
}