diff options
| author | Max Kellermann <max@musicpd.org> | 2017-01-11 22:33:37 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2017-01-11 22:47:12 +0100 |
| commit | 938affef32bc6a2ae7b6bdaa8b22330ebb06d1cd (patch) | |
| tree | ee87af2fb06cf2284b8003d63241a0a461df5b95 /src/pcm/PcmExport.cxx | |
| parent | a3c33000ee545028eaa711a9c503a8fab89eb82f (diff) | |
pcm/export: support DSD_U16
Diffstat (limited to 'src/pcm/PcmExport.cxx')
| -rw-r--r-- | src/pcm/PcmExport.cxx | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/pcm/PcmExport.cxx b/src/pcm/PcmExport.cxx index 6b4f625cc..6738ebada 100644 --- a/src/pcm/PcmExport.cxx +++ b/src/pcm/PcmExport.cxx @@ -25,6 +25,7 @@ #include "util/ConstBuffer.hxx" #ifdef ENABLE_DSD +#include "Dsd16.hxx" #include "Dsd32.hxx" #include "PcmDsd.hxx" #include "PcmDop.hxx" @@ -42,9 +43,15 @@ PcmExport::Open(SampleFormat sample_format, unsigned _channels, : SampleFormat::UNDEFINED; #ifdef ENABLE_DSD - assert(!params.dsd_u32 || !params.dop); + assert((params.dsd_u16 + params.dsd_u32 + params.dop) <= 1); assert(!params.dop || audio_valid_channel_count(_channels)); + dsd_u16 = params.dsd_u16 && sample_format == SampleFormat::DSD; + if (dsd_u16) + /* after the conversion to DSD_U16, the DSD samples + are stuffed inside fake 16 bit samples */ + sample_format = SampleFormat::S16; + dsd_u32 = params.dsd_u32 && sample_format == SampleFormat::DSD; if (dsd_u32) /* after the conversion to DSD_U32, the DSD samples @@ -83,6 +90,9 @@ PcmExport::GetFrameSize(const AudioFormat &audio_format) const return audio_format.channels * 3; #ifdef ENABLE_DSD + if (dsd_u16) + return channels * 2; + if (dsd_u32) return channels * 4; @@ -101,6 +111,11 @@ unsigned PcmExport::Params::CalcOutputSampleRate(unsigned sample_rate) const { #ifdef ENABLE_DSD + if (dsd_u16) + /* DSD_U16 combines two 8-bit "samples" in one 16-bit + "sample" */ + sample_rate /= 2; + if (dsd_u32) /* DSD_U32 combines four 8-bit "samples" in one 32-bit "sample" */ @@ -119,6 +134,9 @@ unsigned PcmExport::Params::CalcInputSampleRate(unsigned sample_rate) const { #ifdef ENABLE_DSD + if (dsd_u16) + sample_rate *= 2; + if (dsd_u32) sample_rate *= 4; @@ -137,6 +155,11 @@ PcmExport::Export(ConstBuffer<void> data) alsa_channel_order, channels); #ifdef ENABLE_DSD + if (dsd_u16) + data = Dsd8To16(dop_buffer, channels, + ConstBuffer<uint8_t>::FromVoid(data)) + .ToVoid(); + if (dsd_u32) data = Dsd8To32(dop_buffer, channels, ConstBuffer<uint8_t>::FromVoid(data)) |