Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup some mic data reading #16681

Merged
merged 2 commits into from
Dec 31, 2022
Merged

Cleanup some mic data reading #16681

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a85370
UsbMic: Avoid some temp buffers, check range.
unknownbrackets Dec 31, 2022
ff3e70b
UsbMic: Fix copy on resize shrink.
unknownbrackets Dec 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions Core/HLE/sceUsbMic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand Down