preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-12 17:19:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16681 from unknownbrackets/mic-safety

Browse Source 
Cleanup some mic data reading
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2022-12-31 08:35:26 +01:00
2 parents ba2fab5b22 ff3e70be2f
commit 360ef22b2d
1 file changed
+13 -15
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceUsbMic.cpp
+13 -15
View File
@@ -232,7 +232,7 @@ void QueueBuf::resize(u32 newSize) {
u8 *oldbuf = buf_;
buf_ = new u8[newSize];
pop(buf_, availableSize);
pop(buf_, std::min(availableSize, newSize));
available = availableSize;
end = availableSize;
capacity = newSize;
@@ -376,18 +376,16 @@ u32 Microphone::getReadMicDataLength() {
}
int Microphone::addAudioData(u8 *buf, u32 size) {
if (audioBuf)
audioBuf->push(buf, size);
else
if (!audioBuf)
return 0;
if (Memory::IsValidAddress(curTargetAddr)) {
u32 addSize = std::min(audioBuf->getAvailableSize(), numNeedSamples() * 2 - getReadMicDataLength());
u8 *tempbuf8 = new u8[addSize];
getAudioData(tempbuf8, addSize);
Memory::Memcpy(curTargetAddr + readMicDataLength, tempbuf8, addSize);
delete[] tempbuf8;
readMicDataLength += addSize;
audioBuf->push(buf, size);
u32 addSize = std::min(audioBuf->getAvailableSize(), numNeedSamples() * 2 - getReadMicDataLength());
if (Memory::IsValidRange(curTargetAddr + readMicDataLength, addSize)) {
getAudioData(Memory::GetPointerWriteUnchecked(curTargetAddr + readMicDataLength), addSize);
NotifyMemInfo(MemBlockFlags::WRITE, curTargetAddr + readMicDataLength, addSize, "MicAddAudioData");
}
readMicDataLength += addSize;
return size;
}
@@ -442,10 +440,10 @@ u32 __MicInput(u32 maxSamples, u32 sampleRate, u32 bufAddr, MICTYPE type, bool b
if (Microphone::availableAudioBufSize() > 0) {
u32 addSize = std::min(Microphone::availableAudioBufSize(), size);
u8 *tempbuf8 = new u8[addSize];
Microphone::getAudioData(tempbuf8, addSize);
Memory::Memcpy(curTargetAddr, tempbuf8, addSize);
delete[] tempbuf8;
if (Memory::IsValidRange(curTargetAddr, addSize)) {
Microphone::getAudioData(Memory::GetPointerWriteUnchecked(curTargetAddr), addSize);
NotifyMemInfo(MemBlockFlags::WRITE, curTargetAddr, addSize, "MicInput");
}
readMicDataLength += addSize;
}