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

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

This commit is contained in:
Max Kellermann 2023-01-23 13:40:49 +01:00
parent 01e5a7b1b5
commit d0be122fc6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/output/plugins/OSXOutputPlugin.cxx
View File

@ -33,6 +33,7 @@
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include "util/ByteOrder.hxx" #include "util/ByteOrder.hxx"
#include "util/CharUtil.hxx" #include "util/CharUtil.hxx"
#include "util/RingBuffer.hxx"
#include "util/StringAPI.hxx" #include "util/StringAPI.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include "util/StringFormat.hxx" #include "util/StringFormat.hxx"
@ -42,7 +43,6 @@
#include <AudioUnit/AudioUnit.h> #include <AudioUnit/AudioUnit.h>
#include <AudioToolbox/AudioToolbox.h> #include <AudioToolbox/AudioToolbox.h>
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#include <boost/lockfree/spsc_queue.hpp>
#include <memory> #include <memory>
#include <span> #include <span>
@ -105,7 +105,8 @@ struct OSXOutput final : AudioOutput {
AudioComponentInstance au; AudioComponentInstance au;
AudioStreamBasicDescription asbd; AudioStreamBasicDescription asbd;
boost::lockfree::spsc_queue<std::byte> *ring_buffer; using RingBuffer = ::RingBuffer<std::byte>;
RingBuffer ring_buffer;
OSXOutput(const ConfigBlock &block); OSXOutput(const ConfigBlock &block);
@ -628,8 +629,7 @@ osx_render(void *vdata,
int count = in_number_frames * od->asbd.mBytesPerFrame; int count = in_number_frames * od->asbd.mBytesPerFrame;
buffer_list->mBuffers[0].mDataByteSize = buffer_list->mBuffers[0].mDataByteSize =
od->ring_buffer->pop((std::byte *)buffer_list->mBuffers[0].mData, od->ring_buffer.ReadTo({(std::byte *)buffer_list->mBuffers[0].mData, count});
count);
return noErr; return noErr;
} }
@ -687,7 +687,7 @@ OSXOutput::Close() noexcept
if (started) if (started)
AudioOutputUnitStop(au); AudioOutputUnitStop(au);
AudioUnitUninitialize(au); AudioUnitUninitialize(au);
delete ring_buffer; ring_buffer = {};
} }
void void
@ -772,7 +772,7 @@ OSXOutput::Open(AudioFormat &audio_format)
MPD_OSX_BUFFER_TIME_MS * pcm_export->GetOutputFrameSize() * asbd.mSampleRate / 1000); MPD_OSX_BUFFER_TIME_MS * pcm_export->GetOutputFrameSize() * asbd.mSampleRate / 1000);
} }
#endif #endif
ring_buffer = new boost::lockfree::spsc_queue<std::byte>(ring_buffer_size); ring_buffer = RingBuffer{ring_buffer_size};
pause = false; pause = false;
started = false; started = false;
@ -793,7 +793,7 @@ OSXOutput::Play(std::span<const std::byte> input)
} }
#endif #endif
size_t bytes_written = ring_buffer->push(input.data(), input.size()); size_t bytes_written = ring_buffer->WriteFrom(input);
if (!started) { if (!started) {
OSStatus status = AudioOutputUnitStart(au); OSStatus status = AudioOutputUnitStart(au);
@ -814,7 +814,7 @@ OSXOutput::Play(std::span<const std::byte> input)
std::chrono::steady_clock::duration std::chrono::steady_clock::duration
OSXOutput::Delay() const noexcept OSXOutput::Delay() const noexcept
{ {
return ring_buffer->write_available() && !pause return !ring_buffer.IsFull() && !pause
? std::chrono::steady_clock::duration::zero() ? std::chrono::steady_clock::duration::zero()
: std::chrono::milliseconds(MPD_OSX_BUFFER_TIME_MS / 4); : std::chrono::milliseconds(MPD_OSX_BUFFER_TIME_MS / 4);
} }
@ -839,7 +839,7 @@ OSXOutput::Cancel() noexcept
started = false; started = false;
} }
ring_buffer->reset(); ring_buffer.Clear();
#ifdef ENABLE_DSD #ifdef ENABLE_DSD
pcm_export->Reset(); pcm_export->Reset();
#endif #endif