diff options
| -rw-r--r-- | src/pcm/PcmConvert.cxx | 23 | ||||
| -rw-r--r-- | src/pcm/PcmDsd.cxx | 21 | ||||
| -rw-r--r-- | src/pcm/PcmDsd.hxx | 7 |
3 files changed, 26 insertions, 25 deletions
diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/PcmConvert.cxx index f1e36ed4b..a350f4ad2 100644 --- a/src/pcm/PcmConvert.cxx +++ b/src/pcm/PcmConvert.cxx @@ -22,6 +22,7 @@ #include "PcmChannels.hxx" #include "PcmFormat.hxx" #include "AudioFormat.hxx" +#include "util/ConstBuffer.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" @@ -287,39 +288,39 @@ PcmConvert::Convert(const void *src, size_t src_size, size_t *dest_size_r, Error &error) { + ConstBuffer<void> buffer(src, src_size); + if (is_dsd) { - size_t f_size; - const float *f = dsd.ToFloat(src_format.channels, - false, (const uint8_t *)src, - src_size, &f_size); - if (f == nullptr) { + auto s = ConstBuffer<uint8_t>::FromVoid(buffer); + auto d = dsd.ToFloat(src_format.channels, + false, s); + if (d.IsNull()) { error.Set(pcm_convert_domain, "DSD to PCM conversion failed"); return nullptr; } - src = f; - src_size = f_size; + buffer = d.ToVoid(); } switch (dest_format.format) { case SampleFormat::S16: - return Convert16(src, src_size, + return Convert16(buffer.data, buffer.size, dest_size_r, error); case SampleFormat::S24_P32: - return Convert24(src, src_size, + return Convert24(buffer.data, buffer.size, dest_size_r, error); case SampleFormat::S32: - return Convert32(src, src_size, + return Convert32(buffer.data, buffer.size, dest_size_r, error); case SampleFormat::FLOAT: - return ConvertFloat(src, src_size, + return ConvertFloat(buffer.data, buffer.size, dest_size_r, error); diff --git a/src/pcm/PcmDsd.cxx b/src/pcm/PcmDsd.cxx index 22b3c7ba2..5952cad7c 100644 --- a/src/pcm/PcmDsd.cxx +++ b/src/pcm/PcmDsd.cxx @@ -21,6 +21,7 @@ #include "PcmDsd.hxx" #include "dsd2pcm/dsd2pcm.h" #include "util/Macros.hxx" +#include "util/ConstBuffer.hxx" #include <algorithm> @@ -46,22 +47,20 @@ PcmDsd::Reset() dsd2pcm_reset(dsd2pcm[i]); } -const float * +ConstBuffer<float> PcmDsd::ToFloat(unsigned channels, bool lsbfirst, - const uint8_t *src, size_t src_size, - size_t *dest_size_r) + ConstBuffer<uint8_t> src) { - assert(src != nullptr); - assert(src_size > 0); - assert(src_size % channels == 0); + assert(!src.IsNull()); + assert(!src.IsEmpty()); + assert(src.size % channels == 0); assert(channels <= ARRAY_SIZE(dsd2pcm)); - const unsigned num_samples = src_size; - const unsigned num_frames = src_size / channels; + const unsigned num_samples = src.size; + const unsigned num_frames = src.size / channels; float *dest; const size_t dest_size = num_samples * sizeof(*dest); - *dest_size_r = dest_size; dest = (float *)buffer.Get(dest_size); for (unsigned c = 0; c < channels; ++c) { @@ -72,9 +71,9 @@ PcmDsd::ToFloat(unsigned channels, bool lsbfirst, } dsd2pcm_translate(dsd2pcm[c], num_frames, - src + c, channels, + src.data + c, channels, lsbfirst, dest + c, channels); } - return dest; + return { dest, num_samples }; } diff --git a/src/pcm/PcmDsd.hxx b/src/pcm/PcmDsd.hxx index d807f8570..b9b6d51ee 100644 --- a/src/pcm/PcmDsd.hxx +++ b/src/pcm/PcmDsd.hxx @@ -25,6 +25,8 @@ #include <stdint.h> +template<typename T> struct ConstBuffer; + /** * Wrapper for the dsd2pcm library. */ @@ -39,9 +41,8 @@ public: void Reset(); - const float *ToFloat(unsigned channels, bool lsbfirst, - const uint8_t *src, size_t src_size, - size_t *dest_size_r); + ConstBuffer<float> ToFloat(unsigned channels, bool lsbfirst, + ConstBuffer<uint8_t> src); }; #endif |