preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-13 09:39:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

One more cleanup before merging Analyze and SetData...

Browse Source
This commit is contained in:
Henrik Rydgård committed 2025-03-16 12:44:16 +01:00
1 parent 8ab41e387e
commit fe0edc0bda
2 files changed
+8 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/HLE/AtracCtx.cpp
+4
View File
@@ -757,6 +757,10 @@ int Atrac::SetData(u32 buffer, u32 readSize, u32 bufferSize, int outputChannels)
CreateDecoder();
INFO_LOG(Log::ME, "Atrac::SetData (buffer=%08x, readSize=%d, bufferSize=%d): %s %s (%d channels) audio", buffer, readSize, bufferSize, codecName, channelName, track_.channels);
if (track_.channels == 2 && outputChannels == 1) {
// We still do all the tasks, we just return this error.
return SCE_ERROR_ATRAC_NOT_MONO;
}
return 0;
}
Core/HLE/sceAtrac.cpp
+4 -17
View File
@@ -702,7 +702,6 @@ static u32 sceAtracSetLoopNum(int atracID, int loopNum) {
if (err != 0) {
return hleLogError(Log::ME, err);
}
int ret = atrac->SetLoopNum(loopNum);
if (ret == SCE_ERROR_ATRAC_NO_LOOP_INFORMATION && loopNum == -1) {
// Not really an issue
@@ -800,14 +799,8 @@ static int sceAtracSetMOutHalfwayBuffer(int atracID, u32 buffer, u32 readSize, u
if (ret < 0) {
return hleLogError(Log::ME, ret);
}
if (atrac->Channels() != 1) {
// It seems it still sets the data.
atrac->SetData(buffer, readSize, bufferSize, 2);
return hleReportError(Log::ME, SCE_ERROR_ATRAC_NOT_MONO, "not mono data");
} else {
ret = atrac->SetData(buffer, readSize, bufferSize, 1);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret), "atrac set data mono", 100);
}
ret = atrac->SetData(buffer, readSize, bufferSize, 1);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret), "atrac set data mono", 100);
}
// Note: This doesn't seem to be part of any available libatrac3plus library.
@@ -830,14 +823,8 @@ static u32 sceAtracSetMOutData(int atracID, u32 buffer, u32 bufferSize) {
if (ret < 0) {
return hleLogError(Log::ME, ret);
}
if (atrac->Channels() != 1) {
// It seems it still sets the data.
atrac->SetData(buffer, bufferSize, bufferSize, 2);
return hleReportError(Log::ME, SCE_ERROR_ATRAC_NOT_MONO, "not mono data");
} else {
ret = atrac->SetData(buffer, bufferSize, bufferSize, 1);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret), "atrac set data mono", 100);
}
ret = atrac->SetData(buffer, bufferSize, bufferSize, 1);
return hleDelayResult(hleLogDebugOrError(Log::ME, ret), "atrac set data mono", 100);
}
// Note: This doesn't seem to be part of any available libatrac3plus library.