oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/wasapi: use class RingBuffer instead of boost::lockfree::spsc_queue

Browse Source
This commit is contained in:
Max Kellermann 2023-01-23 13:14:13 +01:00
parent 0b42018377
commit 01e5a7b1b5
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/output/plugins/wasapi/WasapiOutputPlugin.cxx
View File

@ -37,6 +37,7 @@
#include "thread/Thread.hxx" #include "thread/Thread.hxx"
#include "util/AllocatedString.hxx" #include "util/AllocatedString.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/RingBuffer.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include "win32/Com.hxx" #include "win32/Com.hxx"
@ -47,8 +48,6 @@
#include "Log.hxx" #include "Log.hxx"
#include "config.h" #include "config.h"
#include <boost/lockfree/spsc_queue.hpp>
#include <algorithm> #include <algorithm>
#include <cinttypes> #include <cinttypes>
#include <cmath> #include <cmath>
@ -193,7 +192,8 @@ class WasapiOutputThread {
std::atomic_bool occur = false; std::atomic_bool occur = false;
std::exception_ptr ptr = nullptr; std::exception_ptr ptr = nullptr;
} error; } error;
boost::lockfree::spsc_queue<BYTE> spsc_buffer;
RingBuffer<std::byte> ring_buffer;
public: public:
WasapiOutputThread(IAudioClient &_client, WasapiOutputThread(IAudioClient &_client,
@ -203,7 +203,7 @@ public:
:client(_client), :client(_client),
render_client(std::move(_render_client)), frame_size(_frame_size), render_client(std::move(_render_client)), frame_size(_frame_size),
buffer_size_in_frames(_buffer_size_in_frames), is_exclusive(_is_exclusive), buffer_size_in_frames(_buffer_size_in_frames), is_exclusive(_is_exclusive),
spsc_buffer(_buffer_size_in_frames * 4 * _frame_size) ring_buffer(_buffer_size_in_frames * 4 * _frame_size)
{ {
SetEventHandle(client, event.handle()); SetEventHandle(client, event.handle());
thread.Start(); thread.Start();
@ -230,9 +230,7 @@ public:
std::size_t Push(std::span<const std::byte> input) noexcept { std::size_t Push(std::span<const std::byte> input) noexcept {
empty.store(false); empty.store(false);
std::size_t consumed = std::size_t consumed = ring_buffer.WriteFrom(input);
spsc_buffer.push((const BYTE *)input.data(),
input.size());
if (!playing) { if (!playing) {
playing = true; playing = true;
@ -439,7 +437,7 @@ try {
event.Wait(); event.Wait();
if (cancel.load()) { if (cancel.load()) {
spsc_buffer.consume_all([](auto &&) {}); ring_buffer.Discard();
cancel.store(false); cancel.store(false);
empty.store(true); empty.store(true);
InterruptWaiter(); InterruptWaiter();
@ -498,8 +496,9 @@ try {
} }
const UINT32 write_size = write_in_frames * frame_size; const UINT32 write_size = write_in_frames * frame_size;
UINT32 new_data_size = 0; std::span w{data, write_size};
new_data_size = spsc_buffer.pop(data, write_size);
const std::size_t new_data_size = ring_buffer.ReadTo(std::as_writable_bytes(w));
if (new_data_size == 0) if (new_data_size == 0)
empty.store(true); empty.store(true);