Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-29 16:57:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

adjust samples to PS4<->switch

Browse source
This commit is contained in:
lizzie 2026-05-17 23:28:08 +00:00
parent de07799d1e
commit b47a82feb1
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@
#include "audio_core/common/common.h" #include "audio_core/common/common.h"
#include "audio_core/sink/ps4_sink.h" #include "audio_core/sink/ps4_sink.h"
#include "audio_core/sink/sink_stream.h" #include "audio_core/sink/sink_stream.h"
#include "common/alignment.h"
#include "common/logging.h" #include "common/logging.h"
#include "common/scope_exit.h" #include "common/scope_exit.h"
#include "core/core.h" #include "core/core.h"
@ -32,25 +33,26 @@ struct PS4SinkStream final : public SinkStream {
system_channels = system_channels_; system_channels = system_channels_;
device_channels = device_channels_; device_channels = device_channels_;
auto const length = 0x800; 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);
auto const sample_rate = 48000;
auto const num_channels = this->GetDeviceChannels();
auto const param_type = num_channels == 1 ? ORBIS_AUDIO_OUT_PARAM_FORMAT_S16_MONO : ORBIS_AUDIO_OUT_PARAM_FORMAT_S16_STEREO;
audio_dev = sceAudioOutOpen(ORBIS_USER_SERVICE_USER_ID_SYSTEM, ORBIS_AUDIO_OUT_PORT_TYPE_MAIN, 0, length, sample_rate, param_type);
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::vector<s16> output_buffer(length * num_channels); std::array<s16, TargetSampleCount * MaxChannels> buffer;
while (!stop_token.stop_requested()) { while (!stop_token.stop_requested()) {
if (this->type == StreamType::In) { if (this->type == StreamType::In) {
// this->ProcessAudioIn(input_buffer, length); this->ProcessAudioIn(buffer, TargetSampleCount);
(void)buffer; // TODO: microphone support
} else { } else {
int err = 0; int err = 0;
this->ProcessAudioOutAndRender(output_buffer, length); std::fill(buffer.begin(), buffer.end(), 0);
this->ProcessAudioOutAndRender(buffer, TargetSampleCount);
sceAudioOutOutput(audio_dev, nullptr); sceAudioOutOutput(audio_dev, nullptr);
if ((err = sceAudioOutOutput(audio_dev, output_buffer.data())) < 0) if ((err = sceAudioOutOutput(audio_dev, buffer.data())) < 0)
LOG_ERROR(Service_Audio, "{}", err); LOG_ERROR(Service_Audio, "{}", err);
} }
// Wait for pause, we don't really have a native pause
// so this is the best i can do
while (paused && !stop_token.stop_requested())
;
} }
sceAudioOutClose(audio_dev); sceAudioOutClose(audio_dev);
}); });
@ -81,7 +83,7 @@ struct PS4SinkStream final : public SinkStream {
void Stop() override { void Stop() override {
if (audio_dev > 0 && !paused) { if (audio_dev > 0 && !paused) {
SignalPause();
} }
} }
@ -150,7 +152,7 @@ std::vector<std::string> ListPS4SinkDevices(bool capture) {
} }
u32 GetPS4Latency() { u32 GetPS4Latency() {
return TargetSampleCount * 2; return TargetSampleCount;
} }
} // namespace AudioCore::Sink } // namespace AudioCore::Sink