mirror of
https://github.com/RPCSX/rpcsx.git
synced 2026-04-04 14:08:37 +00:00
move AudioOut from orbis-kernel to rpcsx-os
This commit is contained in:
DH
parent
5d457af7fa
commit
7e01a65117
9 changed files with 297 additions and 280 deletions
|
|
@ -1,7 +1,5 @@
|
|||
set(CMAKE_POSITION_INDEPENDENT_CODE on)
|
||||
|
||||
find_package(sox REQUIRED)
|
||||
|
||||
add_library(obj.orbis-utils-ipc OBJECT
|
||||
src/utils/SharedMutex.cpp
|
||||
src/utils/SharedCV.cpp
|
||||
|
|
@ -73,7 +71,7 @@ add_library(obj.orbis-kernel OBJECT
|
|||
src/utils/Logs.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(obj.orbis-kernel PUBLIC orbis::kernel::config $<TARGET_OBJECTS:obj.orbis-utils-ipc> sox::sox)
|
||||
target_link_libraries(obj.orbis-kernel PUBLIC orbis::kernel::config $<TARGET_OBJECTS:obj.orbis-utils-ipc>)
|
||||
|
||||
target_include_directories(obj.orbis-kernel
|
||||
PUBLIC
|
||||
|
|
|
|||
|
|
@ -1,238 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include "evf.hpp"
|
||||
#include "utils/Logs.hpp"
|
||||
#include <atomic>
|
||||
#include <chrono>
|
||||
#include <fcntl.h>
|
||||
#include <mutex>
|
||||
#include <sox.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/stat.h>
|
||||
#include <thread>
|
||||
#include <vector>
|
||||
|
||||
namespace orbis {
|
||||
struct AudioOutChannelInfo {
|
||||
std::int32_t port{};
|
||||
std::int32_t idControl{};
|
||||
std::int32_t channel{};
|
||||
Ref<EventFlag> evf;
|
||||
};
|
||||
|
||||
struct AudioOutParams {
|
||||
std::uint64_t control{};
|
||||
std::uint32_t formatChannels{};
|
||||
float unk0{};
|
||||
float unk1{};
|
||||
float unk2{};
|
||||
float unk3{};
|
||||
float unk4{};
|
||||
float unk5{};
|
||||
float unk6{};
|
||||
float unk7{};
|
||||
std::uint32_t formatIsFloat{};
|
||||
std::uint64_t freq{};
|
||||
std::uint32_t formatIsStd{};
|
||||
std::uint32_t seek{};
|
||||
std::uint32_t seekPart{};
|
||||
std::uint64_t unk8{};
|
||||
std::uint32_t port{};
|
||||
std::uint32_t unk9{};
|
||||
std::uint64_t unk10{};
|
||||
std::uint32_t sampleLength{};
|
||||
};
|
||||
|
||||
struct AudioOut {
|
||||
std::mutex thrMtx;
|
||||
std::mutex soxMtx;
|
||||
std::vector<std::thread> threads;
|
||||
AudioOutChannelInfo channelInfo;
|
||||
std::atomic<bool> exit{false};
|
||||
|
||||
AudioOut() {
|
||||
if (sox_init() != SOX_SUCCESS) {
|
||||
ORBIS_LOG_FATAL("Failed to initialize sox");
|
||||
std::abort();
|
||||
}
|
||||
}
|
||||
|
||||
~AudioOut() {
|
||||
exit = true;
|
||||
for (auto &thread : threads) {
|
||||
thread.join();
|
||||
}
|
||||
sox_quit();
|
||||
}
|
||||
|
||||
void start() {
|
||||
std::lock_guard lock(thrMtx);
|
||||
threads.push_back(std::thread(
|
||||
[this, channelInfo = channelInfo] { channelEntry(channelInfo); }));
|
||||
}
|
||||
|
||||
private:
|
||||
void channelEntry(AudioOutChannelInfo info) {
|
||||
char control_shm_name[32];
|
||||
char audio_shm_name[32];
|
||||
|
||||
std::snprintf(control_shm_name, sizeof(control_shm_name), "/rpcsx-shm_%d_C",
|
||||
info.idControl);
|
||||
std::snprintf(audio_shm_name, sizeof(audio_shm_name), "/rpcsx-shm_%d_%d_A",
|
||||
info.channel, info.port);
|
||||
|
||||
int controlFd =
|
||||
::shm_open(control_shm_name, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR);
|
||||
if (controlFd == -1) {
|
||||
perror("shm_open");
|
||||
std::abort();
|
||||
}
|
||||
|
||||
struct stat controlStat;
|
||||
if (::fstat(controlFd, &controlStat)) {
|
||||
perror("shm_open");
|
||||
std::abort();
|
||||
}
|
||||
|
||||
auto controlPtr = reinterpret_cast<std::uint8_t *>(
|
||||
::mmap(NULL, controlStat.st_size, PROT_READ | PROT_WRITE, MAP_SHARED,
|
||||
controlFd, 0));
|
||||
if (controlPtr == MAP_FAILED) {
|
||||
perror("mmap");
|
||||
std::abort();
|
||||
}
|
||||
|
||||
int bufferFd =
|
||||
::shm_open(audio_shm_name, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
|
||||
if (bufferFd == -1) {
|
||||
perror("open");
|
||||
std::abort();
|
||||
}
|
||||
|
||||
struct stat bufferStat;
|
||||
if (::fstat(bufferFd, &bufferStat)) {
|
||||
perror("shm_open");
|
||||
std::abort();
|
||||
}
|
||||
|
||||
auto audioBuffer = ::mmap(NULL, bufferStat.st_size, PROT_READ | PROT_WRITE,
|
||||
MAP_SHARED, bufferFd, 0);
|
||||
auto bitPattern = 1u << info.port;
|
||||
|
||||
auto portOffset = 32 + 0x94 * info.port * 4;
|
||||
|
||||
auto *params = reinterpret_cast<AudioOutParams *>(controlPtr + portOffset);
|
||||
|
||||
// samples length will be inited after some time, so we wait for it
|
||||
while (params->sampleLength == 0) {
|
||||
}
|
||||
|
||||
ORBIS_LOG_NOTICE("AudioOut: params", params->port, params->control,
|
||||
params->formatChannels, params->formatIsFloat,
|
||||
params->formatIsStd, params->freq, params->sampleLength);
|
||||
|
||||
unsigned inChannels = 2;
|
||||
unsigned inSamples = params->sampleLength;
|
||||
sox_rate_t sampleRate = 48000; // probably there is no point to parse
|
||||
// frequency, because it's always 48000
|
||||
if (params->formatChannels == 2 && !params->formatIsFloat) {
|
||||
inChannels = 1;
|
||||
ORBIS_LOG_NOTICE(
|
||||
"AudioOut: format is ORBIS_AUDIO_OUT_PARAM_FORMAT_S16_MONO");
|
||||
} else if (params->formatChannels == 4 && !params->formatIsFloat) {
|
||||
inChannels = 2;
|
||||
ORBIS_LOG_NOTICE(
|
||||
"AudioOut: format is ORBIS_AUDIO_OUT_PARAM_FORMAT_S16_STEREO");
|
||||
} else if (params->formatChannels == 16 && !params->formatIsFloat &&
|
||||
!params->formatIsStd) {
|
||||
inChannels = 8;
|
||||
ORBIS_LOG_NOTICE(
|
||||
"AudioOut: format is ORBIS_AUDIO_OUT_PARAM_FORMAT_S16_8CH");
|
||||
} else if (params->formatChannels == 16 && !params->formatIsFloat &&
|
||||
params->formatIsStd) {
|
||||
inChannels = 8;
|
||||
ORBIS_LOG_NOTICE(
|
||||
"AudioOut: outputParam is ORBIS_AUDIO_OUT_PARAM_FORMAT_S16_8CH_STD");
|
||||
} else if (params->formatChannels == 4 && params->formatIsFloat) {
|
||||
inChannels = 1;
|
||||
ORBIS_LOG_NOTICE(
|
||||
"AudioOut: format is ORBIS_AUDIO_OUT_PARAM_FORMAT_FLOAT_MONO");
|
||||
} else if (params->formatChannels == 8 && params->formatIsFloat) {
|
||||
inChannels = 2;
|
||||
ORBIS_LOG_NOTICE(
|
||||
"AudioOut: format is ORBIS_AUDIO_OUT_PARAM_FORMAT_FLOAT_STEREO");
|
||||
} else if (params->formatChannels == 32 && params->formatIsFloat &&
|
||||
!params->formatIsStd) {
|
||||
inChannels = 8;
|
||||
ORBIS_LOG_NOTICE(
|
||||
"AudioOut: format is ORBIS_AUDIO_OUT_PARAM_FORMAT_FLOAT_8CH");
|
||||
} else if (params->formatChannels == 32 && params->formatIsFloat &&
|
||||
params->formatIsStd) {
|
||||
inChannels = 8;
|
||||
ORBIS_LOG_NOTICE("AudioOut: format is "
|
||||
"ORBIS_AUDIO_OUT_PARAM_FORMAT_FLOAT_8CH_STD");
|
||||
} else {
|
||||
ORBIS_LOG_ERROR("AudioOut: unknown format type");
|
||||
}
|
||||
|
||||
sox_signalinfo_t out_si = {
|
||||
.rate = sampleRate,
|
||||
.channels = inChannels,
|
||||
.precision = SOX_SAMPLE_PRECISION,
|
||||
};
|
||||
|
||||
// need to be locked because libsox doesn't like simultaneous opening of the
|
||||
// output
|
||||
std::unique_lock lock(soxMtx);
|
||||
sox_format_t *output =
|
||||
sox_open_write("default", &out_si, NULL, "alsa", NULL, NULL);
|
||||
soxMtx.unlock();
|
||||
|
||||
if (!output) {
|
||||
std::abort();
|
||||
}
|
||||
|
||||
std::vector<sox_sample_t> samples(inSamples * inChannels);
|
||||
|
||||
std::size_t clips = 0;
|
||||
SOX_SAMPLE_LOCALS;
|
||||
|
||||
while (!exit.load(std::memory_order::relaxed)) {
|
||||
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);
|
||||
for (std::size_t i = 0; i < samples.size(); i++) {
|
||||
samples[i] = SOX_SIGNED_16BIT_TO_SAMPLE(data[i], clips);
|
||||
}
|
||||
} else {
|
||||
auto data = reinterpret_cast<const float *>(audioBuffer);
|
||||
for (std::size_t i = 0; i < samples.size(); i++) {
|
||||
samples[i] = SOX_FLOAT_32BIT_TO_SAMPLE(data[i], clips);
|
||||
}
|
||||
}
|
||||
|
||||
if (sox_write(output, samples.data(), samples.size()) != samples.size()) {
|
||||
ORBIS_LOG_ERROR("AudioOut: sox_write failed");
|
||||
}
|
||||
|
||||
// set zero to freeing audiooutput
|
||||
params->control = 0;
|
||||
|
||||
// skip sceAudioOutMix%x event
|
||||
info.evf->set(bitPattern);
|
||||
}
|
||||
|
||||
sox_close(output);
|
||||
|
||||
::munmap(audioBuffer, bufferStat.st_size);
|
||||
::munmap(controlPtr, controlStat.st_size);
|
||||
|
||||
::close(controlFd);
|
||||
::close(bufferFd);
|
||||
}
|
||||
};
|
||||
} // namespace orbis
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#pragma once
|
||||
#include "AudioOut.hpp"
|
||||
#include "KernelAllocator.hpp"
|
||||
#include "evf.hpp"
|
||||
#include "ipmi.hpp"
|
||||
|
|
@ -178,7 +177,6 @@ public:
|
|||
Ref<RcBase> shmDevice;
|
||||
Ref<RcBase> dmemDevice;
|
||||
Ref<RcBase> blockpoolDevice;
|
||||
AudioOut *audioOut = nullptr;
|
||||
uint sdkVersion{};
|
||||
uint fwSdkVersion{};
|
||||
uint safeMode{};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue