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: Align CheckStreamDataNeeded with InfoToAdd.

Browse source 
May cause problems if they don't match.
This commit is contained in:
Unknown W. Brackets 2019-04-23 20:42:13 -07:00
parent f1eaf9dc0e
commit f9863c3be2
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Core/HW/SimpleAudioDec.cpp
View file

@ -383,15 +383,28 @@ u32 AuCtx::AuSetLoopNum(int loop)
}
// return 1 to read more data stream, 0 don't read
int AuCtx::AuCheckStreamDataNeeded()
{
// if we have no available Au buffer, and the current read position in source file is not the end of stream, then we can read
if (AuBufAvailable < (int)AuBufSize && readPos < (int)endPos){
int AuCtx::AuCheckStreamDataNeeded() {
// If we would ask for bytes, then some are needed.
if (AuStreamBytesNeeded() != 0) {
return 1;
}
return 0;
}
int AuCtx::AuStreamBytesNeeded() {
if (audioType == PSP_CODEC_MP3) {
// The endPos and readPos are not considered, except when you've read to the end.
if (readPos >= endPos)
return 0;
// Account for the workarea.
int offset = 0x05c0;
return (int)AuBufSize - AuBufAvailable - offset;
}
// TODO: Untested. Maybe similar to MP3.
return std::min((int)AuBufSize - AuBufAvailable, (int)endPos - readPos);
}
// check how many bytes we have read from source file
u32 AuCtx::AuNotifyAddStreamData(int size) {
if (askedReadSize != 0) {
@ -427,24 +440,16 @@ u32 AuCtx::AuNotifyAddStreamData(int size) {
// read from stream position srcPos of size bytes into buff
// buff, size and srcPos are all pointers
u32 AuCtx::AuGetInfoToAddStreamData(u32 bufPtr, u32 sizePtr, u32 srcPosPtr) {
int readsize;
int readsize = AuStreamBytesNeeded();
int offset = 0;
if (audioType == PSP_CODEC_MP3) {
// Account for the workarea.
offset = 0x05c0;
// The endPos and readPos are not considered, except when you've read to the end.
readsize = (int)AuBufSize - AuBufAvailable - offset;
if (readPos >= endPos)
readsize = 0;
} else {
// TODO: Untested. Maybe similar to MP3.
readsize = std::min((int)AuBufSize - AuBufAvailable, (int)endPos - readPos);
}
// we can recharge AuBuf from its beginning
if (readsize != 0) {
if (Memory::IsValidAddress(bufPtr))
Memory::Write_U32(AuBuf, bufPtr);
Memory::Write_U32(AuBuf + offset, bufPtr);
if (Memory::IsValidAddress(sizePtr))
Memory::Write_U32(readsize, sizePtr);
if (Memory::IsValidAddress(srcPosPtr))

1
Core/HW/SimpleAudioDec.h
View file

@ -99,6 +99,7 @@ public:
u32 AuNotifyAddStreamData(int size);
int AuCheckStreamDataNeeded();
int AuStreamBytesNeeded();
u32 AuResetPlayPosition();
u32 AuResetPlayPositionByFrame(int position);