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

decoder: check audio_format_valid() in all decoders

Browse Source 
Refuse to play audio formats which are not supported by MPD.
This commit is contained in:
Max Kellermann
2008-11-21 20:27:30 +01:00
parent be9e60d55e
commit 976d5045c6
10 changed files with 71 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/decoder/audiofile_plugin.c
View File

@@ -77,19 +77,20 @@ audiofile_decode(struct decoder *decoder, const char *path)
audio_format.channels =
(uint8_t)afGetVirtualChannels(af_fp, AF_DEFAULT_TRACK);
if (!audio_format_valid(&audio_format)) {
g_warning("Invalid audio format: %u:%u:%u\n",
audio_format.sample_rate, audio_format.bits,
audio_format.channels);
afCloseFile(af_fp);
return;
}
frame_count = afGetFrameCount(af_fp, AF_DEFAULT_TRACK);
total_time = ((float)frame_count / (float)audio_format.sample_rate);
bitRate = (uint16_t)(st.st_size * 8.0 / total_time / 1000.0 + 0.5);
if (audio_format.bits != 8 && audio_format.bits != 16) {
g_warning("Only 8 and 16-bit files are supported. %s is %i-bit\n",
path, audio_format.bits);
afCloseFile(af_fp);
return;
}
fs = (int)afGetVirtualFrameSize(af_fp, AF_DEFAULT_TRACK, 1);
decoder_initialized(decoder, &audio_format, true, total_time);