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

PcmConvert: fix src_format corruption when converting from DSD 

Method PcmConvert::Convert() modifies the src_format variable.  This
used to be a parameter, however commit d2679f59c made it an attribute
instead.  The modification to src_format persisted, and the next call
would return garbage.
This commit is contained in:
Max Kellermann 2013-11-28 18:43:33 +01:00
parent bb288f0284
commit a788b7e747
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pcm/PcmConvert.cxx
View File

@ -56,6 +56,10 @@ PcmConvert::Open(AudioFormat _src_format, AudioFormat _dest_format,
src_format = _src_format;
dest_format = _dest_format;
is_dsd = src_format.format == SampleFormat::DSD;
if (is_dsd)
src_format.format = SampleFormat::FLOAT;
return true;
}
@ -277,8 +281,7 @@ PcmConvert::Convert(const void *src, size_t src_size,
size_t *dest_size_r,
Error &error)
{
AudioFormat float_format;
if (src_format.format == SampleFormat::DSD) {
if (is_dsd) {
size_t f_size;
const float *f = dsd.ToFloat(src_format.channels,
false, (const uint8_t *)src,
@ -289,10 +292,6 @@ PcmConvert::Convert(const void *src, size_t src_size,
return nullptr;
}
float_format = src_format;
float_format.format = SampleFormat::FLOAT;
src_format = float_format;
src = f;
src_size = f_size;
}

7
src/pcm/PcmConvert.hxx
View File

@ -51,6 +51,13 @@ class PcmConvert {
AudioFormat src_format, dest_format;
/**
* Do we get DSD source data? Then this flag is true and
* src_format.format is set to SampleFormat::FLOAT, because
* the #PcmDsd class will convert it to floating point.
*/
bool is_dsd;
public:
PcmConvert();
~PcmConvert();