2013-05-06 13:09:40 +00:00
|
|
|
// Copyright (c) 2012- PPSSPP Project.
|
|
|
|
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU General Public License as published by
|
|
|
|
// the Free Software Foundation, version 2.0 or later versions.
|
|
|
|
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License 2.0 for more details.
|
|
|
|
|
|
|
|
// A copy of the GPL 2.0 should have been included with the program.
|
|
|
|
// If not, see http://www.gnu.org/licenses/
|
|
|
|
|
|
|
|
// Official git repository and contact information can be found at
|
|
|
|
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
|
|
|
|
|
|
|
|
#include <map>
|
2013-09-17 04:48:14 +00:00
|
|
|
#include <algorithm>
|
|
|
|
|
2013-10-27 02:20:44 +00:00
|
|
|
#include "Core/Config.h"
|
2021-02-02 08:08:05 +00:00
|
|
|
#include "Core/Debugger/MemBlockInfo.h"
|
2013-05-20 00:54:14 +00:00
|
|
|
#include "Core/HLE/HLE.h"
|
2014-03-15 18:22:19 +00:00
|
|
|
#include "Core/HLE/FunctionWrappers.h"
|
2021-01-26 04:57:34 +00:00
|
|
|
#include "Core/HLE/sceKernelMemory.h"
|
2013-06-22 16:08:43 +00:00
|
|
|
#include "Core/HLE/sceMp3.h"
|
2013-05-20 00:54:14 +00:00
|
|
|
#include "Core/HW/MediaEngine.h"
|
2021-02-02 08:08:05 +00:00
|
|
|
#include "Core/HW/SimpleAudioDec.h"
|
2014-03-15 18:22:19 +00:00
|
|
|
#include "Core/MemMap.h"
|
2013-05-20 00:54:14 +00:00
|
|
|
#include "Core/Reporting.h"
|
2021-02-02 08:08:05 +00:00
|
|
|
#include "Common/Serialize/SerializeFuncs.h"
|
|
|
|
#include "Common/Serialize/SerializeMap.h"
|
2013-05-06 13:09:40 +00:00
|
|
|
|
2019-04-23 05:57:49 +00:00
|
|
|
static const u32 ERROR_MP3_INVALID_HANDLE = 0x80671001;
|
2019-04-23 05:57:05 +00:00
|
|
|
static const u32 ERROR_MP3_UNRESERVED_HANDLE = 0x80671102;
|
2019-04-24 21:13:46 +00:00
|
|
|
static const u32 ERROR_MP3_NOT_YET_INIT_HANDLE = 0x80671103;
|
2019-04-22 05:07:46 +00:00
|
|
|
static const u32 ERROR_MP3_NO_RESOURCE_AVAIL = 0x80671201;
|
2021-01-26 04:57:34 +00:00
|
|
|
static const u32 ERROR_MP3_BAD_SAMPLE_RATE = 0x80671302;
|
2019-04-28 20:07:55 +00:00
|
|
|
static const u32 ERROR_MP3_BAD_RESET_FRAME = 0x80671501;
|
2019-04-22 05:07:46 +00:00
|
|
|
static const u32 ERROR_MP3_BAD_ADDR = 0x80671002;
|
|
|
|
static const u32 ERROR_MP3_BAD_SIZE = 0x80671003;
|
2019-04-24 16:16:21 +00:00
|
|
|
static const u32 ERROR_AVCODEC_INVALID_DATA = 0x807f00fd;
|
2019-04-22 05:07:46 +00:00
|
|
|
static const int AU_BUF_MIN_SIZE = 8192;
|
|
|
|
static const int PCM_BUF_MIN_SIZE = 9216;
|
2019-04-23 05:57:05 +00:00
|
|
|
static const size_t MP3_MAX_HANDLES = 2;
|
2014-04-12 00:12:25 +00:00
|
|
|
|
|
|
|
struct Mp3Context {
|
|
|
|
public:
|
|
|
|
|
|
|
|
int mp3StreamStart;
|
|
|
|
int mp3StreamEnd;
|
|
|
|
u32 mp3Buf;
|
|
|
|
int mp3BufSize;
|
|
|
|
u32 mp3PcmBuf;
|
|
|
|
int mp3PcmBufSize;
|
|
|
|
|
|
|
|
int readPosition;
|
|
|
|
|
|
|
|
int bufferRead;
|
|
|
|
int bufferWrite;
|
|
|
|
int bufferAvailable;
|
|
|
|
|
|
|
|
int mp3DecodedBytes;
|
|
|
|
int mp3LoopNum;
|
|
|
|
int mp3MaxSamples;
|
|
|
|
int mp3SumDecodedSamples;
|
|
|
|
|
|
|
|
int mp3Channels;
|
|
|
|
int mp3Bitrate;
|
|
|
|
int mp3SamplingRate;
|
|
|
|
int mp3Version;
|
|
|
|
|
|
|
|
void DoState(PointerWrap &p) {
|
|
|
|
auto s = p.Section("Mp3Context", 1);
|
|
|
|
if (!s)
|
|
|
|
return;
|
|
|
|
|
2020-08-10 04:20:42 +00:00
|
|
|
Do(p, mp3StreamStart);
|
|
|
|
Do(p, mp3StreamEnd);
|
|
|
|
Do(p, mp3Buf);
|
|
|
|
Do(p, mp3BufSize);
|
|
|
|
Do(p, mp3PcmBuf);
|
|
|
|
Do(p, mp3PcmBufSize);
|
|
|
|
Do(p, readPosition);
|
|
|
|
Do(p, bufferRead);
|
|
|
|
Do(p, bufferWrite);
|
|
|
|
Do(p, bufferAvailable);
|
|
|
|
Do(p, mp3DecodedBytes);
|
|
|
|
Do(p, mp3LoopNum);
|
|
|
|
Do(p, mp3MaxSamples);
|
|
|
|
Do(p, mp3SumDecodedSamples);
|
|
|
|
Do(p, mp3Channels);
|
|
|
|
Do(p, mp3Bitrate);
|
|
|
|
Do(p, mp3SamplingRate);
|
|
|
|
Do(p, mp3Version);
|
2014-04-12 00:12:25 +00:00
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2014-04-11 13:09:31 +00:00
|
|
|
static std::map<u32, AuCtx *> mp3Map;
|
2019-04-28 15:42:06 +00:00
|
|
|
static const int mp3DecodeDelay = 2400;
|
2019-04-22 01:08:54 +00:00
|
|
|
static bool resourceInited = false;
|
2014-04-12 00:12:25 +00:00
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static AuCtx *getMp3Ctx(u32 mp3) {
|
2013-05-06 13:09:40 +00:00
|
|
|
if (mp3Map.find(mp3) == mp3Map.end())
|
|
|
|
return NULL;
|
|
|
|
return mp3Map[mp3];
|
|
|
|
}
|
|
|
|
|
2013-10-25 03:07:07 +00:00
|
|
|
void __Mp3Shutdown() {
|
|
|
|
for (auto it = mp3Map.begin(), end = mp3Map.end(); it != end; ++it) {
|
|
|
|
delete it->second;
|
|
|
|
}
|
|
|
|
mp3Map.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
void __Mp3DoState(PointerWrap &p) {
|
2019-04-22 01:08:54 +00:00
|
|
|
auto s = p.Section("sceMp3", 0, 3);
|
2013-10-25 03:07:07 +00:00
|
|
|
if (!s)
|
|
|
|
return;
|
|
|
|
|
2019-04-22 01:08:54 +00:00
|
|
|
if (s >= 2) {
|
2020-08-10 04:20:42 +00:00
|
|
|
Do(p, mp3Map);
|
2019-04-22 01:08:54 +00:00
|
|
|
} else {
|
|
|
|
std::map<u32, Mp3Context *> mp3Map_old;
|
2020-08-10 04:20:42 +00:00
|
|
|
Do(p, mp3Map_old); // read old map
|
2014-04-12 00:12:25 +00:00
|
|
|
for (auto it = mp3Map_old.begin(), end = mp3Map_old.end(); it != end; ++it) {
|
|
|
|
auto mp3 = new AuCtx;
|
|
|
|
u32 id = it->first;
|
|
|
|
auto mp3_old = it->second;
|
|
|
|
mp3->AuBuf = mp3_old->mp3Buf;
|
|
|
|
mp3->AuBufSize = mp3_old->mp3BufSize;
|
|
|
|
mp3->PCMBuf = mp3_old->mp3PcmBuf;
|
|
|
|
mp3->PCMBufSize = mp3_old->mp3PcmBufSize;
|
|
|
|
mp3->BitRate = mp3_old->mp3Bitrate;
|
|
|
|
mp3->Channels = mp3_old->mp3Channels;
|
|
|
|
mp3->endPos = mp3_old->mp3StreamEnd;
|
|
|
|
mp3->startPos = mp3_old->mp3StreamStart;
|
|
|
|
mp3->LoopNum = mp3_old->mp3LoopNum;
|
|
|
|
mp3->SamplingRate = mp3_old->mp3SamplingRate;
|
|
|
|
mp3->freq = mp3->SamplingRate;
|
|
|
|
mp3->SumDecodedSamples = mp3_old->mp3SumDecodedSamples;
|
|
|
|
mp3->Version = mp3_old->mp3Version;
|
|
|
|
mp3->MaxOutputSample = mp3_old->mp3MaxSamples;
|
|
|
|
mp3->readPos = mp3_old->readPosition;
|
|
|
|
mp3->AuBufAvailable = 0; // reset to read from file
|
2014-04-12 21:16:38 +00:00
|
|
|
mp3->askedReadSize = 0;
|
2014-04-12 00:12:25 +00:00
|
|
|
|
|
|
|
mp3->audioType = PSP_CODEC_MP3;
|
|
|
|
mp3->decoder = new SimpleAudio(mp3->audioType);
|
|
|
|
mp3Map[id] = mp3;
|
|
|
|
}
|
|
|
|
}
|
2019-04-22 01:08:54 +00:00
|
|
|
|
|
|
|
if (s >= 3) {
|
2020-08-10 04:20:42 +00:00
|
|
|
Do(p, resourceInited);
|
2019-04-22 01:08:54 +00:00
|
|
|
} else {
|
|
|
|
// Previous behavior acted as if it was already inited.
|
|
|
|
resourceInited = true;
|
|
|
|
}
|
2013-10-25 03:07:07 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3Decode(u32 mp3, u32 outPcmPtr) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-06 13:09:40 +00:00
|
|
|
if (!ctx) {
|
2021-01-26 07:51:55 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->Version < 0 || ctx->AuBuf == 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "not yet init");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2014-04-15 07:11:44 +00:00
|
|
|
|
|
|
|
int pcmBytes = ctx->AuDecode(outPcmPtr);
|
2019-04-28 15:42:06 +00:00
|
|
|
if (pcmBytes > 0) {
|
2014-04-15 07:11:44 +00:00
|
|
|
// decode data successfully, delay thread
|
2021-01-26 07:51:55 +00:00
|
|
|
return hleDelayResult(hleLogSuccessI(ME, pcmBytes), "mp3 decode", mp3DecodeDelay);
|
2014-04-15 07:11:44 +00:00
|
|
|
}
|
2021-01-26 07:51:55 +00:00
|
|
|
// Should already have logged.
|
2014-04-15 07:11:44 +00:00
|
|
|
return pcmBytes;
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3ResetPlayPosition(u32 mp3) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-06 13:09:40 +00:00
|
|
|
if (!ctx) {
|
2019-04-28 18:59:07 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->Version < 0 || ctx->AuBuf == 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "not yet init");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-28 18:59:07 +00:00
|
|
|
return hleLogSuccessI(ME, ctx->AuResetPlayPosition());
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3CheckStreamDataNeeded(u32 mp3) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-06 13:09:40 +00:00
|
|
|
if (!ctx) {
|
2019-04-24 03:49:45 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "incorrect handle type");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-24 03:49:45 +00:00
|
|
|
return hleLogSuccessI(ME, ctx->AuCheckStreamDataNeeded());
|
2013-01-20 13:30:16 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static u32 sceMp3ReserveMp3Handle(u32 mp3Addr) {
|
2019-04-22 02:54:34 +00:00
|
|
|
if (!resourceInited) {
|
2019-04-22 05:07:46 +00:00
|
|
|
return hleLogError(ME, ERROR_MP3_NO_RESOURCE_AVAIL, "sceMp3InitResource must be called first");
|
2019-04-22 02:54:34 +00:00
|
|
|
}
|
2019-04-23 05:57:05 +00:00
|
|
|
if (mp3Map.size() >= MP3_MAX_HANDLES) {
|
2019-04-22 05:07:46 +00:00
|
|
|
return hleLogError(ME, ERROR_MP3_NO_RESOURCE_AVAIL, "no free handles");
|
|
|
|
}
|
|
|
|
if (mp3Addr != 0 && !Memory::IsValidRange(mp3Addr, 32)) {
|
|
|
|
// The PSP would crash, but might as well return a proper error.
|
|
|
|
return hleLogError(ME, SCE_KERNEL_ERROR_INVALID_POINTER, "bad mp3 pointer");
|
2013-01-20 13:30:16 +00:00
|
|
|
}
|
2014-04-13 19:11:04 +00:00
|
|
|
|
|
|
|
AuCtx *Au = new AuCtx;
|
2019-04-22 05:07:46 +00:00
|
|
|
if (mp3Addr) {
|
|
|
|
Au->startPos = Memory::Read_U64(mp3Addr); // Audio stream start position.
|
|
|
|
Au->endPos = Memory::Read_U64(mp3Addr + 8); // Audio stream end position.
|
|
|
|
Au->AuBuf = Memory::Read_U32(mp3Addr + 16); // Input Au data buffer.
|
|
|
|
Au->AuBufSize = Memory::Read_U32(mp3Addr + 20); // Input Au data buffer size.
|
|
|
|
Au->PCMBuf = Memory::Read_U32(mp3Addr + 24); // Output PCM data buffer.
|
|
|
|
Au->PCMBufSize = Memory::Read_U32(mp3Addr + 28); // Output PCM data buffer size.
|
|
|
|
|
|
|
|
if (Au->startPos >= Au->endPos) {
|
|
|
|
delete Au;
|
|
|
|
return hleLogError(ME, ERROR_MP3_BAD_SIZE, "start must be before end");
|
|
|
|
}
|
|
|
|
if (!Au->AuBuf || !Au->PCMBuf) {
|
|
|
|
delete Au;
|
|
|
|
return hleLogError(ME, ERROR_MP3_BAD_ADDR, "invalid buffer addresses");
|
|
|
|
}
|
|
|
|
if ((int)Au->AuBufSize < AU_BUF_MIN_SIZE || (int)Au->PCMBufSize < PCM_BUF_MIN_SIZE) {
|
|
|
|
delete Au;
|
|
|
|
return hleLogError(ME, ERROR_MP3_BAD_SIZE, "buffers too small");
|
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-22 05:07:46 +00:00
|
|
|
DEBUG_LOG(ME, "startPos %llx endPos %llx mp3buf %08x mp3bufSize %08x PCMbuf %08x PCMbufSize %08x",
|
|
|
|
Au->startPos, Au->endPos, Au->AuBuf, Au->AuBufSize, Au->PCMBuf, Au->PCMBufSize);
|
|
|
|
} else {
|
|
|
|
Au->startPos = 0;
|
|
|
|
Au->endPos = 0;
|
|
|
|
Au->AuBuf = 0;
|
|
|
|
Au->AuBufSize = 0;
|
|
|
|
Au->PCMBuf = 0;
|
|
|
|
Au->PCMBufSize = 0;
|
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2014-04-11 13:09:31 +00:00
|
|
|
Au->SumDecodedSamples = 0;
|
|
|
|
Au->LoopNum = -1;
|
|
|
|
Au->AuBufAvailable = 0;
|
|
|
|
Au->readPos = Au->startPos;
|
2013-05-06 13:09:40 +00:00
|
|
|
|
2019-04-22 05:07:46 +00:00
|
|
|
Au->audioType = PSP_CODEC_MP3;
|
Universal Audio Class
Based on my implementation in sceAac https://github.com/hrydgard/ppsspp/pull/5836
I've created a class AuCtx included in My SimpleAudioDec.cpp/.h which aims at providing a standard easy implementation to support all codecs in ffmpeg.
Here, I also completely re-code sceMp3 file with this class to give an example how to use this class, and it has solved all mp3 issues I've observed in the current master.
Tests on different freq and channels mp3 audios as:
Miku custom BGM (48kHz, stereo), Hanayaka Nari Wa ga Ichizoku(32kHz, mono, a little fast but better than before now), downstreet panic (44.1kHz, stereo), and learn jp09(44.1kHz, stero) are just all right.
Especially, I am very glad to see that Miku's Custom BGMs have no repetition issues in first tone any more and no longer stopped in the first second neither. :)
We will come into a new age to fast support new audio formats from now on I hope :P
2014-04-11 20:56:59 +00:00
|
|
|
Au->decoder = new SimpleAudio(Au->audioType);
|
2013-05-06 13:09:40 +00:00
|
|
|
|
2019-04-22 05:07:46 +00:00
|
|
|
int handle = (int)mp3Map.size();
|
|
|
|
mp3Map[handle] = Au;
|
2014-04-11 13:09:31 +00:00
|
|
|
|
2019-04-22 05:07:46 +00:00
|
|
|
return hleLogSuccessI(ME, handle);
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3InitResource() {
|
2019-04-22 01:08:54 +00:00
|
|
|
// TODO: Could validate the utility modules have been loaded?
|
|
|
|
if (resourceInited) {
|
|
|
|
return hleLogSuccessI(ME, 0);
|
|
|
|
}
|
|
|
|
resourceInited = true;
|
|
|
|
return hleLogSuccessI(ME, hleDelayResult(0, "mp3 resource init", 200));
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3TermResource() {
|
2019-04-22 01:08:54 +00:00
|
|
|
if (!resourceInited) {
|
|
|
|
return hleLogSuccessI(ME, 0);
|
|
|
|
}
|
2019-04-23 05:57:49 +00:00
|
|
|
|
|
|
|
// Free any handles that are still open.
|
|
|
|
for (auto au : mp3Map) {
|
|
|
|
delete au.second;
|
|
|
|
}
|
|
|
|
mp3Map.clear();
|
|
|
|
|
2019-04-22 01:08:54 +00:00
|
|
|
resourceInited = false;
|
|
|
|
return hleLogSuccessI(ME, hleDelayResult(0, "mp3 resource term", 100));
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int __CalculateMp3Channels(int bitval) {
|
Universal Audio Class
Based on my implementation in sceAac https://github.com/hrydgard/ppsspp/pull/5836
I've created a class AuCtx included in My SimpleAudioDec.cpp/.h which aims at providing a standard easy implementation to support all codecs in ffmpeg.
Here, I also completely re-code sceMp3 file with this class to give an example how to use this class, and it has solved all mp3 issues I've observed in the current master.
Tests on different freq and channels mp3 audios as:
Miku custom BGM (48kHz, stereo), Hanayaka Nari Wa ga Ichizoku(32kHz, mono, a little fast but better than before now), downstreet panic (44.1kHz, stereo), and learn jp09(44.1kHz, stero) are just all right.
Especially, I am very glad to see that Miku's Custom BGMs have no repetition issues in first tone any more and no longer stopped in the first second neither. :)
We will come into a new age to fast support new audio formats from now on I hope :P
2014-04-11 20:56:59 +00:00
|
|
|
if (bitval == 0 || bitval == 1 || bitval == 2) { // Stereo / Joint Stereo / Dual Channel.
|
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
else if (bitval == 3) { // Mono.
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int __CalculateMp3SampleRates(int bitval, int mp3version) {
|
Universal Audio Class
Based on my implementation in sceAac https://github.com/hrydgard/ppsspp/pull/5836
I've created a class AuCtx included in My SimpleAudioDec.cpp/.h which aims at providing a standard easy implementation to support all codecs in ffmpeg.
Here, I also completely re-code sceMp3 file with this class to give an example how to use this class, and it has solved all mp3 issues I've observed in the current master.
Tests on different freq and channels mp3 audios as:
Miku custom BGM (48kHz, stereo), Hanayaka Nari Wa ga Ichizoku(32kHz, mono, a little fast but better than before now), downstreet panic (44.1kHz, stereo), and learn jp09(44.1kHz, stero) are just all right.
Especially, I am very glad to see that Miku's Custom BGMs have no repetition issues in first tone any more and no longer stopped in the first second neither. :)
We will come into a new age to fast support new audio formats from now on I hope :P
2014-04-11 20:56:59 +00:00
|
|
|
if (mp3version == 3) { // MPEG Version 1
|
|
|
|
int valuemapping[] = { 44100, 48000, 32000, -1 };
|
|
|
|
return valuemapping[bitval];
|
|
|
|
}
|
|
|
|
else if (mp3version == 2) { // MPEG Version 2
|
|
|
|
int valuemapping[] = { 22050, 24000, 16000, -1 };
|
|
|
|
return valuemapping[bitval];
|
|
|
|
}
|
|
|
|
else if (mp3version == 0) { // MPEG Version 2.5
|
|
|
|
int valuemapping[] = { 11025, 12000, 8000, -1 };
|
|
|
|
return valuemapping[bitval];
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int __CalculateMp3Bitrates(int bitval, int mp3version, int mp3layer) {
|
Universal Audio Class
Based on my implementation in sceAac https://github.com/hrydgard/ppsspp/pull/5836
I've created a class AuCtx included in My SimpleAudioDec.cpp/.h which aims at providing a standard easy implementation to support all codecs in ffmpeg.
Here, I also completely re-code sceMp3 file with this class to give an example how to use this class, and it has solved all mp3 issues I've observed in the current master.
Tests on different freq and channels mp3 audios as:
Miku custom BGM (48kHz, stereo), Hanayaka Nari Wa ga Ichizoku(32kHz, mono, a little fast but better than before now), downstreet panic (44.1kHz, stereo), and learn jp09(44.1kHz, stero) are just all right.
Especially, I am very glad to see that Miku's Custom BGMs have no repetition issues in first tone any more and no longer stopped in the first second neither. :)
We will come into a new age to fast support new audio formats from now on I hope :P
2014-04-11 20:56:59 +00:00
|
|
|
if (mp3version == 3) { // MPEG Version 1
|
|
|
|
if (mp3layer == 3) { // Layer I
|
|
|
|
int valuemapping[] = { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1 };
|
|
|
|
return valuemapping[bitval];
|
|
|
|
}
|
|
|
|
else if (mp3layer == 2) { // Layer II
|
|
|
|
int valuemapping[] = { 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1 };
|
|
|
|
return valuemapping[bitval];
|
|
|
|
}
|
|
|
|
else if (mp3layer == 1) { // Layer III
|
|
|
|
int valuemapping[] = { 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1 };
|
|
|
|
return valuemapping[bitval];
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (mp3version == 2 || mp3version == 0) { // MPEG Version 2 or 2.5
|
|
|
|
if (mp3layer == 3) { // Layer I
|
|
|
|
int valuemapping[] = { 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1 };
|
|
|
|
return valuemapping[bitval];
|
|
|
|
}
|
|
|
|
else if (mp3layer == 1 || mp3layer == 2) { // Layer II or III
|
|
|
|
int valuemapping[] = { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1 };
|
|
|
|
return valuemapping[bitval];
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-24 21:31:12 +00:00
|
|
|
static int CalculateMp3SamplesPerFrame(int versionBits, int layerBits) {
|
|
|
|
if (versionBits == 1 || layerBits == 0) {
|
|
|
|
return -1;
|
|
|
|
} else if (layerBits == 3) {
|
|
|
|
return 384;
|
|
|
|
} else if (layerBits == 2 || versionBits == 3) {
|
|
|
|
return 1152;
|
|
|
|
} else {
|
|
|
|
return 576;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-28 19:10:20 +00:00
|
|
|
static int FindMp3Header(AuCtx *ctx, int &header, int end) {
|
|
|
|
u32 addr = ctx->AuBuf + ctx->AuStreamWorkareaSize();
|
|
|
|
if (Memory::IsValidRange(addr, end)) {
|
|
|
|
u8 *ptr = Memory::GetPointerUnchecked(addr);
|
|
|
|
for (int offset = 0; offset < end; ++offset) {
|
|
|
|
// If we hit valid sync bits, then we've found a header.
|
|
|
|
if (ptr[offset] == 0xFF && (ptr[offset + 1] & 0xC0) == 0xC0) {
|
|
|
|
header = bswap32(Memory::Read_U32(addr + offset));
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
}
|
Universal Audio Class
Based on my implementation in sceAac https://github.com/hrydgard/ppsspp/pull/5836
I've created a class AuCtx included in My SimpleAudioDec.cpp/.h which aims at providing a standard easy implementation to support all codecs in ffmpeg.
Here, I also completely re-code sceMp3 file with this class to give an example how to use this class, and it has solved all mp3 issues I've observed in the current master.
Tests on different freq and channels mp3 audios as:
Miku custom BGM (48kHz, stereo), Hanayaka Nari Wa ga Ichizoku(32kHz, mono, a little fast but better than before now), downstreet panic (44.1kHz, stereo), and learn jp09(44.1kHz, stero) are just all right.
Especially, I am very glad to see that Miku's Custom BGMs have no repetition issues in first tone any more and no longer stopped in the first second neither. :)
We will come into a new age to fast support new audio formats from now on I hope :P
2014-04-11 20:56:59 +00:00
|
|
|
}
|
2019-04-28 19:10:20 +00:00
|
|
|
|
|
|
|
return -1;
|
Universal Audio Class
Based on my implementation in sceAac https://github.com/hrydgard/ppsspp/pull/5836
I've created a class AuCtx included in My SimpleAudioDec.cpp/.h which aims at providing a standard easy implementation to support all codecs in ffmpeg.
Here, I also completely re-code sceMp3 file with this class to give an example how to use this class, and it has solved all mp3 issues I've observed in the current master.
Tests on different freq and channels mp3 audios as:
Miku custom BGM (48kHz, stereo), Hanayaka Nari Wa ga Ichizoku(32kHz, mono, a little fast but better than before now), downstreet panic (44.1kHz, stereo), and learn jp09(44.1kHz, stero) are just all right.
Especially, I am very glad to see that Miku's Custom BGMs have no repetition issues in first tone any more and no longer stopped in the first second neither. :)
We will come into a new age to fast support new audio formats from now on I hope :P
2014-04-11 20:56:59 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3Init(u32 mp3) {
|
2021-01-26 04:57:34 +00:00
|
|
|
int sdkver = sceKernelGetCompiledSdkVersion();
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-10-25 03:07:07 +00:00
|
|
|
if (!ctx) {
|
2019-04-24 16:16:21 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "incorrect handle type");
|
2013-10-25 03:07:07 +00:00
|
|
|
}
|
|
|
|
|
2019-04-24 16:16:21 +00:00
|
|
|
static const int PARSE_DELAY_MS = 500;
|
|
|
|
|
2019-04-28 19:10:20 +00:00
|
|
|
// First, let's search for the MP3 header. It can be offset by at most 1439 bytes.
|
|
|
|
// If we have an ID3 tag, we'll get past it based on frame sync. Don't modify startPos.
|
|
|
|
int header = 0;
|
|
|
|
if (FindMp3Header(ctx, header, 1440) < 0)
|
2019-04-24 16:16:21 +00:00
|
|
|
return hleDelayResult(hleLogWarning(ME, ERROR_AVCODEC_INVALID_DATA, "no header found"), "mp3 init", PARSE_DELAY_MS);
|
|
|
|
|
|
|
|
// Parse the Mp3 header
|
2019-04-28 20:15:35 +00:00
|
|
|
int layerBits = (header >> 17) & 0x3;
|
|
|
|
int versionBits = (header >> 19) & 0x3;
|
2021-01-26 04:57:34 +00:00
|
|
|
int bitrate = __CalculateMp3Bitrates((header >> 12) & 0xF, versionBits, layerBits);
|
|
|
|
int samplerate = __CalculateMp3SampleRates((header >> 10) & 0x3, versionBits);;
|
2021-01-27 15:07:14 +00:00
|
|
|
int channels = __CalculateMp3Channels((header >> 6) & 0x3);
|
Universal Audio Class
Based on my implementation in sceAac https://github.com/hrydgard/ppsspp/pull/5836
I've created a class AuCtx included in My SimpleAudioDec.cpp/.h which aims at providing a standard easy implementation to support all codecs in ffmpeg.
Here, I also completely re-code sceMp3 file with this class to give an example how to use this class, and it has solved all mp3 issues I've observed in the current master.
Tests on different freq and channels mp3 audios as:
Miku custom BGM (48kHz, stereo), Hanayaka Nari Wa ga Ichizoku(32kHz, mono, a little fast but better than before now), downstreet panic (44.1kHz, stereo), and learn jp09(44.1kHz, stero) are just all right.
Especially, I am very glad to see that Miku's Custom BGMs have no repetition issues in first tone any more and no longer stopped in the first second neither. :)
We will come into a new age to fast support new audio formats from now on I hope :P
2014-04-11 20:56:59 +00:00
|
|
|
|
2021-01-27 15:07:14 +00:00
|
|
|
DEBUG_LOG(ME, "sceMp3Init(): channels=%i, samplerate=%iHz, bitrate=%ikbps, layerBits=%d ,versionBits=%d,HEADER: %08x", channels, samplerate, bitrate, layerBits, versionBits, header);
|
2019-04-24 16:16:21 +00:00
|
|
|
|
2019-04-28 20:15:35 +00:00
|
|
|
if (layerBits != 1) {
|
2019-04-24 16:16:21 +00:00
|
|
|
// TODO: Should return ERROR_AVCODEC_INVALID_DATA.
|
|
|
|
WARN_LOG_REPORT(ME, "sceMp3Init: invalid data: not layer 3");
|
|
|
|
}
|
2021-01-26 04:57:34 +00:00
|
|
|
if (bitrate == 0 || bitrate == -1) {
|
|
|
|
return hleDelayResult(hleReportError(ME, ERROR_AVCODEC_INVALID_DATA, "invalid bitrate v%d l%d rate %04x", versionBits, layerBits, (header >> 12) & 0xF), "mp3 init", PARSE_DELAY_MS);
|
|
|
|
}
|
|
|
|
if (samplerate == -1) {
|
|
|
|
return hleDelayResult(hleReportError(ME, ERROR_AVCODEC_INVALID_DATA, "invalid sample rate v%d l%d rate %02x", versionBits, layerBits, (header >> 10) & 0x3), "mp3 init", PARSE_DELAY_MS);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Before we allow init, newer SDK versions next require at least 156 bytes.
|
|
|
|
// That happens to be the size of the first frame header for VBR.
|
|
|
|
if (sdkver >= 0x06000000 && ctx->readPos < 156) {
|
|
|
|
return hleDelayResult(hleLogError(ME, SCE_KERNEL_ERROR_INVALID_VALUE, "insufficient mp3 data for init"), "mp3 init", PARSE_DELAY_MS);
|
|
|
|
}
|
|
|
|
|
|
|
|
ctx->SamplingRate = samplerate;
|
2021-01-27 15:07:14 +00:00
|
|
|
ctx->Channels = channels;
|
2021-01-26 04:57:34 +00:00
|
|
|
ctx->BitRate = bitrate;
|
|
|
|
ctx->MaxOutputSample = CalculateMp3SamplesPerFrame(versionBits, layerBits);
|
|
|
|
ctx->freq = ctx->SamplingRate;
|
|
|
|
|
2019-04-28 20:15:35 +00:00
|
|
|
if (versionBits != 3) {
|
2019-04-24 16:16:21 +00:00
|
|
|
// TODO: Should return 0x80671301 (unsupported version?)
|
|
|
|
WARN_LOG_REPORT(ME, "sceMp3Init: invalid data: not MPEG v1");
|
|
|
|
}
|
2021-01-26 04:57:34 +00:00
|
|
|
if (samplerate != 44100 && sdkver < 3090500) {
|
|
|
|
return hleDelayResult(hleLogError(ME, ERROR_MP3_BAD_SAMPLE_RATE, "invalid data: not 44.1kHz"), "mp3 init", PARSE_DELAY_MS);
|
2019-04-24 16:16:21 +00:00
|
|
|
}
|
|
|
|
|
2019-04-28 20:15:35 +00:00
|
|
|
// Based on bitrate, we can calculate the frame size in bytes.
|
|
|
|
// Note: this doesn't correctly handle padding or slot size, but the PSP doesn't either.
|
|
|
|
uint32_t bytesPerSecond = (ctx->MaxOutputSample / 8) * ctx->BitRate * 1000;
|
|
|
|
// The frame count ignores the upper bits of these sizes, although they are used in cases.
|
|
|
|
uint64_t totalBytes = (ctx->endPos & 0xFFFFFFFF) - (ctx->startPos & 0xFFFFFFFF);
|
|
|
|
ctx->FrameNum = (int)((totalBytes * ctx->SamplingRate) / bytesPerSecond);
|
|
|
|
|
|
|
|
ctx->Version = versionBits;
|
|
|
|
|
2021-01-27 07:50:54 +00:00
|
|
|
// This tells us to resample to the same frequency it decodes to.
|
|
|
|
ctx->decoder->SetResampleFrequency(ctx->freq);
|
|
|
|
|
2019-04-24 16:16:21 +00:00
|
|
|
return hleDelayResult(hleLogSuccessI(ME, 0), "mp3 init", PARSE_DELAY_MS);
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3GetLoopNum(u32 mp3) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-06 13:09:40 +00:00
|
|
|
if (!ctx) {
|
2019-04-27 13:19:11 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "incorrect handle type");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-27 13:19:11 +00:00
|
|
|
return hleLogSuccessI(ME, ctx->AuGetLoopNum());
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3GetMaxOutputSample(u32 mp3) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-06 13:09:40 +00:00
|
|
|
if (!ctx) {
|
2019-04-24 21:31:12 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->Version < 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "not yet init");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogWarning(ME, 0, "no channel available for low level");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-24 21:31:12 +00:00
|
|
|
return hleLogSuccessI(ME, ctx->AuGetMaxOutputSample());
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3GetSumDecodedSample(u32 mp3) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-09-25 03:50:38 +00:00
|
|
|
if (!ctx) {
|
2019-04-28 14:30:56 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "incorrect handle type");
|
2013-09-25 03:50:38 +00:00
|
|
|
}
|
|
|
|
|
2019-04-28 14:30:56 +00:00
|
|
|
return hleLogSuccessI(ME, ctx->AuGetSumDecodedSample());
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3SetLoopNum(u32 mp3, int loop) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-06 13:09:40 +00:00
|
|
|
if (!ctx) {
|
2019-04-27 13:19:11 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "incorrect handle type");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-27 13:19:11 +00:00
|
|
|
if (loop < 0)
|
|
|
|
loop = -1;
|
|
|
|
|
|
|
|
return hleLogSuccessI(ME, ctx->AuSetLoopNum(loop));
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2014-06-22 12:01:23 +00:00
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3GetMp3ChannelNum(u32 mp3) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-06 13:09:40 +00:00
|
|
|
if (!ctx) {
|
2019-04-24 21:13:46 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->Version < 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "not yet init");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogWarning(ME, 0, "no channel available for low level");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-24 21:13:46 +00:00
|
|
|
return hleLogSuccessI(ME, ctx->AuGetChannelNum());
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2014-06-22 12:01:23 +00:00
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3GetBitRate(u32 mp3) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-06 13:09:40 +00:00
|
|
|
if (!ctx) {
|
2019-04-24 21:13:46 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->Version < 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "not yet init");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogWarning(ME, 0, "no bitrate available for low level");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-24 21:13:46 +00:00
|
|
|
return hleLogSuccessI(ME, ctx->AuGetBitRate());
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2014-06-22 12:01:23 +00:00
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3GetSamplingRate(u32 mp3) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-06 13:09:40 +00:00
|
|
|
if (!ctx) {
|
2019-04-24 21:13:46 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->Version < 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "not yet init");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogWarning(ME, 0, "no sample rate available for low level");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-24 21:13:46 +00:00
|
|
|
return hleLogSuccessI(ME, ctx->AuGetSamplingRate());
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-05-12 20:29:43 +00:00
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3GetInfoToAddStreamData(u32 mp3, u32 dstPtr, u32 towritePtr, u32 srcposPtr) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-06 13:09:40 +00:00
|
|
|
if (!ctx) {
|
2019-04-23 05:57:49 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
2019-04-23 05:57:05 +00:00
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "incorrect handle type");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-23 05:57:05 +00:00
|
|
|
return hleLogSuccessI(ME, ctx->AuGetInfoToAddStreamData(dstPtr, towritePtr, srcposPtr));
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-05-12 20:29:43 +00:00
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3NotifyAddStreamData(u32 mp3, int size) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-12 20:29:43 +00:00
|
|
|
if (!ctx) {
|
2019-04-24 02:48:01 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "incorrect handle type");
|
2013-05-12 20:29:43 +00:00
|
|
|
}
|
|
|
|
|
2019-04-24 02:48:01 +00:00
|
|
|
return hleLogSuccessI(ME, ctx->AuNotifyAddStreamData(size));
|
2013-05-12 20:29:43 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static int sceMp3ReleaseMp3Handle(u32 mp3) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2019-04-23 05:57:49 +00:00
|
|
|
if (ctx) {
|
|
|
|
delete ctx;
|
|
|
|
mp3Map.erase(mp3);
|
|
|
|
return hleLogSuccessI(ME, 0);
|
|
|
|
} else if (mp3 >= MP3_MAX_HANDLES) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-23 05:57:49 +00:00
|
|
|
// Intentionally a zero result.
|
|
|
|
return hleLogDebug(ME, 0, "double free ignored");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static u32 sceMp3EndEntry() {
|
2013-09-07 20:02:55 +00:00
|
|
|
ERROR_LOG_REPORT(ME, "UNIMPL sceMp3EndEntry(...)");
|
2013-05-06 13:09:40 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static u32 sceMp3StartEntry() {
|
2013-09-07 20:02:55 +00:00
|
|
|
ERROR_LOG_REPORT(ME, "UNIMPL sceMp3StartEntry(...)");
|
2013-05-06 13:09:40 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static u32 sceMp3GetFrameNum(u32 mp3) {
|
2014-04-14 09:47:28 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
|
|
|
if (!ctx) {
|
2019-04-27 14:54:58 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->Version < 0 || ctx->AuBuf == 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "not yet init");
|
2014-04-14 09:47:28 +00:00
|
|
|
}
|
2019-04-27 14:54:58 +00:00
|
|
|
|
|
|
|
return hleLogSuccessI(ME, ctx->AuGetFrameNum());
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static u32 sceMp3GetMPEGVersion(u32 mp3) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-05-06 13:09:40 +00:00
|
|
|
if (!ctx) {
|
2019-04-24 21:13:46 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->Version < 0) {
|
|
|
|
// Seems to be the wrong error code.
|
|
|
|
return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "not yet init");
|
|
|
|
} else if (ctx->AuBuf == 0) {
|
|
|
|
return hleLogWarning(ME, 0, "no MPEG version available for low level");
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
2013-01-20 13:30:16 +00:00
|
|
|
|
2019-04-24 21:13:46 +00:00
|
|
|
// Tests have not revealed how to expose more than "3" here as a result.
|
|
|
|
return hleReportDebug(ME, ctx->AuGetVersion());
|
2013-05-06 13:09:40 +00:00
|
|
|
}
|
|
|
|
|
2019-04-28 20:07:55 +00:00
|
|
|
static u32 sceMp3ResetPlayPositionByFrame(u32 mp3, u32 frame) {
|
2014-04-11 13:09:31 +00:00
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
2013-09-26 09:06:08 +00:00
|
|
|
if (!ctx) {
|
2019-04-28 20:07:55 +00:00
|
|
|
if (mp3 >= MP3_MAX_HANDLES)
|
|
|
|
return hleLogError(ME, ERROR_MP3_INVALID_HANDLE, "invalid handle");
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "unreserved handle");
|
|
|
|
} else if (ctx->Version < 0 || ctx->AuBuf == 0) {
|
|
|
|
return hleLogError(ME, ERROR_MP3_NOT_YET_INIT_HANDLE, "not yet init");
|
|
|
|
}
|
|
|
|
|
2019-05-10 21:26:34 +00:00
|
|
|
if ((int)frame >= ctx->AuGetFrameNum()) {
|
2019-04-28 20:07:55 +00:00
|
|
|
return hleLogError(ME, ERROR_MP3_BAD_RESET_FRAME, "bad frame position");
|
2013-09-26 09:06:08 +00:00
|
|
|
}
|
|
|
|
|
2019-04-28 20:07:55 +00:00
|
|
|
return hleLogSuccessI(ME, ctx->AuResetPlayPositionByFrame(frame));
|
2013-09-26 09:06:08 +00:00
|
|
|
}
|
|
|
|
|
2019-04-22 02:54:34 +00:00
|
|
|
static u32 sceMp3LowLevelInit(u32 mp3, u32 unk) {
|
|
|
|
INFO_LOG(ME, "sceMp3LowLevelInit(%i, %i)", mp3, unk);
|
2014-04-13 19:11:04 +00:00
|
|
|
auto ctx = new AuCtx;
|
|
|
|
|
|
|
|
ctx->audioType = PSP_CODEC_MP3;
|
2014-04-13 19:15:41 +00:00
|
|
|
// create mp3 decoder
|
2014-04-13 19:11:04 +00:00
|
|
|
ctx->decoder = new SimpleAudio(ctx->audioType);
|
|
|
|
|
2014-04-13 19:42:46 +00:00
|
|
|
// close the audio if mp3 already exists.
|
2014-04-13 19:11:04 +00:00
|
|
|
if (mp3Map.find(mp3) != mp3Map.end()) {
|
|
|
|
delete mp3Map[mp3];
|
|
|
|
mp3Map.erase(mp3);
|
|
|
|
}
|
|
|
|
mp3Map[mp3] = ctx;
|
2019-04-24 21:13:46 +00:00
|
|
|
|
|
|
|
// Indicate that we've run low level init by setting version to 1.
|
|
|
|
ctx->Version = 1;
|
|
|
|
|
2013-09-26 09:09:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-12-08 09:40:08 +00:00
|
|
|
static u32 sceMp3LowLevelDecode(u32 mp3, u32 sourceAddr, u32 sourceBytesConsumedAddr, u32 samplesAddr, u32 sampleBytesAddr) {
|
2014-04-13 19:11:04 +00:00
|
|
|
// sourceAddr: input mp3 stream buffer
|
|
|
|
// sourceBytesConsumedAddr: consumed bytes decoded in source
|
|
|
|
// samplesAddr: output pcm buffer
|
|
|
|
// sampleBytesAddr: output pcm size
|
|
|
|
DEBUG_LOG(ME, "sceMp3LowLevelDecode(%08x, %08x, %08x, %08x, %08x)", mp3, sourceAddr, sourceBytesConsumedAddr, samplesAddr, sampleBytesAddr);
|
|
|
|
|
|
|
|
AuCtx *ctx = getMp3Ctx(mp3);
|
|
|
|
if (!ctx) {
|
|
|
|
ERROR_LOG(ME, "%s: bad mp3 handle %08x", __FUNCTION__, mp3);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!Memory::IsValidAddress(sourceAddr) || !Memory::IsValidAddress(sourceBytesConsumedAddr) ||
|
2014-06-22 12:01:23 +00:00
|
|
|
!Memory::IsValidAddress(samplesAddr) || !Memory::IsValidAddress(sampleBytesAddr)) {
|
2014-04-13 19:11:04 +00:00
|
|
|
ERROR_LOG(ME, "sceMp3LowLevelDecode(%08x, %08x, %08x, %08x, %08x) : invalid address in args", mp3, sourceAddr, sourceBytesConsumedAddr, samplesAddr, sampleBytesAddr);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
auto inbuff = Memory::GetPointer(sourceAddr);
|
|
|
|
auto outbuff = Memory::GetPointer(samplesAddr);
|
|
|
|
|
|
|
|
int outpcmbytes = 0;
|
2014-06-22 12:01:23 +00:00
|
|
|
ctx->decoder->Decode((void*)inbuff, 4096, outbuff, &outpcmbytes);
|
2021-02-02 08:08:05 +00:00
|
|
|
NotifyMemInfo(MemBlockFlags::WRITE, samplesAddr, outpcmbytes, "Mp3LowLevelDecode");
|
2014-04-13 19:11:04 +00:00
|
|
|
|
2014-06-22 15:02:04 +00:00
|
|
|
Memory::Write_U32(ctx->decoder->GetSourcePos(), sourceBytesConsumedAddr);
|
2014-04-13 19:11:04 +00:00
|
|
|
Memory::Write_U32(outpcmbytes, sampleBytesAddr);
|
2013-09-26 09:09:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-20 13:30:16 +00:00
|
|
|
const HLEFunction sceMp3[] = {
|
2015-03-22 23:57:56 +00:00
|
|
|
{0X07EC321A, &WrapU_U<sceMp3ReserveMp3Handle>, "sceMp3ReserveMp3Handle", 'x', "x" },
|
|
|
|
{0X0DB149F4, &WrapI_UI<sceMp3NotifyAddStreamData>, "sceMp3NotifyAddStreamData", 'i', "xi" },
|
|
|
|
{0X2A368661, &WrapI_U<sceMp3ResetPlayPosition>, "sceMp3ResetPlayPosition", 'i', "x" },
|
|
|
|
{0X354D27EA, &WrapI_U<sceMp3GetSumDecodedSample>, "sceMp3GetSumDecodedSample", 'i', "x" },
|
|
|
|
{0X35750070, &WrapI_V<sceMp3InitResource>, "sceMp3InitResource", 'i', "" },
|
|
|
|
{0X3C2FA058, &WrapI_V<sceMp3TermResource>, "sceMp3TermResource", 'i', "" },
|
|
|
|
{0X3CEF484F, &WrapI_UI<sceMp3SetLoopNum>, "sceMp3SetLoopNum", 'i', "xi" },
|
|
|
|
{0X44E07129, &WrapI_U<sceMp3Init>, "sceMp3Init", 'i', "x" },
|
|
|
|
{0X732B042A, &WrapU_V<sceMp3EndEntry>, "sceMp3EndEntry", 'x', "" },
|
|
|
|
{0X7F696782, &WrapI_U<sceMp3GetMp3ChannelNum>, "sceMp3GetMp3ChannelNum", 'i', "x" },
|
|
|
|
{0X87677E40, &WrapI_U<sceMp3GetBitRate>, "sceMp3GetBitRate", 'i', "x" },
|
|
|
|
{0X87C263D1, &WrapI_U<sceMp3GetMaxOutputSample>, "sceMp3GetMaxOutputSample", 'i', "x" },
|
|
|
|
{0X8AB81558, &WrapU_V<sceMp3StartEntry>, "sceMp3StartEntry", 'x', "" },
|
|
|
|
{0X8F450998, &WrapI_U<sceMp3GetSamplingRate>, "sceMp3GetSamplingRate", 'i', "x" },
|
2019-04-23 05:57:05 +00:00
|
|
|
{0XA703FE0F, &WrapI_UUUU<sceMp3GetInfoToAddStreamData>, "sceMp3GetInfoToAddStreamData", 'i', "xppp" },
|
2021-01-26 07:51:55 +00:00
|
|
|
{0XD021C0FB, &WrapI_UU<sceMp3Decode>, "sceMp3Decode", 'i', "xp" },
|
2015-03-22 23:57:56 +00:00
|
|
|
{0XD0A56296, &WrapI_U<sceMp3CheckStreamDataNeeded>, "sceMp3CheckStreamDataNeeded", 'i', "x" },
|
|
|
|
{0XD8F54A51, &WrapI_U<sceMp3GetLoopNum>, "sceMp3GetLoopNum", 'i', "x" },
|
|
|
|
{0XF5478233, &WrapI_U<sceMp3ReleaseMp3Handle>, "sceMp3ReleaseMp3Handle", 'i', "x" },
|
|
|
|
{0XAE6D2027, &WrapU_U<sceMp3GetMPEGVersion>, "sceMp3GetMPEGVersion", 'x', "x" },
|
2019-04-27 14:54:58 +00:00
|
|
|
{0X3548AEC8, &WrapU_U<sceMp3GetFrameNum>, "sceMp3GetFrameNum", 'i', "x" },
|
2019-04-28 20:07:55 +00:00
|
|
|
{0X0840E808, &WrapU_UU<sceMp3ResetPlayPositionByFrame>, "sceMp3ResetPlayPositionByFrame", 'i', "xi" },
|
2019-04-22 02:54:34 +00:00
|
|
|
{0X1B839B83, &WrapU_UU<sceMp3LowLevelInit>, "sceMp3LowLevelInit", 'x', "xx" },
|
2015-03-22 23:57:56 +00:00
|
|
|
{0XE3EE2C81, &WrapU_UUUUU<sceMp3LowLevelDecode>, "sceMp3LowLevelDecode", 'x', "xxxxx"}
|
2013-05-06 13:09:40 +00:00
|
|
|
};
|
|
|
|
|
2013-01-20 13:30:16 +00:00
|
|
|
void Register_sceMp3() {
|
2013-05-06 13:09:40 +00:00
|
|
|
RegisterModule("sceMp3", ARRAY_SIZE(sceMp3), sceMp3);
|
2013-05-12 18:13:07 +00:00
|
|
|
}
|