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

decoder/flac: improve warning message about unsupported bit depth

Browse Source
This commit is contained in:
Max Kellermann 2016-07-11 23:13:33 +02:00
parent d6ce2e3671
commit 1c818ef0a0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/decoder/plugins/FlacCommon.cxx
View File

@ -25,6 +25,7 @@
#include "FlacCommon.hxx" #include "FlacCommon.hxx"
#include "FlacMetadata.hxx" #include "FlacMetadata.hxx"
#include "FlacPcm.hxx" #include "FlacPcm.hxx"
#include "FlacDomain.hxx"
#include "CheckAudioFormat.hxx" #include "CheckAudioFormat.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Log.hxx" #include "Log.hxx"
@ -57,10 +58,18 @@ FlacDecoder::Initialize(unsigned sample_rate, unsigned bits_per_sample,
assert(!initialized); assert(!initialized);
assert(!unsupported); assert(!unsupported);
auto sample_format = flac_sample_format(bits_per_sample);
if (sample_format == SampleFormat::UNDEFINED) {
FormatWarning(flac_domain, "Unsupported FLAC bit depth: %u",
bits_per_sample);
unsupported = true;
return false;
}
::Error error; ::Error error;
if (!audio_format_init_checked(audio_format, if (!audio_format_init_checked(audio_format,
sample_rate, sample_rate,
flac_sample_format(bits_per_sample), sample_format,
channels, error)) { channels, error)) {
LogError(error); LogError(error);
unsupported = true; unsupported = true;