oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audiorenderworker: added assert for problematic audio behavior that could

Browse Source 
corrupt the heap
This commit is contained in:
itsmattkc
2020-02-23 22:20:01 +11:00
parent 6956e159e6
commit ff516b6202
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/backend/audiorenderworker.cpp
+17 -7
View File
@@ -47,11 +47,9 @@ NodeValueTable AudioRenderWorker::RenderBlock(const TrackOutput *track, const Ti
TimeRange range_for_block(qMax(b->in(), range.in()),
qMin(b->out(), range.out()));
// Destination buffer
NodeValueTable table = ProcessNode(NodeDependency(b, range_for_block));
QByteArray samples_from_this_block = table.Take(NodeParam::kSamples).toByteArray();
int destination_offset = audio_params_.time_to_bytes(range_for_block.in() - range.in());
int maximum_copy_size = audio_params_.time_to_bytes(range_for_block.length());
if (!samples_from_this_block.isEmpty()) {
// Stretch samples here
@@ -80,11 +78,23 @@ NodeValueTable AudioRenderWorker::RenderBlock(const TrackOutput *track, const Ti
AudioManager::ReverseBuffer(samples_from_this_block.data(), samples_from_this_block.size(), audio_params_.samples_to_bytes(1));
}
int actual_copy_size = qMin(maximum_copy_size, samples_from_this_block.size());
int destination_offset = audio_params_.time_to_bytes(range_for_block.in() - range.in());
int actual_copy_size = qMin(audio_params_.time_to_bytes(range_for_block.length()), samples_from_this_block.size());
memcpy(block_range_buffer.data()+destination_offset,
samples_from_this_block.data(),
actual_copy_size);
if (destination_offset < 0
|| destination_offset + actual_copy_size < 0
|| destination_offset >= block_range_buffer.size()
|| destination_offset + actual_copy_size >= block_range_buffer.size()) {
qCritical() << "Tried to copy audio beyond the size of the destination buffer";
qCritical() << " Destination size:" << block_range_buffer.size();
qCritical() << " Destination offset:" << destination_offset;
qCritical() << " Copy size:" << actual_copy_size;
abort();
} else {
memcpy(block_range_buffer.data()+destination_offset,
samples_from_this_block.data(),
actual_copy_size);
}
}
NodeValueTable::Merge({merged_table, table});