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

some more work on organizing code for resampling/audioFormat conversion

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@968 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-05-10 12:35:18 +00:00
parent cd3180c701
commit 2ec1c5ff3c
17 changed files with 100 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mp3_decode.c
+5 -3
View File
@@ -523,7 +523,7 @@ void initAudioFormatFromMp3DecodeData(mp3DecodeData * data, AudioFormat * af) {
af->channels = MAD_NCHANNELS(&(data->frame).header);
}
int mp3_decode(OutputBuffer * cb, AudioFormat * af, DecoderControl * dc) {
int mp3_decode(OutputBuffer * cb, DecoderControl * dc) {
mp3DecodeData data;
if(openMp3(dc->file,&data) < 0) {
@@ -531,8 +531,10 @@ int mp3_decode(OutputBuffer * cb, AudioFormat * af, DecoderControl * dc) {
return -1;
}
initAudioFormatFromMp3DecodeData(&data,af);
cb->totalTime = data.totalTime;
initAudioFormatFromMp3DecodeData(&data, &(dc->audioFormat));
getOutputAudioFormat(&(dc->audioFormat), &(cb->audioFormat));
dc->totalTime = data.totalTime;
dc->start = 0;
dc->state = DECODE_STATE_DECODE;