Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Mp3: Always output data in decode, except at end.

Browse source 
Turns out this doesn't return 0 until the end, even if there's no data
available to decode.  It just writes zeros in that case.
This commit is contained in:
Unknown W. Brackets 2019-04-28 11:57:59 -07:00
parent fde59c955d
commit 4b4c0f9bda
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Core/HW/SimpleAudioDec.cpp
View file

@ -332,7 +332,6 @@ u32 AuCtx::AuDecode(u32 pcmAddr) {
}
auto outbuf = Memory::GetPointer(PCMBuf);
memset(outbuf, 0, PCMBufSize); // important! empty outbuf to avoid noise
int outpcmbufsize = 0;
// Decode a single frame in sourcebuff and output into PCMBuf.
@ -342,7 +341,7 @@ u32 AuCtx::AuDecode(u32 pcmAddr) {
decoder->Decode(&sourcebuff[nextSync], (int)sourcebuff.size() - nextSync, outbuf, &outpcmbufsize);
if (outpcmbufsize == 0) {
// no output pcm, we are at the end of the stream
// Nothing was output, hopefully we're at the end of the stream.
AuBufAvailable = 0;
sourcebuff.clear();
} else {
@ -359,7 +358,8 @@ u32 AuCtx::AuDecode(u32 pcmAddr) {
}
}
if (sourcebuff.empty() && LoopNum != 0) {
bool end = readPos - AuBufAvailable >= (int64_t)endPos;
if (end && LoopNum != 0) {
// When looping, start the sum back off at zero and reset readPos to the start.
SumDecodedSamples = 0;
readPos = startPos;
@ -367,6 +367,14 @@ u32 AuCtx::AuDecode(u32 pcmAddr) {
LoopNum--;
}
if (outpcmbufsize == 0 && !end) {
outpcmbufsize = MaxOutputSample * 4;
memset(outbuf, 0, PCMBufSize);
} else if ((u32)outpcmbufsize < PCMBufSize) {
// TODO: We probably should use a rolling buffer instead.
memset(outbuf + outpcmbufsize, 0, PCMBufSize - outpcmbufsize);
}
Memory::Write_U32(PCMBuf, pcmAddr);
return outpcmbufsize;
}