Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-05-14 08:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "sceNetAccept sleep and SDLAudio::AudioOutOutput latency and cpu improvements (#507)"

Browse source 
This reverts commit d66d129357.
This commit is contained in:
georgemoralis 2024-09-11 12:56:41 +03:00
parent dd61c2a0d1
commit ccf02d0aed
2 changed files with 12 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/audio_core/sdl_audio.cpp
View file

@ -84,7 +84,7 @@ int SDLAudio::AudioOutOpen(int type, u32 samples_num, u32 freq,
port.stream = port.stream =
SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &fmt, NULL, NULL); SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &fmt, NULL, NULL);
SDL_ResumeAudioDevice(SDL_GetAudioStreamDevice(port.stream)); SDL_ResumeAudioDevice(SDL_GetAudioStreamDevice(port.stream));
return id + 1; // Handle range 1..n keeps 0 reserved return id + 1;
} }
} }
@ -93,35 +93,22 @@ int SDLAudio::AudioOutOpen(int type, u32 samples_num, u32 freq,
s32 SDLAudio::AudioOutOutput(s32 handle, const void* ptr) { s32 SDLAudio::AudioOutOutput(s32 handle, const void* ptr) {
std::shared_lock lock{m_mutex}; std::shared_lock lock{m_mutex};
if (handle < 1 || handle > portsOut.size()) {
// Handle is outside range 1..n
return ORBIS_AUDIO_OUT_ERROR_INVALID_PORT;
}
auto& port = portsOut[handle - 1]; auto& port = portsOut[handle - 1];
if (!port.isOpen) { if (!port.isOpen) {
return ORBIS_AUDIO_OUT_ERROR_INVALID_PORT; return ORBIS_AUDIO_OUT_ERROR_INVALID_PORT;
} }
if (ptr == nullptr) {
// Allow call with null - this acts as "wait for buffer ready" return 0;
if (ptr != nullptr) { }
// TODO mixing channels // TODO mixing channels
int result = SDL_PutAudioStreamData( int result = SDL_PutAudioStreamData(port.stream, ptr,
port.stream, ptr, port.samples_num * port.sample_size * port.channels_num); port.samples_num * port.sample_size * port.channels_num);
if (result != 0) { // TODO find a correct value 8192 is estimated
// There's various possible failures, just assume some buffer is full while (SDL_GetAudioStreamAvailable(port.stream) > 65536) {
return ORBIS_AUDIO_OUT_ERROR_PORT_FULL; SDL_Delay(0);
}
} }
auto bytesPerSecond = 48000 * port.sample_size * port.channels_num; return result;
const int TARGET_LATENCY_MS = 20; // Arbitrary, but slightly more than one 60fps frame
auto sizeTarget = (bytesPerSecond * TARGET_LATENCY_MS) / 1000;
while (SDL_GetAudioStreamAvailable(port.stream) > sizeTarget) {
SDL_Delay(1); // Sleep behaviour is platform-dependent; 1ms may be up to 17ms
}
return ORBIS_OK;
} }
bool SDLAudio::AudioOutSetVolume(s32 handle, s32 bitflag, s32* volume) { bool SDLAudio::AudioOutSetVolume(s32 handle, s32 bitflag, s32* volume) {

5
src/core/libraries/network/net.cpp
View file

@ -1,8 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <thread>
#ifdef WIN32 #ifdef WIN32
#define _WINSOCK_DEPRECATED_NO_WARNINGS #define _WINSOCK_DEPRECATED_NO_WARNINGS
#include <Ws2tcpip.h> #include <Ws2tcpip.h>
@ -61,8 +59,7 @@ int PS4_SYSV_ABI sce_net_in6addr_nodelocal_allnodes() {
} }
OrbisNetId PS4_SYSV_ABI sceNetAccept(OrbisNetId s, OrbisNetSockaddr* addr, u32* paddrlen) { OrbisNetId PS4_SYSV_ABI sceNetAccept(OrbisNetId s, OrbisNetSockaddr* addr, u32* paddrlen) {
LOG_ERROR(Lib_Net, "(STUBBED) called [sleeping]"); LOG_ERROR(Lib_Net, "(STUBBED) called");
std::this_thread::sleep_for(std::chrono::seconds(5));
return ORBIS_OK; return ORBIS_OK;
} }