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

Add OFX plugin support and related infrastructure

Browse Source 
This commit extends the OFX plugin support in Olive by:

- Initializing and scanning for OFX plugins
- Updating PluginNode to handle OFX plugin parameters and inputs
- Adding necessary methods and properties for OFX plugin integration
- Enhancing NodeFactory to include OFX plugin nodes
- Refactoring and renaming OliveInstance to OlivePluginInstance
- Introducing new classes for parameter handling (ParamInstance)
- Adding PluginJob for rendering OFX plugins
- Adjusting CMakeLists.txt files to include new source files
This commit is contained in:
Mike-Solar
2025-11-09 17:03:56 +08:00
parent 26e6924cdf
commit 8a7b6cf869
23 changed files with 545 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CMakeLists.txt
+2
View File
@@ -55,6 +55,8 @@ configure_file(ts/translations.qrc.in ts/translations.qrc @ONLY)
set(OLIVE_RESOURCES
${OLIVE_RESOURCES}
${CMAKE_CURRENT_BINARY_DIR}/ts/translations.qrc
render/job/pluginjob.cpp
render/job/pluginjob.h
)
# Add version object
app/common/Current.h
+24
View File
@@ -19,7 +19,9 @@
#ifndef CURRENT_H
#define CURRENT_H
#include "pluginSupport/OliveHost.h"
#include "render/videoparams.h"
#include "render/job/pluginjob.h"
class Current {
public:
@@ -55,10 +57,32 @@ public:
{
return true;
}
std::shared_ptr<olive::plugin::OliveHost> pluginHost()
{
return myHost;
}
void setPluginHost(std::shared_ptr<olive::plugin::OliveHost> host)
{
myHost = host;
}
std::shared_ptr<OFX::Host::ImageEffect::PluginCache> pluginCache()
{
return plugin_cache_;
}
void setPluginCache(std::shared_ptr<OFX::Host::ImageEffect::PluginCache> cache)
{
plugin_cache_ = cache;
}
private:
static Current current;
olive::VideoParams currentVideoParams_;
olive::AudioParams currentAudioParams_;
std::shared_ptr<olive::plugin::OliveHost> myHost;
std::shared_ptr<OFX::Host::ImageEffect::PluginCache> plugin_cache_;
};
app/node/factory.cpp
+16
View File
@@ -29,6 +29,7 @@
#include "block/transition/diptocolor/diptocolortransition.h"
#include "color/displaytransform/displaytransform.h"
#include "color/ociogradingtransformlinear/ociogradingtransformlinear.h"
#include "common/Current.h"
#include "distort/cornerpin/cornerpindistortnode.h"
#include "distort/crop/cropdistortnode.h"
#include "distort/flip/flipdistortnode.h"
@@ -62,6 +63,8 @@
#include "math/trigonometry/trigonometry.h"
#include "output/track/track.h"
#include "output/viewer/viewer.h"
#include "pluginSupport/OliveHost.h"
#include "plugins/Plugin.h"
#include "project/folder/folder.h"
#include "project/footage/footage.h"
#include "project/sequence/sequence.h"
@@ -84,6 +87,19 @@ void NodeFactory::Initialize()
library_.append(created_node);
}
std::shared_ptr<olive::plugin::OliveHost> host=std::make_shared<olive::plugin::OliveHost>();
Current::getInstance().setPluginHost(host);
std::shared_ptr<OFX::Host::ImageEffect::PluginCache> plugin_cache=std::make_shared<OFX::Host::ImageEffect::PluginCache>(*host);
plugin_cache->registerInCache(*OFX::Host::PluginCache::getPluginCache());
OFX::Host::PluginCache::getPluginCache()->scanPluginFiles();
for (auto plugin : OFX::Host::PluginCache::getPluginCache()->getPlugins()) {
plugin::PluginNode *plugin_node=new plugin::PluginNode(dynamic_cast<OFX::Host::ImageEffect::ImageEffectPlugin*>(plugin));
library_.append(plugin_node);
}
}
void NodeFactory::Destroy()
app/node/node.h
+4 -2
View File
@@ -19,6 +19,8 @@
#ifndef NODE_H
#define NODE_H
#include "ofxhImageEffectAPI.h"
#include <map>
#include <QMutex>
#include <QObject>
@@ -1124,11 +1126,11 @@ public:
static const QString kEnabledInput;
std::shared_ptr<OFX::Host::ImageEffect::ImageEffectPlugin> getPlugin();
OFX::Host::ImageEffect::ImageEffectPlugin* getPlugin();
protected:
// If is set, this is a plugin node.
std::shared_ptr<OFX::Host::ImageEffect::ImageEffectPlugin> plugin;
OFX::Host::ImageEffect::ImageEffectPlugin* plugin= nullptr;
void InsertInput(const QString &id, NodeValue::Type type,
const QVariant &default_value, InputFlags flags,
app/node/plugins/Plugin.cpp
+70 -25
View File
@@ -17,44 +17,89 @@
*/
#include "Plugin.h"
#include "render/rendermanager.h"
#include "render/job/pluginjob.h"
olive::plugin::PluginNode::PluginNode(
OFX::Host::ImageEffect::ImageEffectPlugin *plugin)
{
this->plugin = plugin;
auto params = plugin->getDescriptor().getParams();
for (auto param: params) {
NodeValue::Type type;
const std::string &ofxType = param.second->getType();
if (ofxType == kOfxParamTypeInteger) {
type = NodeValue::kInt;
} else if (ofxType == kOfxParamTypeDouble) {
type = NodeValue::kFloat;
} else if (ofxType == kOfxParamTypeBoolean) {
type = NodeValue::kBoolean;
} else if (ofxType == kOfxParamTypeString) {
type = NodeValue::kText;
} else if (ofxType == kOfxParamTypeRGB ||
ofxType == kOfxParamTypeRGBA) {
type = NodeValue::kColor;
} else if (ofxType == kOfxParamTypeChoice) {
type = NodeValue::kCombo;
} else if (ofxType == kOfxParamTypeDouble2D ||
ofxType == kOfxParamTypeInteger2D){
type = NodeValue::kVec2;}
else if (ofxType == kOfxParamTypeDouble3D ||
ofxType == kOfxParamTypeInteger3D){
type = NodeValue::kVec3;
} else if (ofxType == kOfxParamTypeStrChoice){
type = NodeValue::kStrCombo;
}else if (ofxType == kOfxParamTypeBytes
|| ofxType == kOfxParamTypeCustom) {
type = NodeValue::kBinary;
} else {
type = NodeValue::kNone;
}
if (ofxType == kOfxParamTypePushButton) {
// TODO
} else if (ofxType == kOfxParamTypeGroup) {
// TODO
} else if (ofxType == kOfxParamTypePage) {
// TODO
}
AddInput(param.second->getName().data(), type);
}
}
QString olive::plugin::PluginNode::Name() const
{
if (methods.name) {
char buffer[64]={0};
bool ok=methods.name(buffer, 64);
if (ok) {
return QString(buffer);
}
}
return "";
return plugin->getDescriptor()
.getProps()
.getStringProperty(kOfxPropLabel)
.data();
}
QString olive::plugin::PluginNode::Description() const
{
if (methods.description) {
char buffer[1024] = { 0 };
bool ok = methods.description(buffer, 1024);
if (ok) {
return QString(buffer);
}
}
return "";
return plugin->getDescriptor().getProps().getStringProperty(kOfxPropPluginDescription).data();
}
void olive::plugin::PluginNode::Value(const NodeValueRow &value,
const NodeGlobals &globals,
NodeValueTable *table) const
{
methods.value(&node_ctx_functions);
TexturePtr tex = value[kTextureInput].toTexture();
if (tex) {
PluginJob job(,value);
table->Push(NodeValue::kTexture, tex->toJob(job), this);
}
}
QString olive::plugin::PluginNode::id() const
{
if (methods.id) {
char buffer[64]={0};
bool ok=methods.id(buffer, 64);
if (ok) {
return QString(buffer);
}
}
return "";
return plugin->getIdentifier().data();
}
app/node/plugins/Plugin.h
+40 -16
View File
@@ -18,36 +18,60 @@
#ifndef PLUGIN_NODES_H
#define PLUGIN_NODES_H
#include "ofxhImageEffectAPI.h"
#include "ofxhPluginCache.h"
#include "node/node.h"
#include "pluginSupport/Plugin.h"
#include "pluginSupport/OlivePlugin.cpp"
namespace olive
{
namespace plugin
{
const QString kTextureInput = QStringLiteral("tex_in");
class PluginNode : public olive::Node{
public:
PluginNode():Node()
{
memset(&methods, 0, sizeof(olive_node_methods));
};
explicit PluginNode(struct olive_node_methods methods):Node()
{
this->methods=methods;
}
void setMethods(struct olive_node_methods methods)
{
this->methods=methods;
}
PluginNode(OFX::Host::ImageEffect::ImageEffectPlugin* plugin) ;
QString Name() const override;
QString id() const override;
QVector<CategoryID> Category() const override;
QString Description() const override;
void AddPushButton();
void AddPage();
Node *copy() const override;
/**
* @brief The main processing function
*
* The node's main purpose is to take values from inputs to set values in outputs. For whatever subclass node you
* create, this is where the code for that goes.
*
* Note that as a video editor, the node graph has to work across time. Depending on the purpose of your node, it may
* output different values depending on the time, and even if not, it will likely be receiving different input
* depending on the time. Most of the difficult work here is handled by NodeInput::get_value() which you should pass
* the `time` parameter to. It will return its value (at that time, if it's keyframed), or pass the time to a
* corresponding output if it's connected to one. If your node doesn't directly deal with time, the default behavior
* of the NodeParam objects will handle everything related to it automatically.
*/
void Value(const NodeValueRow &value,
const NodeGlobals &globals, NodeValueTable *table) const override;
private:
struct olive_node_methods methods;
/**
* @brief If Value() pushes a ShaderJob, this is the function that will process them.
*/
virtual void ProcessSamples(const NodeValueRow &values,
const SampleBuffer &input, SampleBuffer &output,
int index) const;
/**
* @brief If Value() pushes a GenerateJob, override this function for the image to create
*
* @param frame
*
* The destination buffer. It will already be allocated and ready for writing to.
*/
virtual void GenerateFrame(FramePtr frame, const GenerateJob &job) const;
};
app/node/traverser.cpp
+4
View File
@@ -387,6 +387,10 @@ QVector2D NodeTraverser::GenerateResolution() const
video_params_.height());
}
/**
* Resolve Jobs. I need to add a PluginJob here and move the plugin code here.
* @param val
*/
void NodeTraverser::ResolveJobs(NodeValue &val)
{
if (val.type() == NodeValue::kTexture) {
app/node/value.h
+7 -1
View File
@@ -163,7 +163,13 @@ public:
* Resolves to `int` - the index currently selected
*/
kCombo,
/**
* ComboBox type
*
* Resolves to `QString` - the text of choice currently selected
* This is to support the OpenFX type kOfxParamTypeStrChoice
*/
kStrCombo,
/**
* Video Parameters type
*
app/pluginSupport/CMakeLists.txt
+6 -2
View File
@@ -1,6 +1,10 @@
target_sources(libolive-editor PRIVATE
OliveHost.h
OliveHost.cpp
OliveInstance.h
OliveInstance.cpp
OlivePluginInstance.h
OlivePluginInstance.cpp
OliveClip.cpp
OliveClip.h
paraminstance.cpp
paraminstance.h
)
app/pluginSupport/OliveHost.cpp
+5 -12
View File
@@ -26,22 +26,15 @@
#include <QDir>
#include "OliveHost.h"
#include "OliveInstance.h"
#include "OlivePluginInstance.h"
#include "common/Current.h"
using namespace OFX::Host;
using namespace olive::plugin;
void loadPlugins(QString path)
void olive::plugin::loadPlugins(QString path)
{
QDir dir=(QCoreApplication::applicationDirPath()+path);
QFileInfoList files=dir.entryInfoList();
for (auto& file:files) {
if (file.isDir()) {
OFX::Binary binary(file.absoluteFilePath().toStdString());
}
}
OFX::Host::ImageEffect::PluginCache imageEffectPluginCache(myHost);
}
OliveHost::~OliveHost()
{
for(auto& descriptor:descriptors_){
@@ -82,7 +75,7 @@ OFX::Host::ImageEffect::Instance* OliveHost::newInstance(void* clientData,
OFX::Host::ImageEffect::ImageEffectPlugin* plugin,
OFX::Host::ImageEffect::Descriptor& desc,
const std::string& context){
ImageEffect::Instance* instance=new OliveInstance(plugin,desc,context,Current::getInstance().interactive());
ImageEffect::Instance* instance=new OlivePluginInstance(plugin,desc,context,Current::getInstance().interactive());
instances_.append(instance);
return instance;
};
app/pluginSupport/OliveHost.h
+4 -1
View File
@@ -15,6 +15,8 @@
* 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 OLIVE_HOST_H
#define OLIVE_HOST_H
#include "ofxhHost.h"
#include "ofxhImageEffectAPI.h"
#include "ofxCore.h"
@@ -66,4 +68,5 @@ private:
QList<OFX::Host::ImageEffect::Instance*> instances_;
};
}
}
}
#endif
app/pluginSupport/OliveInstance.cpp → app/pluginSupport/OlivePluginInstance.cpp
+15 -14
View File
@@ -15,7 +15,7 @@
* 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 "OliveInstance.h"
#include "OlivePluginInstance.h"
#include "OliveClip.h"
#include "ofxCore.h"
@@ -28,11 +28,12 @@
#include <qobject.h>
#include <string.h>
#include <QString>
#include "paraminstance.h"
namespace olive
{
namespace plugin
{
OfxStatus OliveInstance::vmessage(const char *type, const char *id,
OfxStatus OlivePluginInstance::vmessage(const char *type, const char *id,
const char *format, va_list args)
{
char *buffer = new char[1024];
@@ -59,7 +60,7 @@ OfxStatus OliveInstance::vmessage(const char *type, const char *id,
return kOfxStatOK;
}
}
OfxStatus OliveInstance::setPersistentMessage(const char *type, const char *id,
OfxStatus OlivePluginInstance::setPersistentMessage(const char *type, const char *id,
const char *format, va_list args)
{
char *buffer = new char[1024];
@@ -95,66 +96,66 @@ OfxStatus OliveInstance::setPersistentMessage(const char *type, const char *id,
}
return kOfxStatOK;
}
OfxStatus OliveInstance::clearPersistentMessage()
OfxStatus OlivePluginInstance::clearPersistentMessage()
{
persistentErrors_.clear();
// TODO: tell the shell to remove message.
return kOfxStatOK;
}
void OliveInstance::getProjectSize(double &xSize, double &ySize) const
void OlivePluginInstance::getProjectSize(double &xSize, double &ySize) const
{
xSize =params_.width();
ySize =params_.height();
}
void OliveInstance::getProjectOffset(double &xOffset, double &yOffset) const
void OlivePluginInstance::getProjectOffset(double &xOffset, double &yOffset) const
{
xOffset =params_.x();
yOffset =params_.y();
}
void OliveInstance::getProjectExtent(double &xSize, double &ySize) const
void OlivePluginInstance::getProjectExtent(double &xSize, double &ySize) const
{
xSize =params_.width();
ySize =params_.height();
// TODO: Ensure this project does not support this.
}
double OliveInstance::getProjectPixelAspectRatio() const
double OlivePluginInstance::getProjectPixelAspectRatio() const
{
return Current::getInstance()
.currentVideoParams()
.pixel_aspect_ratio()
.toDouble();
}
double OliveInstance::getFrameRate() const
double OlivePluginInstance::getFrameRate() const
{
return params_.frame_rate().toDouble();
}
double OliveInstance::getEffectDuration() const
double OlivePluginInstance::getEffectDuration() const
{
// Return a default duration value
return 100.0;
}
double OliveInstance::getFrameRecursive() const
double OlivePluginInstance::getFrameRecursive() const
{
// Return current frame (this would typically be set by the host during rendering)
return 0.0;
}
void OliveInstance::getRenderScaleRecursive(double &x, double &y) const
void OlivePluginInstance::getRenderScaleRecursive(double &x, double &y) const
{
// Return default render scale (1.0, 1.0)
x = 1.0;
y = 1.0;
}
OFX::Host::Param::Instance *
OliveInstance::newParam(const std::string &name,
OlivePluginInstance::newParam(const std::string &name,
OFX::Host::Param::Descriptor &Descriptor)
{
}
OFX::Host::ImageEffect::ClipInstance *OliveInstance::newClipInstance(
OFX::Host::ImageEffect::ClipInstance *OlivePluginInstance::newClipInstance(
OFX::Host::ImageEffect::Instance *plugin,
OFX::Host::ImageEffect::ClipDescriptor *descriptor,
int index)
app/pluginSupport/OliveInstance.h → app/pluginSupport/OlivePluginInstance.h
+7 -5
View File
@@ -15,7 +15,8 @@
* 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 OLIVE_INSTANCE_H
#define OLIVE_INSTANCE_H
#include "ofxCore.h"
#include "ofxImageEffect.h"
#include <QString>
@@ -36,9 +37,9 @@ struct PersistentErrors{
ErrorType type;
QString message;
};
class OliveInstance : public OFX::Host::ImageEffect::Instance {
class OlivePluginInstance : public OFX::Host::ImageEffect::Instance {
public:
OliveInstance(
OlivePluginInstance(
OFX::Host::ImageEffect::ImageEffectPlugin* plugin,
OFX::Host::ImageEffect::Descriptor& desc,
const std::string& context,
@@ -46,7 +47,7 @@ public:
: OFX::Host::ImageEffect::Instance(plugin, desc, context, interactive)
{
}
~OliveInstance() override = default;
~OlivePluginInstance() override = default;
const std::string &getDefaultOutputFielding() const{
return kOfxImageFieldNone;
};
@@ -151,4 +152,5 @@ private:
VideoParams params_;
};
}
}
}
#endif
app/pluginSupport/paraminstance.cpp
+22
View File
@@ -0,0 +1,22 @@
/*
* Olive Community Edition - Non-Linear Video Editor
* Copyright (C) 2025 Olive CE 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 "paraminstance.h"
app/pluginSupport/paraminstance.h
+149
View File
@@ -0,0 +1,149 @@
/*
* Olive Community Edition - Non-Linear Video Editor
* Copyright (C) 2025 Olive CE 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/>.
*
*/
// Copyright OpenFX and contributors to the OpenFX project.
#ifndef PARAM_INSTANCE_H
#define PARAM_INSTANCE_H
#include "OlivePluginInstance.h"
#include "ofxhParam.h"
namespace olive
{
namespace plugin
{
class PushbuttonInstance : public OFX::Host::Param::PushbuttonInstance {
protected:
OlivePluginInstance* _effect;
OFX::Host::Param::Descriptor *_descriptor;
public:
PushbuttonInstance(OlivePluginInstance *effect, const std::string &name,
OFX::Host::Param::Descriptor &descriptor)
: OFX::Host::Param::PushbuttonInstance( descriptor)
{
_descriptor = &descriptor;
};
};
class IntegerInstance : public OFX::Host::Param::IntegerInstance {
protected:
OlivePluginInstance* _effect;
OFX::Host::Param::Descriptor& _descriptor;
public:
IntegerInstance(OlivePluginInstance* effect, const std::string& name, OFX::Host::Param::Descriptor& descriptor);
OfxStatus get(int&);
OfxStatus get(OfxTime time, int&);
OfxStatus set(int);
OfxStatus set(OfxTime time, int);
};
class DoubleInstance : public OFX::Host::Param::DoubleInstance {
protected:
OlivePluginInstance* _effect;
OFX::Host::Param::Descriptor& _descriptor;
public:
DoubleInstance(OlivePluginInstance* effect, const std::string& name, OFX::Host::Param::Descriptor& descriptor);
OfxStatus get(double&);
OfxStatus get(OfxTime time, double&);
OfxStatus set(double);
OfxStatus set(OfxTime time, double);
OfxStatus derive(OfxTime time, double&);
OfxStatus integrate(OfxTime time1, OfxTime time2, double&);
};
class BooleanInstance : public OFX::Host::Param::BooleanInstance {
protected:
OlivePluginInstance* _effect;
OFX::Host::Param::Descriptor& _descriptor;
public:
BooleanInstance(OlivePluginInstance* effect, const std::string& name, OFX::Host::Param::Descriptor& descriptor);
OfxStatus get(bool&);
OfxStatus get(OfxTime time, bool&);
OfxStatus set(bool);
OfxStatus set(OfxTime time, bool);
};
class ChoiceInstance : public OFX::Host::Param::ChoiceInstance {
protected:
OlivePluginInstance* _effect;
OFX::Host::Param::Descriptor& _descriptor;
public:
ChoiceInstance(OlivePluginInstance* effect, const std::string& name, OFX::Host::Param::Descriptor& descriptor);
OfxStatus get(int&);
OfxStatus get(OfxTime time, int&);
OfxStatus set(int);
OfxStatus set(OfxTime time, int);
};
class RGBAInstance : public OFX::Host::Param::RGBAInstance {
protected:
OlivePluginInstance* _effect;
OFX::Host::Param::Descriptor& _descriptor;
public:
RGBAInstance(OlivePluginInstance* effect, const std::string& name, OFX::Host::Param::Descriptor& descriptor);
OfxStatus get(double&,double&,double&,double&);
OfxStatus get(OfxTime time, double&,double&,double&,double&);
OfxStatus set(double,double,double,double);
OfxStatus set(OfxTime time, double,double,double,double);
};
class RGBInstance : public OFX::Host::Param::RGBInstance {
protected:
OlivePluginInstance* _effect;
OFX::Host::Param::Descriptor& _descriptor;
public:
RGBInstance(OlivePluginInstance* effect, const std::string& name, OFX::Host::Param::Descriptor& descriptor);
OfxStatus get(double&,double&,double&);
OfxStatus get(OfxTime time, double&,double&,double&);
OfxStatus set(double,double,double);
OfxStatus set(OfxTime time, double,double,double);
};
class Double2DInstance : public OFX::Host::Param::Double2DInstance {
protected:
OlivePluginInstance* _effect;
OFX::Host::Param::Descriptor& _descriptor;
public:
Double2DInstance(OlivePluginInstance* effect, const std::string& name, OFX::Host::Param::Descriptor& descriptor);
OfxStatus get(double&,double&);
OfxStatus get(OfxTime time,double&,double&);
OfxStatus set(double,double);
OfxStatus set(OfxTime time,double,double);
};
class Integer2DInstance : public OFX::Host::Param::Integer2DInstance {
protected:
OlivePluginInstance* _effect;
OFX::Host::Param::Descriptor& _descriptor;
public:
Integer2DInstance(OlivePluginInstance* effect, const std::string& name, OFX::Host::Param::Descriptor& descriptor);
OfxStatus get(int&,int&);
OfxStatus get(OfxTime time,int&,int&);
OfxStatus set(int,int);
OfxStatus set(OfxTime time,int,int);
};
}
}
#endif // HOST_DEMO_PARAM_INSTANCE_H
#endif //PARAMINSTANCE_H
app/render/job/CMakeLists.txt
+3 -1
View File
@@ -22,5 +22,7 @@ set(OLIVE_SOURCES
render/job/generatejob.h
render/job/samplejob.h
render/job/shaderjob.h
PARENT_SCOPE
render/job/pluginjob.h
render/job/pluginjob.cpp
PARENT_SCOPE
)
app/render/job/acceleratedjob.h
+7 -7
View File
@@ -33,22 +33,22 @@ public:
{
}
NodeValue Get(const QString &input) const
virtual NodeValue Get(const QString &input) const
{
return value_map_.value(input);
}
void Insert(const QString &input, const NodeValueRow &row)
virtual void Insert(const QString &input, const NodeValueRow &row)
{
value_map_.insert(input, row.value(input));
}
void Insert(const QString &input, const NodeValue &value)
virtual void Insert(const QString &input, const NodeValue &value)
{
value_map_.insert(input, value);
}
void Insert(const NodeValueRow &row)
virtual void Insert(const NodeValueRow &row)
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
value_map_.insert(row);
@@ -59,16 +59,16 @@ public:
#endif
}
const NodeValueRow &GetValues() const
virtual const NodeValueRow &GetValues() const
{
return value_map_;
}
NodeValueRow &GetValues()
virtual NodeValueRow &GetValues()
{
return value_map_;
}
private:
protected:
NodeValueRow value_map_;
};
app/render/job/pluginjob.cpp
+25
View File
@@ -0,0 +1,25 @@
/*
* Olive Community Edition - Non-Linear Video Editor
* Copyright (C) 2025 Olive CE 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 "pluginjob.h"
namespace olive {
namespace plugin {
} // plugin
} // olive
app/render/job/pluginjob.h
+50
View File
@@ -0,0 +1,50 @@
/*
* Olive Community Edition - Non-Linear Video Editor
* Copyright (C) 2025 Olive CE 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 PLUGINJOB_H
#define PLUGINJOB_H
#include "acceleratedjob.h"
#include "pluginSupport/OlivePluginInstance.h"
#include <any>
namespace olive {
namespace plugin {
class PluginJob :public AcceleratedJob{
public:
explicit PluginJob(std::shared_ptr<OlivePluginInstance> pluginInstance, NodeValueRow row): AcceleratedJob()
{
this->pluginInstance = pluginInstance;
}
private:
std::shared_ptr<OlivePluginInstance> pluginInstance;
QHash<OfxTime, QHash<QString, std::any>> paramsOnTime;
QHash<QString, std::any> params;
};
} // plugin
} // olive
#endif //PLUGINJOB_H
app/render/plugin/CMakeLists.txt
+1
View File
@@ -0,0 +1 @@
target_sources(libolive-editor PRIVATE pluginrenderer.cpp pluginrenderer.h)
app/render/plugin/pluginrenderer.cpp
+33
View File
@@ -0,0 +1,33 @@
/*
* Olive Community Edition - Non-Linear Video Editor
* Copyright (C) 2025 Olive CE 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/>.
*
*/
//
// Created by mikesolar on 25-10-19.
//
#include "pluginrenderer.h"
#include "pluginSupport/OlivePluginInstance.h"
void olive::plugin::PluginRenderer::Blit(QVariant shader, ShaderJob job,
Texture *destination,
VideoParams destination_params,
bool clear_destination)
{
}
app/render/plugin/pluginrenderer.h
+46
View File
@@ -0,0 +1,46 @@
/*
* Olive Community Edition - Non-Linear Video Editor
* Copyright (C) 2025 Olive CE 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/>.
*
*/
//
// Created by mikesolar on 25-10-19.
//
#ifndef PLUGINRENDERER_H
#define PLUGINRENDERER_H
#include "render/renderer.h"
namespace olive
{
namespace plugin{
class PluginRenderer : public olive::Renderer{
Q_OBJECT
public:
PluginRenderer(QObject *parent=nullptr):Renderer(parent){};
protected:
void Blit(QVariant shader,
ShaderJob job,
Texture *destination,
VideoParams destination_params,
bool clear_destination) override;
};
}
}
#endif //PLUGINRENDERER_H
app/render/renderprocessor.cpp
+5 -4
View File
@@ -169,7 +169,7 @@ void RenderProcessor::Run()
}
// if is a plugin
Node *node=ticket_->property("node").value<Node*>();
/*Node *node=ticket_->property("node").value<Node*>();
if (node && node->getPlugin()) {
std::shared_ptr<OFX::Host::ImageEffect::ImageEffectPlugin> plugin
= node->getPlugin();
@@ -214,7 +214,7 @@ void RenderProcessor::Run()
int numFramesToRender=ticket_->property("time").value<rational>().toDouble()
* params.frame_rate().toDouble();
stat = instance->beginRenderAction(0, numFramesToRender, 1.0, false, renderScale, /*sequential=*/true, /*interactive=*/false
stat = instance->beginRenderAction(0, numFramesToRender, 1.0, false, renderScale, /*sequential=#1#true, /*interactive=#1#false
);
if (stat != kOfxStatOK && stat != kOfxStatReplyDefault) {
ticket_->Finish();
@@ -239,7 +239,7 @@ void RenderProcessor::Run()
assert(stat == kOfxStatOK || stat == kOfxStatReplyDefault);
// render a frame
stat = instance->renderAction(t,kOfxImageFieldBoth,renderWindow, renderScale, /*sequential=*/true, /*interactive=*/false, /*draft=*/false);
stat = instance->renderAction(t,kOfxImageFieldBoth,renderWindow, renderScale, /*sequential=#1#true, /*interactive=#1#false, /*draft=#1#false);
assert(stat == kOfxStatOK);
// get the output image buffer
@@ -250,9 +250,10 @@ void RenderProcessor::Run()
exportToPPM(ss.str(), outputImage);
}
instance->endRenderAction(0, numFramesToRender, 1.0, false, renderScale, /*sequential=*/true, /*interactive=*/false
instance->endRenderAction(0, numFramesToRender, 1.0, false, renderScale, /*sequential=#1#true, /*interactive=#1#false
);
}
*/
switch (type) {
case RenderManager::kTypeVideo: {