pcm/Export: DSD_U32 quarters the sample rate

DSD_U32 packs four bytes instead of one large "sample", thus the sample rate is one quarter of the input sample rate. This fixes a rather critical DSD_U32 playback problem.

pcm/Export: DSD_U32 quarters the sample rate
2b43ceb6 · Max Kellermann · c143adba · 2b43ceb6 · 2b43ceb6 · 2b43ceb6
Commit 2b43ceb6 authored Jan 11, 2017 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 17 additions and 0 deletions

NEWS NEWS +2 -0

PcmExport.cxx src/pcm/PcmExport.cxx +12 -0

test_pcm_export.cxx test/test_pcm_export.cxx +3 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.20.2 (not yet released)
 * decoder
  - flac: add options "probesize" and "analyzeduration"
+* output
+  - alsa: fix the DSD_U32 sample rate

 ver 0.20.1 (2017/01/09)
 * input

--- a/src/pcm/PcmExport.cxx
+++ b/src/pcm/PcmExport.cxx
@@ -101,12 +101,24 @@ PcmExport::GetFrameSize(const AudioFormat &audio_format) const
 unsigned
 PcmExport::Params::CalcOutputSampleRate(unsigned sample_rate) const
 {
+#ifdef ENABLE_DSD
+	if (dsd_u32)
+		/* DSD_U32 combines four 8-bit "samples" in one 32-bit
+		   "sample" */
+		sample_rate /= 4;
+#endif
+
 	return sample_rate;
 }

 unsigned
 PcmExport::Params::CalcInputSampleRate(unsigned sample_rate) const
 {
+#ifdef ENABLE_DSD
+	if (dsd_u32)
+		sample_rate *= 4;
+#endif
+
 	return sample_rate;
 }


--- a/test/test_pcm_export.cxx
+++ b/test/test_pcm_export.cxx
@@ -146,6 +146,9 @@ PcmExportTest::TestDsdU32()
 	PcmExport::Params params;
 	params.dsd_u32 = true;

+	CPPUNIT_ASSERT_EQUAL(params.CalcOutputSampleRate(705600u), 176400u);
+	CPPUNIT_ASSERT_EQUAL(params.CalcInputSampleRate(176400u), 705600u);
+
 	PcmExport e;
 	e.Open(SampleFormat::DSD, 2, params);