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

PcmDsdUsb: use class ConstBuffer

Browse Source
This commit is contained in:
Max Kellermann 2014-08-12 21:38:36 +02:00
parent 0e756e4377
commit 069895d26b
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pcm/PcmDsdUsb.cxx
View File

@ -21,6 +21,7 @@
#include "PcmDsdUsb.hxx" #include "PcmDsdUsb.hxx"
#include "PcmBuffer.hxx" #include "PcmBuffer.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "util/ConstBuffer.hxx"
#include <assert.h> #include <assert.h>
@ -38,18 +39,16 @@ pcm_two_dsd_to_usb_marker2(uint8_t a, uint8_t b)
return 0xfffa0000 | (a << 8) | b; return 0xfffa0000 | (a << 8) | b;
} }
ConstBuffer<uint32_t>
const uint32_t *
pcm_dsd_to_usb(PcmBuffer &buffer, unsigned channels, pcm_dsd_to_usb(PcmBuffer &buffer, unsigned channels,
const uint8_t *src, size_t src_size, ConstBuffer<uint8_t> _src)
size_t *dest_size_r)
{ {
assert(audio_valid_channel_count(channels)); assert(audio_valid_channel_count(channels));
assert(src != nullptr); assert(!_src.IsNull());
assert(src_size > 0); assert(_src.size > 0);
assert(src_size % channels == 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; const unsigned num_src_frames = num_src_samples / channels;
/* this rounds down and discards the last odd frame; not /* 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_frames = num_src_frames / 2;
const unsigned num_samples = num_frames * channels; const unsigned num_samples = num_frames * channels;
const size_t dest_size = num_samples * 4; uint32_t *const dest0 = (uint32_t *)buffer.GetT<uint32_t>(num_samples),
*dest_size_r = dest_size;
uint32_t *const dest0 = (uint32_t *)buffer.Get(dest_size),
*dest = dest0; *dest = dest0;
auto src = _src.data;
for (unsigned i = num_frames / 2; i > 0; --i) { for (unsigned i = num_frames / 2; i > 0; --i) {
for (unsigned c = channels; c > 0; --c) { for (unsigned c = channels; c > 0; --c) {
/* each 24 bit sample has 16 DSD sample bits /* each 24 bit sample has 16 DSD sample bits
@ -94,5 +92,5 @@ pcm_dsd_to_usb(PcmBuffer &buffer, unsigned channels,
src += channels; src += channels;
} }
return dest0; return { dest0, num_samples };
} }

6
src/pcm/PcmDsdUsb.hxx
View File

@ -26,6 +26,7 @@
#include <stddef.h> #include <stddef.h>
class PcmBuffer; class PcmBuffer;
template<typename T> struct ConstBuffer;
/** /**
* Pack DSD 1 bit samples into (padded) 24 bit PCM samples for * Pack DSD 1 bit samples into (padded) 24 bit PCM samples for
@ -33,9 +34,8 @@ class PcmBuffer;
* dCS and others: * dCS and others:
* http://www.sonore.us/DoP_openStandard_1v1.pdf * http://www.sonore.us/DoP_openStandard_1v1.pdf
*/ */
const uint32_t * ConstBuffer<uint32_t>
pcm_dsd_to_usb(PcmBuffer &buffer, unsigned channels, pcm_dsd_to_usb(PcmBuffer &buffer, unsigned channels,
const uint8_t *src, size_t src_size, ConstBuffer<uint8_t> src);
size_t *dest_size_r);
#endif #endif

6
src/pcm/PcmExport.cxx
View File

@ -76,9 +76,9 @@ ConstBuffer<void>
PcmExport::Export(ConstBuffer<void> data) PcmExport::Export(ConstBuffer<void> data)
{ {
if (dsd_usb) if (dsd_usb)
data.data = pcm_dsd_to_usb(dsd_buffer, channels, data = pcm_dsd_to_usb(dsd_buffer, channels,
(const uint8_t *)data.data, ConstBuffer<uint8_t>::FromVoid(data))
data.size, &data.size); .ToVoid();
if (pack24) { if (pack24) {
const auto src = ConstBuffer<int32_t>::FromVoid(data); const auto src = ConstBuffer<int32_t>::FromVoid(data);