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

decoder/sndfile: add CheckAudioFormat(SF_INFO)

Browse Source
This commit is contained in:
Max Kellermann
2018-07-07 13:26:39 +02:00
parent 60821232b9
commit 479de9c7cb
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,6 +165,14 @@ sndfile_sample_format(const SF_INFO &info) noexcept
} }
} }
static AudioFormat
CheckAudioFormat(const SF_INFO &info)
{
return CheckAudioFormat(info.samplerate,
sndfile_sample_format(info),
info.channels);
}
static sf_count_t static sf_count_t
sndfile_read_frames(SNDFILE *sf, SampleFormat format, sndfile_read_frames(SNDFILE *sf, SampleFormat format,
void *buffer, sf_count_t n_frames) void *buffer, sf_count_t n_frames)
@@ -200,10 +208,7 @@ sndfile_stream_decode(DecoderClient &client, InputStream &is)
return; return;
} }
const auto audio_format = const auto audio_format = CheckAudioFormat(info);
CheckAudioFormat(info.samplerate,
sndfile_sample_format(info),
info.channels);
client.Ready(audio_format, info.seekable, sndfile_duration(info)); client.Ready(audio_format, info.seekable, sndfile_duration(info));