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

decoder/audiofile: moved code to audiofile_setup_sample_format()

Browse Source
This commit is contained in:
Max Kellermann 2009-11-14 23:22:14 +01:00
parent 1dfadf4815
commit 2c1fb48318
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/decoder/audiofile_plugin.c
View File

@ -101,6 +101,25 @@ setup_virtual_fops(struct input_stream *stream)
return vf; return vf;
} }
static uint8_t
audiofile_setup_sample_format(AFfilehandle af_fp)
{
int fs, bits;
afGetSampleFormat(af_fp, AF_DEFAULT_TRACK, &fs, &bits);
if (!audio_valid_sample_format(bits)) {
g_debug("input file has %d bit samples, converting to 16",
bits);
bits = 16;
}
afSetVirtualSampleFormat(af_fp, AF_DEFAULT_TRACK,
AF_SAMPFMT_TWOSCOMP, bits);
afGetVirtualSampleFormat(af_fp, AF_DEFAULT_TRACK, &fs, &bits);
return bits;
}
static void static void
audiofile_stream_decode(struct decoder *decoder, struct input_stream *is) audiofile_stream_decode(struct decoder *decoder, struct input_stream *is)
{ {
@ -129,16 +148,7 @@ audiofile_stream_decode(struct decoder *decoder, struct input_stream *is)
return; return;
} }
afGetSampleFormat(af_fp, AF_DEFAULT_TRACK, &fs, &bits); bits = audiofile_setup_sample_format(af_fp);
if (!audio_valid_sample_format(bits)) {
g_debug("input file has %d bit samples, converting to 16",
bits);
bits = 16;
}
afSetVirtualSampleFormat(af_fp, AF_DEFAULT_TRACK,
AF_SAMPFMT_TWOSCOMP, bits);
afGetVirtualSampleFormat(af_fp, AF_DEFAULT_TRACK, &fs, &bits);
if (!audio_format_init_checked(&audio_format, if (!audio_format_init_checked(&audio_format,
afGetRate(af_fp, AF_DEFAULT_TRACK), afGetRate(af_fp, AF_DEFAULT_TRACK),