project: replaced proxy with pre-cache
Removed proxy task and replaced with a true honest-to-god pre-cache for footage. This footage is pre-cached to a sequence and therefore 100% ready for use in it once the task is done.
This commit is contained in:
Vendored
+2
@@ -18,5 +18,7 @@ set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
task/cache/cache.h
|
||||
task/cache/cache.cpp
|
||||
task/cache/footagecache.h
|
||||
task/cache/footagecache.cpp
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
Vendored
+1
-2
@@ -36,10 +36,9 @@ public:
|
||||
const AudioParams &aparams,
|
||||
bool in_out_only);
|
||||
|
||||
public slots:
|
||||
protected:
|
||||
virtual bool Run() override;
|
||||
|
||||
protected:
|
||||
virtual QFuture<void> DownloadFrame(FramePtr frame, const QByteArray &hash) override;
|
||||
|
||||
virtual void FrameDownloaded(const QByteArray& hash, const std::list<rational>& times) override;
|
||||
|
||||
Vendored
+53
@@ -0,0 +1,53 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2019 Olive Team
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
***/
|
||||
|
||||
#include "footagecache.h"
|
||||
|
||||
#include "common/timecodefunctions.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
|
||||
FootageCacheTask::FootageCacheTask(VideoStreamPtr footage, Sequence *sequence) :
|
||||
CacheTask(new ViewerOutput(), sequence->video_params(), sequence->audio_params(), false),
|
||||
footage_(footage)
|
||||
{
|
||||
viewer()->set_video_params(sequence->video_params());
|
||||
viewer()->set_audio_params(sequence->audio_params());
|
||||
backend()->SetVideoParams(sequence->video_params());
|
||||
backend()->SetAudioParams(sequence->audio_params());
|
||||
|
||||
video_node_ = new VideoInput();
|
||||
video_node_->SetFootage(footage);
|
||||
|
||||
NodeParam::ConnectEdge(video_node_->output(), viewer()->texture_input());
|
||||
|
||||
SetTitle(tr("Pre-caching %1:%2").arg(footage->footage()->filename(),
|
||||
QString::number(footage->index())));
|
||||
|
||||
backend()->ProcessUpdateQueue();
|
||||
}
|
||||
|
||||
FootageCacheTask::~FootageCacheTask()
|
||||
{
|
||||
delete viewer();
|
||||
delete video_node_;
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
Vendored
+48
@@ -0,0 +1,48 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2019 Olive Team
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
***/
|
||||
|
||||
#ifndef FOOTAGECACHETASK_H
|
||||
#define FOOTAGECACHETASK_H
|
||||
|
||||
#include "cache.h"
|
||||
#include "node/input/media/video/video.h"
|
||||
#include "project/item/footage/footage.h"
|
||||
#include "project/item/sequence/sequence.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
|
||||
class FootageCacheTask : public CacheTask
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
FootageCacheTask(VideoStreamPtr footage, Sequence* sequence);
|
||||
|
||||
virtual ~FootageCacheTask() override;
|
||||
|
||||
private:
|
||||
VideoStreamPtr footage_;
|
||||
|
||||
VideoInput* video_node_;
|
||||
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
|
||||
#endif // FOOTAGECACHETASK_H
|
||||
Reference in New Issue
Block a user