From 3e0e1f6f3573267233d0304f23644ff035ba5fb8 Mon Sep 17 00:00:00 2001 From: oioitff Date: Sat, 8 Jun 2013 01:38:08 +0800 Subject: [PATCH 1/2] A tiny mistake in low level atrac3 decode. --- Core/HLE/sceAtrac.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index ac371ef4aa..660dc561fb 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1247,9 +1247,9 @@ static u8 at3Header[] ={0x52,0x49,0x46,0x46,0x3b,0xbe,0x00,0x00,0x57,0x41,0x56,0 static const u16 at3HeaderMap[][4] = { { 0x00C0, 0x1, 0x8, 0x00 }, { 0x0098, 0x1, 0x8, 0x00 }, - { 0x0180, 0x2, 0x10, 0x01 }, + { 0x0180, 0x2, 0x10, 0x00 }, { 0x0130, 0x2, 0x10, 0x00 }, - { 0x00C0, 0x2, 0x10, 0x00 } + { 0x00C0, 0x2, 0x10, 0x01 } }; static const int at3HeaderMapSize = sizeof(at3HeaderMap)/(sizeof(u16) * 4); From a51291e69c12897fdf26df7fe9150dec3a508eec Mon Sep 17 00:00:00 2001 From: oioitff Date: Sat, 8 Jun 2013 01:43:39 +0800 Subject: [PATCH 2/2] Add Info logs for low level decode. --- Core/HLE/sceAtrac.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 660dc561fb..f70800df9b 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1334,7 +1334,7 @@ bool initAT3plusDecoder(Atrac *atrac, u32 dataSize = 0xffb4a8) int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) { - ERROR_LOG(HLE, "UNIMPL sceAtracLowLevelInitDecoder(%i, %08x)", atracID, paramsAddr); + INFO_LOG(HLE, "sceAtracLowLevelInitDecoder(%i, %08x)", atracID, paramsAddr); Atrac *atrac = getAtrac(atracID); if (atrac && Memory::IsValidAddress(paramsAddr)) { atrac->atracChannels = Memory::Read_U32(paramsAddr); @@ -1343,6 +1343,8 @@ int sceAtracLowLevelInitDecoder(int atracID, u32 paramsAddr) atrac->atracBytesPerFrame = atrac->atracBufSize; atrac->first.writableBytes = atrac->atracBytesPerFrame; atrac->CleanStuff(); + INFO_LOG(HLE, "Channels: %i outputChannels: %i bytesperFrame: %x", + atrac->atracChannels, atrac->atracOutputChannels, atrac->atracBytesPerFrame); #ifdef USE_FFMPEG if (atrac->codeType == PSP_MODE_AT_3) { WARN_LOG(HLE, "This is an atrac3 audio (low level)");