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

various: greatly simplified job times

Browse Source 
Hopefully this doesn't break everything
This commit is contained in:
itsmattkc
2021-07-11 23:33:21 -07:00
parent 43d3fc57f2
commit 310fd3541a
28 changed files with 157 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/export/export.cpp
+2 -5
View File
@@ -147,9 +147,8 @@ bool ExportTask::Run()
return success;
}
void ExportTask::FrameDownloaded(FramePtr f, const QByteArray &hash, const QVector<rational> &times, qint64 job_time)
void ExportTask::FrameDownloaded(FramePtr f, const QByteArray &hash, const QVector<rational> &times)
{
Q_UNUSED(job_time)
Q_UNUSED(hash)
foreach (const rational& t, times) {
@@ -179,10 +178,8 @@ void ExportTask::FrameDownloaded(FramePtr f, const QByteArray &hash, const QVect
}
}
void ExportTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples, qint64 job_time)
void ExportTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples)
{
Q_UNUSED(job_time)
TimeRange adjusted_range = range;
if (params_.has_custom_range()) {
app/task/export/export.h
+2 -2
View File
@@ -38,9 +38,9 @@ public:
protected:
virtual bool Run() override;
virtual void FrameDownloaded(FramePtr frame, const QByteArray& hash, const QVector<rational>& times, qint64 job_time) override;
virtual void FrameDownloaded(FramePtr frame, const QByteArray& hash, const QVector<rational>& times) override;
virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples, qint64 job_time) override;
virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples) override;
virtual void EncodeSubtitle(const SubtitleBlock *sub) override;
app/task/precache/precachetask.cpp
+2 -4
View File
@@ -74,7 +74,7 @@ bool PreCacheTask::Run()
return true;
}
void PreCacheTask::FrameDownloaded(FramePtr frame, const QByteArray &hash, const QVector<rational> &times, qint64 job_time)
void PreCacheTask::FrameDownloaded(FramePtr frame, const QByteArray &hash, const QVector<rational> &times)
{
// Do nothing. Pre-cache essentially just creates more frames in the cache, it doesn't need to do
// anything else.
@@ -82,16 +82,14 @@ void PreCacheTask::FrameDownloaded(FramePtr frame, const QByteArray &hash, const
Q_UNUSED(frame)
Q_UNUSED(hash)
Q_UNUSED(times)
Q_UNUSED(job_time)
}
void PreCacheTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples, qint64 job_time)
void PreCacheTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples)
{
// Pre-cache doesn't cache any audio
Q_UNUSED(range)
Q_UNUSED(samples)
Q_UNUSED(job_time)
}
}
app/task/precache/precachetask.h
+2 -2
View File
@@ -38,9 +38,9 @@ public:
protected:
virtual bool Run() override;
virtual void FrameDownloaded(FramePtr frame, const QByteArray& hash, const QVector<rational>& times, qint64 job_time) override;
virtual void FrameDownloaded(FramePtr frame, const QByteArray& hash, const QVector<rational>& times) override;
virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples, qint64 job_time) override;
virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples) override;
private:
Project* project_;
app/task/render/render.cpp
+2 -6
View File
@@ -55,8 +55,6 @@ bool RenderTask::Render(ColorManager* manager,
double total_length = 0;
// Store real time before any rendering takes place
qint64 job_time = QDateTime::currentMSecsSinceEpoch();
// Queue audio jobs
foreach (const TimeRange& range, audio_range) {
// Don't count audio progress, since it's generally a lot faster than video and is weighted at
@@ -193,9 +191,7 @@ bool RenderTask::Render(ColorManager* manager,
TimeRange range = watcher->property("range").value<TimeRange>();
AudioDownloaded(range,
watcher->Get().value<SampleBufferPtr>(),
job_time);
AudioDownloaded(range, watcher->Get().value<SampleBufferPtr>());
// Don't count audio progress, since it's generally a lot faster than video and is weighted at
// 50%, which makes the progress bar look weird to the uninitiated
@@ -217,7 +213,7 @@ bool RenderTask::Render(ColorManager* manager,
// Assume single-step video or video download ticket
QByteArray rendered_hash = watcher->property("hash").toByteArray();
FrameDownloaded(watcher->Get().value<FramePtr>(), rendered_hash, time_map.value(rendered_hash), job_time);
FrameDownloaded(watcher->Get().value<FramePtr>(), rendered_hash, time_map.value(rendered_hash));
if (native_progress_signalling_) {
double progress_to_add = 1.0;
app/task/render/render.h
+2 -2
View File
@@ -51,9 +51,9 @@ protected:
virtual void DownloadFrame(QThread* thread, FramePtr frame, const QByteArray &hash);
virtual void FrameDownloaded(FramePtr frame, const QByteArray& hash, const QVector<rational>& times, qint64 job_time) = 0;
virtual void FrameDownloaded(FramePtr frame, const QByteArray& hash, const QVector<rational>& times) = 0;
virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples, qint64 job_time) = 0;
virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples) = 0;
virtual void EncodeSubtitle(const SubtitleBlock *subtitle);