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

rendermanager: make declaring render mode mandatory

Browse Source
This commit is contained in:
itsmattkc
2022-08-18 08:21:16 -07:00
parent 54d0a94a20
commit b24cf3e658
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/previewautocacher.cpp
+4 -4
View File
@@ -671,7 +671,8 @@ RenderTicketWatcher* PreviewAutoCacher::RenderFrame(Node *node, const rational&
copied_viewer_node_->GetVideoParams(),
copied_viewer_node_->GetAudioParams(),
time,
copied_color_manager_);
copied_color_manager_,
RenderMode::kOffline);
if (FrameHashCache *frame_cache = dynamic_cast<FrameHashCache *>(cache)) {
if (ThumbnailCache *wave_cache = dynamic_cast<ThumbnailCache *>(cache)) {
@@ -687,7 +688,6 @@ RenderTicketWatcher* PreviewAutoCacher::RenderFrame(Node *node, const rational&
rvp.AddCache(frame_cache);
}
rvp.mode = RenderMode::kOffline;
rvp.return_type = dry ? RenderManager::kNull : RenderManager::kTexture;
// Allow using cached images for this render job
@@ -710,11 +710,11 @@ RenderTicketPtr PreviewAutoCacher::RenderAudio(Node *node, const TimeRange &r, P
RenderManager::RenderAudioParams rap(node,
r,
copied_viewer_node_->GetAudioParams());
copied_viewer_node_->GetAudioParams(),
RenderMode::kOffline);
rap.generate_waveforms = dynamic_cast<AudioWaveformCache*>(cache);
rap.clamp = false;
rap.mode = RenderMode::kOffline;
RenderTicketPtr ticket = RenderManager::instance()->RenderAudio(rap);
watcher->SetTicket(ticket);
app/render/rendermanager.cpp
+1
View File
@@ -131,6 +131,7 @@ RenderTicketPtr RenderManager::RenderAudio(const RenderAudioParams &params)
ticket->setProperty("enablewaveforms", params.generate_waveforms);
ticket->setProperty("clamp", params.clamp);
ticket->setProperty("aparam", QVariant::fromValue(params.audio_params));
ticket->setProperty("mode", params.mode);
audio_thread_->AddTicket(ticket);
app/render/rendermanager.h
+4 -4
View File
@@ -103,7 +103,7 @@ public:
struct RenderVideoParams {
RenderVideoParams(Node *n, const VideoParams &vparam, const AudioParams &aparam, const rational &t,
ColorManager *colorman)
ColorManager *colorman, RenderMode::Mode m)
{
node = n;
video_params = vparam;
@@ -116,7 +116,7 @@ public:
force_color_output = nullptr;
force_size = QSize(0, 0);
force_channel_count = 0;
mode = RenderMode::kOffline;
mode = m;
}
void AddCache(FrameHashCache *cache)
@@ -159,14 +159,14 @@ public:
RenderTicketPtr RenderFrame(const RenderVideoParams &params);
struct RenderAudioParams {
RenderAudioParams(Node *n, const TimeRange &time, const AudioParams &aparam)
RenderAudioParams(Node *n, const TimeRange &time, const AudioParams &aparam, RenderMode::Mode m)
{
node = n;
range = time;
audio_params = aparam;
generate_waveforms = false;
clamp = true;
mode = RenderMode::kOffline;
mode = m;
}
Node *node;
app/task/render/render.cpp
+3 -5
View File
@@ -62,9 +62,8 @@ bool RenderTask::Render(ColorManager* manager,
RenderManager::RenderAudioParams rap(viewer_->GetConnectedSampleOutput(),
range,
audio_params_);
rap.mode = RenderMode::kOnline;
audio_params_,
RenderMode::kOnline);
RenderTicketWatcher* watcher = new RenderTicketWatcher();
watcher->setProperty("range", QVariant::fromValue(range));
@@ -284,14 +283,13 @@ void RenderTask::StartTicket(QThread* watcher_thread, ColorManager* manager,
ColorProcessorPtr force_color_output)
{
RenderManager::RenderVideoParams rvp(viewer_->GetConnectedTextureOutput(), video_params_, audio_params_,
time, manager);
time, manager, mode);
rvp.force_size = force_size;
rvp.force_matrix = force_matrix;
rvp.force_format = force_format;
rvp.force_color_output = force_color_output;
rvp.force_channel_count = force_channel_count;
rvp.mode = mode;
if (cache) {
rvp.AddCache(cache);