From 6638edb7616bbc7ba17fb56897175000690afcfe Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 29 May 2020 15:25:18 +1000 Subject: [PATCH] rendertask: ensure backend nodes are copied the main thread May not be a permanent solution, but should prevents race conditions for the time being. --- app/task/render/render.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/task/render/render.cpp b/app/task/render/render.cpp index 2b6a50b0c..03614faea 100644 --- a/app/task/render/render.cpp +++ b/app/task/render/render.cpp @@ -29,6 +29,11 @@ RenderTask::RenderTask(ViewerOutput* viewer, const VideoRenderingParams &vparams video_params_(vparams), audio_params_(aparams) { + // FIXME: This makes a full copy of the node graph every time it starts, there must be a better + // way. + backend_.SetViewerNode(viewer_); + backend_.SetVideoParams(video_params_); + backend_.SetAudioParams(audio_params_); } struct TimeHashFuturePair { @@ -61,11 +66,6 @@ void RenderTask::Render(const TimeRangeList& video_range, const QMatrix4x4& mat, bool use_disk_cache) { - // FIXME: This makes a full copy of the node graph every time it starts, there must be a better - // way. - backend_.SetViewerNode(viewer_); - backend_.SetVideoParams(video_params_); - backend_.SetAudioParams(audio_params_); backend_.SetVideoDownloadMatrix(mat); std::list audio_lookup_table;