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

decoder/wavpack: add CheckAudioFormat(WavpackContext)

Browse Source
This commit is contained in:
Max Kellermann
2018-07-07 13:48:49 +02:00
parent 9cf43eef67
commit c236a85c13
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/decoder/plugins/WavpackDecoderPlugin.cxx
View File

@@ -186,12 +186,8 @@ wavpack_bits_to_sample_format(bool is_float,
} }
} }
/* static AudioFormat
* This does the main decoding thing. CheckAudioFormat(WavpackContext *wpc)
* Requires an already opened WavpackContext.
*/
static void
wavpack_decode(DecoderClient &client, WavpackContext *wpc, bool can_seek)
{ {
const bool is_float = (WavpackGetMode(wpc) & MODE_FLOAT) != 0; const bool is_float = (WavpackGetMode(wpc) & MODE_FLOAT) != 0;
#if defined(OPEN_DSD_AS_PCM) && defined(ENABLE_DSD) #if defined(OPEN_DSD_AS_PCM) && defined(ENABLE_DSD)
@@ -206,14 +202,24 @@ wavpack_decode(DecoderClient &client, WavpackContext *wpc, bool can_seek)
#endif #endif
WavpackGetBytesPerSample(wpc)); WavpackGetBytesPerSample(wpc));
auto audio_format = CheckAudioFormat(WavpackGetSampleRate(wpc), return CheckAudioFormat(WavpackGetSampleRate(wpc),
sample_format, sample_format,
WavpackGetReducedChannels(wpc)); WavpackGetReducedChannels(wpc));
}
/*
* This does the main decoding thing.
* Requires an already opened WavpackContext.
*/
static void
wavpack_decode(DecoderClient &client, WavpackContext *wpc, bool can_seek)
{
const auto audio_format = CheckAudioFormat(wpc);
auto *format_samples = format_samples_nop; auto *format_samples = format_samples_nop;
if (is_dsd) if (audio_format.format == SampleFormat::DSD)
format_samples = format_samples_int<uint8_t>; format_samples = format_samples_int<uint8_t>;
else if (!is_float) { else if (audio_format.format != SampleFormat::FLOAT) {
switch (WavpackGetBytesPerSample(wpc)) { switch (WavpackGetBytesPerSample(wpc)) {
case 1: case 1:
format_samples = format_samples_int<int8_t>; format_samples = format_samples_int<int8_t>;