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

decoder/vorbis: call TagHandler::OnAudioFormat()

Browse Source
This commit is contained in:
Max Kellermann 2018-07-06 12:41:38 +02:00
parent e152e843d8
commit 86a02871fc
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/decoder/plugins/VorbisDecoderPlugin.cxx
View File

@ -82,6 +82,14 @@ public:
bool Seek(uint64_t where_frame); bool Seek(uint64_t where_frame);
static AudioFormat CheckAudioFormat(const vorbis_info &vi) {
return ::CheckAudioFormat(vi.rate, sample_format, vi.channels);
}
AudioFormat CheckAudioFormat() const {
return CheckAudioFormat(vi);
}
private: private:
void InitVorbis() { void InitVorbis() {
vorbis_info_init(&vi); vorbis_info_init(&vi);
@ -164,7 +172,7 @@ VorbisDecoder::SubmitInit()
{ {
assert(!dsp_initialized); assert(!dsp_initialized);
audio_format = CheckAudioFormat(vi.rate, sample_format, vi.channels); audio_format = CheckAudioFormat(vi);
frame_size = audio_format.GetFrameSize(); frame_size = audio_format.GetFrameSize();
@ -402,6 +410,11 @@ vorbis_scan_stream(InputStream &is, TagHandler &handler) noexcept
VisitVorbisDuration(is, sync, stream, vi.rate, handler); VisitVorbisDuration(is, sync, stream, vi.rate, handler);
try {
handler.OnAudioFormat(VorbisDecoder::CheckAudioFormat(vi));
} catch (...) {
}
return true; return true;
} }