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

output/osx: merge some duplicate code

Browse Source
This commit is contained in:
Max Kellermann
2020-07-02 15:25:45 +02:00
parent bc9e074822
commit 6fed6e50e4
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -776,23 +776,31 @@ OSXOutput::Play(const void *chunk, size_t size)
started = true; started = true;
} }
ConstBuffer<uint8_t> input((const uint8_t *)chunk, size);
#ifdef ENABLE_DSD #ifdef ENABLE_DSD
if (dop_enabled) { if (dop_enabled) {
const auto e = pcm_export->Export({chunk, size}); input = ConstBuffer<uint8_t>::FromVoid(pcm_export->Export(input.ToVoid()));
/* the DoP (DSD over PCM) filter converts two frames /* the DoP (DSD over PCM) filter converts two frames
at a time and ignores the last odd frame; if there at a time and ignores the last odd frame; if there
was only one frame (e.g. the last frame in the was only one frame (e.g. the last frame in the
file), the result is empty; to avoid an endless file), the result is empty; to avoid an endless
loop, bail out here, and pretend the one frame has loop, bail out here, and pretend the one frame has
been played */ been played */
if (e.empty()) if (input.empty())
return size; return size;
size_t bytes_written = ring_buffer->push((const uint8_t *)e.data, e.size);
return pcm_export->CalcSourceSize(bytes_written);
} }
#endif #endif
return ring_buffer->push((const uint8_t *)chunk, size);
size_t bytes_written = ring_buffer->push(input.data, input.size);
#ifdef ENABLE_DSD
if (dop_enabled)
bytes_written = pcm_export->CalcSourceSize(bytes_written);
#endif
return bytes_written;
} }
std::chrono::steady_clock::duration std::chrono::steady_clock::duration