Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-07-02 02:35:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

all audio issues magically fixed

Browse source
This commit is contained in:
lizzie 2026-06-30 07:54:33 +00:00
parent 6338482414
commit 7fac613461
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/audio_core/sink/ps4_sink.cpp
View file

@ -33,18 +33,20 @@ struct PS4SinkStream final : public SinkStream {
system_channels = system_channels_; system_channels = system_channels_;
device_channels = device_channels_; device_channels = device_channels_;
audio_dev = sceAudioOutOpen(ORBIS_USER_SERVICE_USER_ID_SYSTEM, ORBIS_AUDIO_OUT_PORT_TYPE_MAIN, 0, Common::AlignUp(TargetSampleCount, 0x100), TargetSampleRate, device_channels > 1 ? ORBIS_AUDIO_OUT_PARAM_FORMAT_S16_STEREO : ORBIS_AUDIO_OUT_PARAM_FORMAT_S16_MONO); constexpr size_t PREFERRED_SAMPLE_COUNT = 1024;
auto const param = (device_channels > 1 ? ORBIS_AUDIO_OUT_PARAM_FORMAT_S16_STEREO : ORBIS_AUDIO_OUT_PARAM_FORMAT_S16_MONO);
audio_dev = sceAudioOutOpen(ORBIS_USER_SERVICE_USER_ID_SYSTEM, ORBIS_AUDIO_OUT_PORT_TYPE_MAIN, 0, PREFERRED_SAMPLE_COUNT, TargetSampleRate, param);
if (audio_dev > 0) { if (audio_dev > 0) {
audio_thread = std::jthread([=, this](std::stop_token stop_token) { audio_thread = std::jthread([=, this](std::stop_token stop_token) {
std::array<s16, TargetSampleCount * MaxChannels> buffer; std::array<s16, PREFERRED_SAMPLE_COUNT * MaxChannels> buffer;
while (!stop_token.stop_requested()) { while (!stop_token.stop_requested()) {
if (this->type == StreamType::In) { if (this->type == StreamType::In) {
this->ProcessAudioIn(buffer, TargetSampleCount); this->ProcessAudioIn(buffer, PREFERRED_SAMPLE_COUNT);
(void)buffer; // TODO: microphone support (void)buffer; // TODO: microphone support
} else { } else {
int err = 0; int err = 0;
std::fill(buffer.begin(), buffer.end(), 0); std::fill(buffer.begin(), buffer.end(), 0);
this->ProcessAudioOutAndRender(buffer, TargetSampleCount); this->ProcessAudioOutAndRender(buffer, PREFERRED_SAMPLE_COUNT);
sceAudioOutOutput(audio_dev, nullptr); sceAudioOutOutput(audio_dev, nullptr);
if ((err = sceAudioOutOutput(audio_dev, buffer.data())) < 0) if ((err = sceAudioOutOutput(audio_dev, buffer.data())) < 0)
LOG_ERROR(Service_Audio, "{}", err); LOG_ERROR(Service_Audio, "{}", err);
@ -52,7 +54,7 @@ struct PS4SinkStream final : public SinkStream {
// Wait for pause, we don't really have a native pause // Wait for pause, we don't really have a native pause
// so this is the best i can do // so this is the best i can do
while (paused && !stop_token.stop_requested()) while (paused && !stop_token.stop_requested())
; asm volatile ("pause"); //dont shootup cpu usage to 100%
} }
sceAudioOutClose(audio_dev); sceAudioOutClose(audio_dev);
}); });