RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-01-03 15:20:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

emulate audio system without audio daemon (#74)

Browse source
This commit is contained in:
Nikita Savyolov 2024-09-25 14:54:28 +03:00 committed by GitHub
parent 32cd68e746
commit 0d4ed51cd9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 75 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
orbis-kernel/include/orbis/AudioOut.hpp
View file

@ -198,7 +198,10 @@ private:
SOX_SAMPLE_LOCALS;
while (!exit.load(std::memory_order::relaxed)) {
std::this_thread::sleep_for(std::chrono::milliseconds(1));
if (params->control == 0) {
std::this_thread::sleep_for(std::chrono::microseconds(10));
continue;
}
if (!params->formatIsFloat) {
auto data = reinterpret_cast<const std::int16_t *>(audioBuffer);
@ -216,11 +219,11 @@ private:
ORBIS_LOG_ERROR("AudioOut: sox_write failed");
}
// skip sceAudioOutMix%x event
info.evf->set(bitPattern);
// set zero to freeing audiooutput
params->control = 0;
// skip sceAudioOutMix%x event
info.evf->set(bitPattern);
}
sox_close(output);

69
rpcsx-os/main.cpp
View file

@ -1209,6 +1209,68 @@ static void createSysAvControlObjects(orbis::Process *process) {
createShm("/SceAvSetting", 0xa02, 0x1a4, 4096);
}
struct SceSysAudioSystemThreadArgs {
uint32_t threadId;
};
struct SceSysAudioSystemPortAndThreadArgs {
uint32_t audioPort;
uint32_t threadId;
};
static void createAudioSystemObjects(orbis::Process *process) {
createIpmiServer(process, "SceSysAudioSystemIpc")
.addSyncMethod<SceSysAudioSystemThreadArgs>(
0x12340000, [](const auto &args) -> std::int32_t {
ORBIS_LOG_TODO("IPMI: SceSysAudioSystemCreateControl", args.threadId);
if (auto audioOut = orbis::g_context.audioOut) {
audioOut->channelInfo.idControl = args.threadId;
}
return 0;
})
.addSyncMethod<SceSysAudioSystemThreadArgs>(
0x1234000f, [](const auto &args) -> std::int32_t {
ORBIS_LOG_TODO("IPMI: SceSysAudioSystemOpenMixFlag", args.threadId);
if (auto audioOut = orbis::g_context.audioOut) {
// very bad
char buffer[32];
std::snprintf(buffer, sizeof(buffer), "sceAudioOutMix%x",
args.threadId);
auto [eventFlag, inserted] = orbis::g_context.createEventFlag(buffer, 0x100, 0);
if (!inserted) {
return 17; // FIXME: verify
}
audioOut->channelInfo.evf = eventFlag;
}
return 0;
})
.addSyncMethod<SceSysAudioSystemPortAndThreadArgs>(
0x12340001, [](const auto &args) -> std::int32_t {
ORBIS_LOG_TODO("IPMI: SceSysAudioSystemOpenPort", args.threadId, args.audioPort);
if (auto audioOut = orbis::g_context.audioOut) {
audioOut->channelInfo.port = args.audioPort;
audioOut->channelInfo.channel = args.threadId;
}
return 0;
})
.addSyncMethod<SceSysAudioSystemPortAndThreadArgs>(
0x12340002, [](const auto &args) -> std::int32_t {
ORBIS_LOG_TODO("IPMI: SceSysAudioSystemStartListening", args.threadId, args.audioPort);
if (auto audioOut = orbis::g_context.audioOut) {
audioOut->start();
}
return 0;
})
.addSyncMethod<SceSysAudioSystemPortAndThreadArgs>(
0x12340006, [](const auto &args) -> std::int32_t {
ORBIS_LOG_TODO("IPMI: SceSysAudioSystemStopListening", args.audioPort, args.threadId);
// TODO: implement
return 0;
});
}
struct SceMbusIpcAddHandleByUserIdMethodArgs {
orbis::uint32_t unk; // 0
orbis::uint32_t deviceId;
@ -1899,6 +1961,9 @@ int main(int argc, const char *argv[]) {
createSysCoreObjects(initProcess);
createGnmCompositorObjects(initProcess);
createShellCoreObjects(initProcess);
if (enableAudio) {
createAudioSystemObjects(initProcess);
}
// ?
createIpmiServer(initProcess, "SceCdlgRichProf");
@ -1920,8 +1985,10 @@ int main(int argc, const char *argv[]) {
createEventFlag("SceSaveDataMemoryRUI00000010", 0x120, 1);
initProcess->cwd = "/app0/";
launchDaemon(mainThread, "/system/sys/orbis_audiod.elf",
if (!enableAudio) {
launchDaemon(mainThread, "/system/sys/orbis_audiod.elf",
{"/system/sys/orbis_audiod.elf"}, {});
}
status = ps4Exec(mainThread, execEnv, std::move(executableModule),
ps4Argv, {});
}