jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aja: Fix memory overrun on aja-source

Browse Source 
When too many audio frames are captured and at the same time the ring
buffer on the card is wrapped, memory overrun was not captured before
DMA transfer, which resulted in corruption of memory contents. This
commit moves the overrun check before the DMA transfer.
This commit is contained in:
Norihiro Kamae 2022-07-01 18:57:22 +09:00 committed by Matt Gajownik
parent 62c6a6d223
commit 08a071d7a5
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/aja/aja-source.cpp
View File

@ -293,11 +293,28 @@ void AJASource::CaptureThread(AJAThread *thread, void *data)
audioOverrun = true;
}
if (!audioOverrun) {
if (!audioOverrun)
card->DMAReadAudio(audioSystem,
ajaSource->mAudioBuffer,
offsets.lastAddress,
offsets.bytesRead);
if (!audioOverrun &&
offsets.currentAddress - offsets.readOffset >
ajaSource->mAudioBuffer.GetByteCount() -
offsets.bytesRead) {
blog(LOG_DEBUG,
"AJASource::CaptureThread: Audio overrun (2)! Buffer Size: %d, Bytes Captured: %d",
ajaSource->mAudioBuffer.GetByteCount() -
offsets.bytesRead,
offsets.currentAddress -
offsets.readOffset);
ResetAudioBufferOffsets(card, audioSystem,
offsets);
audioOverrun = true;
}
if (!audioOverrun) {
card->DMAReadAudio(
audioSystem,
reinterpret_cast<ULWord *>(
@ -311,16 +328,6 @@ void AJASource::CaptureThread(AJAThread *thread, void *data)
offsets.readOffset;
}
if (offsets.bytesRead >
ajaSource->mAudioBuffer.GetByteCount()) {
blog(LOG_DEBUG,
"AJASource::CaptureThread: Audio overrun (2)! Buffer Size: %d, Bytes Captured: %d",
ajaSource->mAudioBuffer.GetByteCount(),
offsets.bytesRead);
ResetAudioBufferOffsets(card, audioSystem,
offsets);
audioOverrun = true;
}
} else {
offsets.bytesRead =
offsets.currentAddress - offsets.lastAddress;