openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some big performance issues (some which were causing crashes) in effects (Brightness and Saturation), and created a factory class for effects, to reduce redundent code.

Browse Source
This commit is contained in:
Jonathan Thomas
2016-08-16 22:40:51 -05:00
parent d0b14fe3d3
commit a3ef86a695
8 changed files with 66 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Clip.cpp
View File

@@ -856,34 +856,16 @@ void Clip::SetJsonValue(Json::Value root) {
// Create Effect
EffectBase *e = NULL;
if (!existing_effect["type"].isNull())
// Init the matching effect object
if (existing_effect["type"].asString() == "Blur")
e = new Blur();
if (!existing_effect["type"].isNull()) {
// Create instance of effect
e = EffectInfo().CreateEffect(existing_effect["type"].asString());
else if (existing_effect["type"].asString() == "Brightness")
e = new Brightness();
// Load Json into Effect
e->SetJsonValue(existing_effect);
else if (existing_effect["type"].asString() == "ChromaKey")
e = new ChromaKey();
else if (existing_effect["type"].asString() == "Deinterlace")
e = new Deinterlace();
else if (existing_effect["type"].asString() == "Mask")
e = new Mask();
else if (existing_effect["type"].asString() == "Negate")
e = new Negate();
else if (existing_effect["type"].asString() == "Saturation")
e = new Saturation();
// Load Json into Effect
e->SetJsonValue(existing_effect);
// Add Effect to Timeline
AddEffect(e);
// Add Effect to Timeline
AddEffect(e);
}
}
}
if (!root["reader"].isNull()) // does Json contain a reader?