diff options
| -rw-r--r-- | src/pcm/PcmDsdUsb.cxx | 22 | ||||
| -rw-r--r-- | src/pcm/PcmDsdUsb.hxx | 6 | ||||
| -rw-r--r-- | src/pcm/PcmExport.cxx | 6 |
3 files changed, 16 insertions, 18 deletions
diff --git a/src/pcm/PcmDsdUsb.cxx b/src/pcm/PcmDsdUsb.cxx index a42b03e64..9b854ad07 100644 --- a/src/pcm/PcmDsdUsb.cxx +++ b/src/pcm/PcmDsdUsb.cxx @@ -21,6 +21,7 @@ #include "PcmDsdUsb.hxx" #include "PcmBuffer.hxx" #include "AudioFormat.hxx" +#include "util/ConstBuffer.hxx" #include <assert.h> @@ -38,18 +39,16 @@ pcm_two_dsd_to_usb_marker2(uint8_t a, uint8_t b) return 0xfffa0000 | (a << 8) | b; } - -const uint32_t * +ConstBuffer<uint32_t> pcm_dsd_to_usb(PcmBuffer &buffer, unsigned channels, - const uint8_t *src, size_t src_size, - size_t *dest_size_r) + ConstBuffer<uint8_t> _src) { assert(audio_valid_channel_count(channels)); - assert(src != nullptr); - assert(src_size > 0); - assert(src_size % channels == 0); + assert(!_src.IsNull()); + assert(_src.size > 0); + assert(_src.size % channels == 0); - const unsigned num_src_samples = src_size; + const unsigned num_src_samples = _src.size; const unsigned num_src_frames = num_src_samples / channels; /* this rounds down and discards the last odd frame; not @@ -57,11 +56,10 @@ pcm_dsd_to_usb(PcmBuffer &buffer, unsigned channels, const unsigned num_frames = num_src_frames / 2; const unsigned num_samples = num_frames * channels; - const size_t dest_size = num_samples * 4; - *dest_size_r = dest_size; - uint32_t *const dest0 = (uint32_t *)buffer.Get(dest_size), + uint32_t *const dest0 = (uint32_t *)buffer.GetT<uint32_t>(num_samples), *dest = dest0; + auto src = _src.data; for (unsigned i = num_frames / 2; i > 0; --i) { for (unsigned c = channels; c > 0; --c) { /* each 24 bit sample has 16 DSD sample bits @@ -94,5 +92,5 @@ pcm_dsd_to_usb(PcmBuffer &buffer, unsigned channels, src += channels; } - return dest0; + return { dest0, num_samples }; } diff --git a/src/pcm/PcmDsdUsb.hxx b/src/pcm/PcmDsdUsb.hxx index bb31d2d45..5e05c009b 100644 --- a/src/pcm/PcmDsdUsb.hxx +++ b/src/pcm/PcmDsdUsb.hxx @@ -26,6 +26,7 @@ #include <stddef.h> class PcmBuffer; +template<typename T> struct ConstBuffer; /** * Pack DSD 1 bit samples into (padded) 24 bit PCM samples for @@ -33,9 +34,8 @@ class PcmBuffer; * dCS and others: * http://www.sonore.us/DoP_openStandard_1v1.pdf */ -const uint32_t * +ConstBuffer<uint32_t> pcm_dsd_to_usb(PcmBuffer &buffer, unsigned channels, - const uint8_t *src, size_t src_size, - size_t *dest_size_r); + ConstBuffer<uint8_t> src); #endif diff --git a/src/pcm/PcmExport.cxx b/src/pcm/PcmExport.cxx index e04a7fdd9..26644a71a 100644 --- a/src/pcm/PcmExport.cxx +++ b/src/pcm/PcmExport.cxx @@ -76,9 +76,9 @@ ConstBuffer<void> PcmExport::Export(ConstBuffer<void> data) { if (dsd_usb) - data.data = pcm_dsd_to_usb(dsd_buffer, channels, - (const uint8_t *)data.data, - data.size, &data.size); + data = pcm_dsd_to_usb(dsd_buffer, channels, + ConstBuffer<uint8_t>::FromVoid(data)) + .ToVoid(); if (pack24) { const auto src = ConstBuffer<int32_t>::FromVoid(data); |