libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-30 20:01:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Atrac: attempt to power through bad frames.

Browse Source
This commit is contained in:
Unknown W. Brackets 2015-10-10 20:23:34 -07:00
parent d30508ac43
commit 8fa843bbc3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/HLE/sceAtrac.cpp
View File

@ -102,6 +102,7 @@ enum AtracDecodeResult {
ATDECODE_FAILED = -1,
ATDECODE_FEEDME = 0,
ATDECODE_GOTFRAME = 1,
ATDECODE_BADFRAME = 2,
};
struct InputBuffer {
@ -387,8 +388,7 @@ struct Atrac {
ERROR_LOG(ME, "Unsupported feature in ATRAC audio.");
// Let's try the next packet.
packet->size = 0;
// TODO: Or actually, should we return a blank frame and pretend it worked?
return ATDECODE_FEEDME;
return ATDECODE_BADFRAME;
} else if (bytes_read < 0) {
ERROR_LOG_REPORT(ME, "avcodec_decode_audio4: Error decoding audio %d / %08x", bytes_read, bytes_read);
failedDecode = true;
@ -911,7 +911,7 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3
}
}
}
if (res == ATDECODE_GOTFRAME) {
if (res == ATDECODE_GOTFRAME || res == ATDECODE_BADFRAME) {
// We only want one frame per call, let's continue the next time.
break;
}
@ -2110,6 +2110,8 @@ static int sceAtracLowLevelDecode(int atracID, u32 sourceAddr, u32 sourceBytesCo
ERROR_LOG(ME, "swr_convert: Error while converting %d", avret);
}
break;
} else if (res == ATDECODE_BADFRAME) {
break;
}
}
}