Merge pull request #19095 from hrydgard/mono-atrac-fix

Add back a hack for the SasAudio/sceAtrac integration (mono audio).
hrydgard · Apr 29, 2024 · 020b539 · 020b539
2 parents 31749ac + 917f589
commit 020b539
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Core/HLE/AtracCtx.h b/Core/HLE/AtracCtx.h
@@ -216,6 +216,10 @@ class AtracBase {
 	int GetOutputChannels() const {
 		return outputChannels_;
 	}
+	void SetOutputChannels(int channels) {
+		// Only used for sceSas audio. To be refactored away in the future.
+		outputChannels_ = channels;
+	}
 
 	int atracID_ = -1;
 

diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp
@@ -1007,6 +1007,11 @@ u32 AtracSasDecodeData(int atracID, u8* outbuf, u32 outbufPtr, u32 *SamplesNum,
 
 int AtracSasGetIDByContext(u32 contextAddr) {
 	int atracID = (int)Memory::Read_U32(contextAddr + 0xfc);
+	// Restored old hack here that forces outputChannels_ to 1, since sceSas expects mono output, unlike normal usage.
+	// This is for savestate compatibility.
+	// I think it would be better to simply pass in a 1 as a parameter to atrac->DecodeData in AtracSasDecodeData above.
+	AtracBase *atrac = getAtrac(atracID);
+	atrac->SetOutputChannels(1);
 	return atracID;
 }