Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Beaterator: Prevent hanging when trying to record audio by switching thread in sceUsbMicWaitInputEnd

Browse Source
This commit is contained in:
Henrik Rydgård 2024-10-15 15:29:46 +02:00
parent 65a088537f
commit 1280fcc581
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/HLE/sceUsbMic.cpp
View File

@ -273,7 +273,7 @@ static int sceUsbMicInput(u32 maxSamples, u32 sampleRate, u32 bufAddr) {
return -1; return -1;
} }
ERROR_LOG(Log::HLE, "UNTEST sceUsbMicInput: maxSamples: %d, samplerate: %d, bufAddr: %08x", maxSamples, sampleRate, bufAddr); WARN_LOG(Log::HLE, "UNTEST sceUsbMicInput: maxSamples: %d, samplerate: %d, bufAddr: %08x", maxSamples, sampleRate, bufAddr);
if (maxSamples <= 0 || (maxSamples & 0x3F) != 0) { if (maxSamples <= 0 || (maxSamples & 0x3F) != 0) {
return SCE_USBMIC_ERROR_INVALID_MAX_SAMPLES; return SCE_USBMIC_ERROR_INVALID_MAX_SAMPLES;
} }
@ -284,6 +284,7 @@ static int sceUsbMicInput(u32 maxSamples, u32 sampleRate, u32 bufAddr) {
return __MicInput(maxSamples, sampleRate, bufAddr, USBMIC, false); return __MicInput(maxSamples, sampleRate, bufAddr, USBMIC, false);
} }
static int sceUsbMicGetInputLength() { static int sceUsbMicGetInputLength() {
int ret = Microphone::getReadMicDataLength() / 2; int ret = Microphone::getReadMicDataLength() / 2;
ERROR_LOG(Log::HLE, "UNTEST sceUsbMicGetInputLength(ret: %d)", ret); ERROR_LOG(Log::HLE, "UNTEST sceUsbMicGetInputLength(ret: %d)", ret);
@ -297,7 +298,8 @@ static int sceUsbMicInputInit(int unknown1, int inputVolume, int unknown2) {
static int sceUsbMicWaitInputEnd() { static int sceUsbMicWaitInputEnd() {
ERROR_LOG(Log::HLE, "UNIMPL sceUsbMicWaitInputEnd"); ERROR_LOG(Log::HLE, "UNIMPL sceUsbMicWaitInputEnd");
return 0; // Hack: Just task switch so other threads get to do work. Helps Beaterator (although recording does not appear to work correctly).
return hleDelayResult(0, "MicWait", 100);
} }
int Microphone::startMic(void *param) { int Microphone::startMic(void *param) {