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

pcm/export: move Open() parameters to struct Params

Browse Source
This commit is contained in:
Max Kellermann
2016-02-26 18:54:13 +01:00
parent d3f0b62348
commit f0f3017a76
5 changed files with 58 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pcm/PcmExport.cxx
View File

@@ -32,35 +32,33 @@
void
PcmExport::Open(SampleFormat sample_format, unsigned _channels,
bool _alsa_channel_order,
bool _dop, bool _shift8, bool _pack, bool _reverse_endian)
Params params)
{
assert(audio_valid_sample_format(sample_format));
channels = _channels;
alsa_channel_order = _alsa_channel_order
alsa_channel_order = params.alsa_channel_order
? sample_format
: SampleFormat::UNDEFINED;
#ifdef ENABLE_DSD
assert(!_dop || audio_valid_channel_count(_channels));
dop = _dop && sample_format == SampleFormat::DSD;
assert(!params.dop || audio_valid_channel_count(_channels));
dop = params.dop && sample_format == SampleFormat::DSD;
if (dop)
/* after the conversion to DoP, the DSD
samples are stuffed inside fake 24 bit samples */
sample_format = SampleFormat::S24_P32;
#else
(void)_channels;
(void)_dop;
#endif
shift8 = _shift8 && sample_format == SampleFormat::S24_P32;
pack24 = _pack && sample_format == SampleFormat::S24_P32;
shift8 = params.shift8 && sample_format == SampleFormat::S24_P32;
pack24 = params.pack24 && sample_format == SampleFormat::S24_P32;
assert(!shift8 || !pack24);
reverse_endian = 0;
if (_reverse_endian) {
if (params.reverse_endian) {
size_t sample_size = pack24
? 3
: sample_format_size(sample_format);

11
src/pcm/PcmExport.hxx
View File

@@ -33,6 +33,14 @@ template<typename T> struct ConstBuffer;
* representation which are not supported by the pcm_convert library.
*/
struct PcmExport {
struct Params {
bool alsa_channel_order = false;
bool dop = false;
bool shift8 = false;
bool pack24 = false;
bool reverse_endian = false;
};
/**
* This buffer is used to reorder channels.
*
@@ -117,8 +125,7 @@ struct PcmExport {
* @param channels the number of channels; ignored unless dop is set
*/
void Open(SampleFormat sample_format, unsigned channels,
bool _alsa_channel_order,
bool dop, bool shift8, bool pack, bool reverse_endian);
Params params);
/**
* Calculate the size of one output frame.