pcm/PcmConvert: add AudioFormat parameters

Don't use src_format.  In the middle of Convert(), the current
AudioFormat has already been modified, it's now something in between
src_format and dest_format.  This simplifies keeping track of what
remains to be done.
This commit is contained in:
Max Kellermann
2013-11-30 13:00:41 +01:00
parent 3c0c939689
commit 3a666702af
2 changed files with 53 additions and 53 deletions

View File

@@ -52,13 +52,6 @@ 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();
@@ -92,10 +85,18 @@ public:
Error &error);
private:
ConstBuffer<int16_t> Convert16(ConstBuffer<void> src, Error &error);
ConstBuffer<int32_t> Convert24(ConstBuffer<void> src, Error &error);
ConstBuffer<int32_t> Convert32(ConstBuffer<void> src, Error &error);
ConstBuffer<float> ConvertFloat(ConstBuffer<void> src, Error &error);
ConstBuffer<int16_t> Convert16(ConstBuffer<void> src,
AudioFormat format,
Error &error);
ConstBuffer<int32_t> Convert24(ConstBuffer<void> src,
AudioFormat format,
Error &error);
ConstBuffer<int32_t> Convert32(ConstBuffer<void> src,
AudioFormat format,
Error &error);
ConstBuffer<float> ConvertFloat(ConstBuffer<void> src,
AudioFormat format,
Error &error);
};
extern const Domain pcm_convert_domain;