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

decoder/faad: migrate from class Error to C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann 2016-11-10 12:15:49 +01:00
parent cfd51db229
commit 42a696873b
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/decoder/plugins/FaadDecoderPlugin.cxx
View File

@ -26,7 +26,6 @@
#include "tag/TagHandler.hxx"
#include "util/ScopeExit.hxx"
#include "util/ConstBuffer.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
@ -248,16 +247,16 @@ faad_decoder_new()
/**
* Wrapper for NeAACDecInit() which works around some API
* inconsistencies in libfaad.
*
* Throws #std::runtime_error on error.
*/
static bool
static void
faad_decoder_init(NeAACDecHandle decoder, DecoderBuffer &buffer,
AudioFormat &audio_format, Error &error)
AudioFormat &audio_format)
{
auto data = ConstBuffer<uint8_t>::FromVoid(buffer.Read());
if (data.IsEmpty()) {
error.Set(faad_decoder_domain, "Empty file");
return false;
}
if (data.IsEmpty())
throw std::runtime_error("Empty file");
uint8_t channels;
unsigned long sample_rate;
@ -266,16 +265,13 @@ faad_decoder_init(NeAACDecHandle decoder, DecoderBuffer &buffer,
const_cast<unsigned char *>(data.data),
data.size,
&sample_rate, &channels);
if (nbytes < 0) {
error.Set(faad_decoder_domain, "Not an AAC stream");
return false;
}
if (nbytes < 0)
throw std::runtime_error("Not an AAC stream");
buffer.Consume(nbytes);
audio_format = CheckAudioFormat(sample_rate, SampleFormat::S16,
channels);
return true;
}
/**
@ -317,9 +313,11 @@ faad_get_file_time(InputStream &is)
buffer.Fill();
AudioFormat audio_format;
if (faad_decoder_init(decoder, buffer, audio_format,
IgnoreError()))
try {
faad_decoder_init(decoder, buffer, audio_format);
recognized = true;
} catch (const std::runtime_error &e) {
}
}
return std::make_pair(recognized, duration);
@ -336,12 +334,8 @@ faad_stream_decode(Decoder &mpd_decoder, InputStream &is,
/* initialize it */
Error error;
AudioFormat audio_format;
if (!faad_decoder_init(decoder, buffer, audio_format, error)) {
LogError(error);
return;
}
faad_decoder_init(decoder, buffer, audio_format);
/* initialize the MPD core */