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

Merge branch 'master' into multicam

Browse Source
This commit is contained in:
itsmattkc
2022-09-29 21:18:30 -07:00
parent 2d0af6f335 b28495c7a6
commit 76e0e2bd13
17 changed files with 191 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/rendermanager.cpp
+9 -2
View File
@@ -55,7 +55,11 @@ RenderManager::RenderManager(QObject *parent) :
video_thread_ = CreateThread(context_);
dry_run_thread_ = CreateThread();
audio_thread_ = CreateThread();
waveform_thread_ = CreateThread();
waveform_threads_.resize(QThread::idealThreadCount());
for (size_t i=0; i<waveform_threads_.size(); i++) {
waveform_threads_[i] = CreateThread();
}
}
decoder_clear_timer_ = new QTimer(this);
@@ -136,7 +140,10 @@ RenderTicketPtr RenderManager::RenderAudio(const RenderAudioParams &params)
ticket->setProperty("mode", params.mode);
if (params.generate_waveforms) {
waveform_thread_->AddTicket(ticket);
size_t thread_index = last_waveform_thread_%waveform_threads_.size();
RenderThread *thread = waveform_threads_[thread_index];
thread->AddTicket(ticket);
last_waveform_thread_++;
} else {
audio_thread_->AddTicket(ticket);
}