rendermanager: make declaring render mode mandatory
This commit is contained in:
@@ -671,7 +671,8 @@ RenderTicketWatcher* PreviewAutoCacher::RenderFrame(Node *node, const rational&
|
|||||||
copied_viewer_node_->GetVideoParams(),
|
copied_viewer_node_->GetVideoParams(),
|
||||||
copied_viewer_node_->GetAudioParams(),
|
copied_viewer_node_->GetAudioParams(),
|
||||||
time,
|
time,
|
||||||
copied_color_manager_);
|
copied_color_manager_,
|
||||||
|
RenderMode::kOffline);
|
||||||
|
|
||||||
if (FrameHashCache *frame_cache = dynamic_cast<FrameHashCache *>(cache)) {
|
if (FrameHashCache *frame_cache = dynamic_cast<FrameHashCache *>(cache)) {
|
||||||
if (ThumbnailCache *wave_cache = dynamic_cast<ThumbnailCache *>(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.AddCache(frame_cache);
|
||||||
}
|
}
|
||||||
|
|
||||||
rvp.mode = RenderMode::kOffline;
|
|
||||||
rvp.return_type = dry ? RenderManager::kNull : RenderManager::kTexture;
|
rvp.return_type = dry ? RenderManager::kNull : RenderManager::kTexture;
|
||||||
|
|
||||||
// Allow using cached images for this render job
|
// 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,
|
RenderManager::RenderAudioParams rap(node,
|
||||||
r,
|
r,
|
||||||
copied_viewer_node_->GetAudioParams());
|
copied_viewer_node_->GetAudioParams(),
|
||||||
|
RenderMode::kOffline);
|
||||||
|
|
||||||
rap.generate_waveforms = dynamic_cast<AudioWaveformCache*>(cache);
|
rap.generate_waveforms = dynamic_cast<AudioWaveformCache*>(cache);
|
||||||
rap.clamp = false;
|
rap.clamp = false;
|
||||||
rap.mode = RenderMode::kOffline;
|
|
||||||
|
|
||||||
RenderTicketPtr ticket = RenderManager::instance()->RenderAudio(rap);
|
RenderTicketPtr ticket = RenderManager::instance()->RenderAudio(rap);
|
||||||
watcher->SetTicket(ticket);
|
watcher->SetTicket(ticket);
|
||||||
|
|||||||
@@ -131,6 +131,7 @@ RenderTicketPtr RenderManager::RenderAudio(const RenderAudioParams ¶ms)
|
|||||||
ticket->setProperty("enablewaveforms", params.generate_waveforms);
|
ticket->setProperty("enablewaveforms", params.generate_waveforms);
|
||||||
ticket->setProperty("clamp", params.clamp);
|
ticket->setProperty("clamp", params.clamp);
|
||||||
ticket->setProperty("aparam", QVariant::fromValue(params.audio_params));
|
ticket->setProperty("aparam", QVariant::fromValue(params.audio_params));
|
||||||
|
ticket->setProperty("mode", params.mode);
|
||||||
|
|
||||||
audio_thread_->AddTicket(ticket);
|
audio_thread_->AddTicket(ticket);
|
||||||
|
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ public:
|
|||||||
|
|
||||||
struct RenderVideoParams {
|
struct RenderVideoParams {
|
||||||
RenderVideoParams(Node *n, const VideoParams &vparam, const AudioParams &aparam, const rational &t,
|
RenderVideoParams(Node *n, const VideoParams &vparam, const AudioParams &aparam, const rational &t,
|
||||||
ColorManager *colorman)
|
ColorManager *colorman, RenderMode::Mode m)
|
||||||
{
|
{
|
||||||
node = n;
|
node = n;
|
||||||
video_params = vparam;
|
video_params = vparam;
|
||||||
@@ -116,7 +116,7 @@ public:
|
|||||||
force_color_output = nullptr;
|
force_color_output = nullptr;
|
||||||
force_size = QSize(0, 0);
|
force_size = QSize(0, 0);
|
||||||
force_channel_count = 0;
|
force_channel_count = 0;
|
||||||
mode = RenderMode::kOffline;
|
mode = m;
|
||||||
}
|
}
|
||||||
|
|
||||||
void AddCache(FrameHashCache *cache)
|
void AddCache(FrameHashCache *cache)
|
||||||
@@ -159,14 +159,14 @@ public:
|
|||||||
RenderTicketPtr RenderFrame(const RenderVideoParams ¶ms);
|
RenderTicketPtr RenderFrame(const RenderVideoParams ¶ms);
|
||||||
|
|
||||||
struct RenderAudioParams {
|
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;
|
node = n;
|
||||||
range = time;
|
range = time;
|
||||||
audio_params = aparam;
|
audio_params = aparam;
|
||||||
generate_waveforms = false;
|
generate_waveforms = false;
|
||||||
clamp = true;
|
clamp = true;
|
||||||
mode = RenderMode::kOffline;
|
mode = m;
|
||||||
}
|
}
|
||||||
|
|
||||||
Node *node;
|
Node *node;
|
||||||
|
|||||||
@@ -62,9 +62,8 @@ bool RenderTask::Render(ColorManager* manager,
|
|||||||
|
|
||||||
RenderManager::RenderAudioParams rap(viewer_->GetConnectedSampleOutput(),
|
RenderManager::RenderAudioParams rap(viewer_->GetConnectedSampleOutput(),
|
||||||
range,
|
range,
|
||||||
audio_params_);
|
audio_params_,
|
||||||
|
RenderMode::kOnline);
|
||||||
rap.mode = RenderMode::kOnline;
|
|
||||||
|
|
||||||
RenderTicketWatcher* watcher = new RenderTicketWatcher();
|
RenderTicketWatcher* watcher = new RenderTicketWatcher();
|
||||||
watcher->setProperty("range", QVariant::fromValue(range));
|
watcher->setProperty("range", QVariant::fromValue(range));
|
||||||
@@ -284,14 +283,13 @@ void RenderTask::StartTicket(QThread* watcher_thread, ColorManager* manager,
|
|||||||
ColorProcessorPtr force_color_output)
|
ColorProcessorPtr force_color_output)
|
||||||
{
|
{
|
||||||
RenderManager::RenderVideoParams rvp(viewer_->GetConnectedTextureOutput(), video_params_, audio_params_,
|
RenderManager::RenderVideoParams rvp(viewer_->GetConnectedTextureOutput(), video_params_, audio_params_,
|
||||||
time, manager);
|
time, manager, mode);
|
||||||
|
|
||||||
rvp.force_size = force_size;
|
rvp.force_size = force_size;
|
||||||
rvp.force_matrix = force_matrix;
|
rvp.force_matrix = force_matrix;
|
||||||
rvp.force_format = force_format;
|
rvp.force_format = force_format;
|
||||||
rvp.force_color_output = force_color_output;
|
rvp.force_color_output = force_color_output;
|
||||||
rvp.force_channel_count = force_channel_count;
|
rvp.force_channel_count = force_channel_count;
|
||||||
rvp.mode = mode;
|
|
||||||
|
|
||||||
if (cache) {
|
if (cache) {
|
||||||
rvp.AddCache(cache);
|
rvp.AddCache(cache);
|
||||||
|
|||||||
Reference in New Issue
Block a user