Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-23 00:37:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[Audio] Tighten sink queue back pressure (#2840)

Browse source 
Co-authored-by: Ribbit <ribbit@placeholder.com>
Co-authored-by: MaranBr <maranbr@outlook.com>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2840
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Co-authored-by: Ribbit <ribbit@eden-emu.dev>
Co-committed-by: Ribbit <ribbit@eden-emu.dev>
This commit is contained in:
Ribbit 2025-10-28 04:26:58 +01:00 • committed by crueter
parent 3d4bb08cfc
commit 15becaa5a3
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/audio_core/sink/sink_stream.cpp
View file

@ -188,7 +188,7 @@ void SinkStream::ProcessAudioOutAndRender(std::span<s16> output_buffer, std::siz
} }
// Successfully dequeued a new buffer. // Successfully dequeued a new buffer.
{ {
std::unique_lock lk{release_mutex};\ std::unique_lock lk{release_mutex};
queued_buffers--; queued_buffers--;
} }
release_cv.notify_one(); release_cv.notify_one();
@ -237,9 +237,15 @@ u64 SinkStream::GetExpectedPlayedSampleCount() {
void SinkStream::WaitFreeSpace(std::stop_token stop_token) { void SinkStream::WaitFreeSpace(std::stop_token stop_token) {
std::unique_lock lk{release_mutex}; std::unique_lock lk{release_mutex};
release_cv.wait_for(lk, std::chrono::milliseconds(5), [this]() { return paused || queued_buffers < max_queue_size; });
if (queued_buffers > max_queue_size + 3) { const auto has_space = [this]() {
release_cv.wait(lk, stop_token, [this] { return paused || queued_buffers < max_queue_size; }); const u32 current_size = queued_buffers.load(std::memory_order_relaxed);
return paused || max_queue_size == 0 || current_size < max_queue_size;
};
if (!has_space()) {
// Wait until the queue falls below the configured limit or the stream is paused/stopped.
release_cv.wait(lk, stop_token, has_space);
} }
} }

2
src/audio_core/sink/sink_stream.h
View file

@ -240,7 +240,7 @@ private:
/// Ring buffer of the samples waiting to be played or consumed /// Ring buffer of the samples waiting to be played or consumed
Common::RingBuffer<s16, 0x10000> samples_buffer; Common::RingBuffer<s16, 0x10000> samples_buffer;
/// Audio buffers queued and waiting to play /// Audio buffers queued and waiting to play
Common::SPSCQueue<SinkBuffer, 0x40000> queue; Common::SPSCQueue<SinkBuffer, 0x10000> queue;
/// The currently-playing audio buffer /// The currently-playing audio buffer
SinkBuffer playing_buffer{}; SinkBuffer playing_buffer{};
/// The last played (or received) frame of audio, used when the callback underruns /// The last played (or received) frame of audio, used when the callback underruns