Merge pull request #5831 from raven02/patch-10

Use ctx->mp3Channels instead of setting frame.channel in case of FF inco...
This commit is contained in:
Henrik Rydgård 2014-04-10 15:04:50 +02:00
commit b262794a35

View File

@ -243,11 +243,8 @@ int sceMp3Decode(u32 mp3, u32 outPcmPtr) {
fclose(file);
}
#endif
// 2 bytes per channel and we have frame.channels in mp3 source
// learn japanese v0.9 frame.channels = 0
if (frame.channels == 0)
frame.channels = 2;
ctx->mp3SumDecodedSamples += bytesdecoded / (2 * frame.channels);
// 2 bytes per channel and we use ctx->mp3Channels here
ctx->mp3SumDecodedSamples += bytesdecoded / (2 * ctx->mp3Channels);
return bytesdecoded;
}