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

sequence: made divider a sequence parameter rather than a viewer parameter

Browse Source 
Doing this makes the preview resolution an explicit project setting rather
than a temporary UI setting. This will allow more consistency when caching.
This commit is contained in:
itsmattkc
2020-06-08 14:41:35 +10:00
parent ee3fa529cb
commit 430561e2ac
81 changed files with 549 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/cache/cache.cpp
Vendored
+4 -1
View File
@@ -27,13 +27,16 @@
OLIVE_NAMESPACE_ENTER
CacheTask::CacheTask(ViewerOutput* viewer, const VideoRenderingParams& vparams, const AudioRenderingParams &aparams, bool in_out_only) :
CacheTask::CacheTask(ViewerOutput* viewer, const VideoParams& vparams, const AudioParams &aparams, bool in_out_only) :
RenderTask(viewer, vparams, aparams),
in_out_only_(in_out_only)
{
SetTitle(tr("Caching \"%1\"").arg(viewer->media_name()));
backend()->EnablePreviewGeneration(job_time());
// Render fastest quality
backend()->SetRenderMode(RenderMode::kOffline);
}
bool CacheTask::Run()
app/task/cache/cache.h
Vendored
+2 -2
View File
@@ -32,8 +32,8 @@ class CacheTask : public RenderTask
Q_OBJECT
public:
CacheTask(ViewerOutput* viewer,
const VideoRenderingParams &vparams,
const AudioRenderingParams &aparams,
const VideoParams &vparams,
const AudioParams &aparams,
bool in_out_only);
public slots:
app/task/conform/conform.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
OLIVE_NAMESPACE_ENTER
ConformTask::ConformTask(AudioStreamPtr stream, const AudioRenderingParams& params) :
ConformTask::ConformTask(AudioStreamPtr stream, const AudioParams& params) :
stream_(stream),
params_(params)
{
app/task/conform/conform.h
+2 -2
View File
@@ -30,7 +30,7 @@ OLIVE_NAMESPACE_ENTER
class ConformTask : public Task
{
public:
ConformTask(AudioStreamPtr stream, const AudioRenderingParams& params);
ConformTask(AudioStreamPtr stream, const AudioParams& params);
public slots:
virtual bool Run() override;
@@ -38,7 +38,7 @@ public slots:
private:
AudioStreamPtr stream_;
AudioRenderingParams params_;
AudioParams params_;
};
app/task/export/export.cpp
+3
View File
@@ -33,6 +33,9 @@ ExportTask::ExportTask(ViewerOutput* viewer_node,
params_(params)
{
SetTitle(tr("Exporting \"%1\"").arg(viewer_node->media_name()));
// Render highest quality
backend()->SetRenderMode(RenderMode::kOnline);
}
bool ExportTask::Run()
app/task/render/render.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
OLIVE_NAMESPACE_ENTER
RenderTask::RenderTask(ViewerOutput* viewer, const VideoRenderingParams &vparams, const AudioRenderingParams &aparams) :
RenderTask::RenderTask(ViewerOutput* viewer, const VideoParams &vparams, const AudioParams &aparams) :
viewer_(viewer),
video_params_(vparams),
audio_params_(aparams)
app/task/render/render.h
+5 -5
View File
@@ -32,7 +32,7 @@ OLIVE_NAMESPACE_ENTER
class RenderTask : public Task
{
public:
RenderTask(ViewerOutput* viewer, const VideoRenderingParams &vparams, const AudioRenderingParams &aparams);
RenderTask(ViewerOutput* viewer, const VideoParams &vparams, const AudioParams &aparams);
protected:
void Render(const TimeRangeList &video_range,
@@ -51,12 +51,12 @@ protected:
return viewer_;
}
VideoRenderingParams video_params() const
VideoParams video_params() const
{
return video_params_;
}
AudioRenderingParams audio_params() const
AudioParams audio_params() const
{
return audio_params_;
}
@@ -76,9 +76,9 @@ protected:
private:
ViewerOutput* viewer_;
VideoRenderingParams video_params_;
VideoParams video_params_;
AudioRenderingParams audio_params_;
AudioParams audio_params_;
rational anchor_point_;