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

CheckAudioFormat: migrate from class Error to C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann
2016-11-10 11:45:17 +01:00
parent 12f11c97ae
commit cfd51db229
22 changed files with 98 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@@ -40,7 +40,6 @@
#include "CheckAudioFormat.hxx"
#include "util/ScopeExit.hxx"
#include "util/ConstBuffer.hxx"
#include "util/Error.hxx"
#include "LogV.hxx"
extern "C" {
@@ -666,15 +665,9 @@ FfmpegDecode(Decoder &decoder, InputStream &input,
return;
}
Error error;
AudioFormat audio_format;
if (!audio_format_init_checked(audio_format,
codec_params.sample_rate,
sample_format,
codec_params.channels, error)) {
LogError(error);
return;
}
const auto audio_format = CheckAudioFormat(codec_params.sample_rate,
sample_format,
codec_params.channels);
/* the audio format must be read from AVCodecContext by now,
because avcodec_open() has been demonstrated to fill bogus