From 22bf6edfba2b09871d37b7700f28ad373a105259 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Fri, 27 Dec 2019 08:51:51 -0500 Subject: [PATCH 01/47] Enhance Json data handling - Parsing from string to Json::Value is now done by utility function openshot::stringToJson() in Json.cpp, all SetJson() methods call it. - Expand use of const member functions and args where appropriate. - Use std::to_string() to format int/float values as strings. - Correct mentions of nonexistent Json::JsonValue type in docstrings --- include/CacheBase.h | 6 ++-- include/CacheDisk.h | 6 ++-- include/CacheMemory.h | 6 ++-- include/ChunkReader.h | 8 ++--- include/Clip.h | 12 ++++---- include/ClipBase.h | 26 ++++++++-------- include/Color.h | 8 ++--- include/Coordinate.h | 8 ++--- include/DecklinkReader.h | 8 ++--- include/DummyReader.h | 8 ++--- include/EffectBase.h | 12 ++++---- include/EffectInfo.h | 2 +- include/FFmpegReader.h | 8 ++--- include/FrameMapper.h | 8 ++--- include/ImageReader.h | 8 ++--- include/Json.h | 6 ++++ include/KeyFrame.h | 6 ++-- include/Point.h | 8 ++--- include/Profiles.h | 8 ++--- include/QtHtmlReader.h | 8 ++--- include/QtImageReader.h | 8 ++--- include/QtTextReader.h | 8 ++--- include/ReaderBase.h | 8 ++--- include/TextReader.h | 8 ++--- include/Timeline.h | 8 ++--- include/WriterBase.h | 8 ++--- include/effects/Bars.h | 10 +++---- include/effects/Blur.h | 10 +++---- include/effects/Brightness.h | 10 +++---- include/effects/ChromaKey.h | 10 +++---- include/effects/ColorShift.h | 10 +++---- include/effects/Crop.h | 10 +++---- include/effects/Deinterlace.h | 10 +++---- include/effects/Hue.h | 10 +++---- include/effects/Mask.h | 10 +++---- include/effects/Negate.h | 10 +++---- include/effects/Pixelate.h | 10 +++---- include/effects/Saturation.h | 10 +++---- include/effects/Shift.h | 10 +++---- include/effects/Wave.h | 10 +++---- src/CMakeLists.txt | 1 + src/CacheBase.cpp | 6 ++-- src/CacheDisk.cpp | 52 ++++++++------------------------ src/CacheMemory.cpp | 56 +++++++++-------------------------- src/ChunkReader.cpp | 26 +++++----------- src/Clip.cpp | 32 +++++++------------- src/ClipBase.cpp | 14 ++++----- src/Color.cpp | 26 +++++----------- src/Coordinate.cpp | 26 +++++----------- src/DecklinkReader.cpp | 26 +++++----------- src/DummyReader.cpp | 26 +++++----------- src/EffectBase.cpp | 30 ++++++------------- src/EffectInfo.cpp | 2 +- src/FFmpegReader.cpp | 26 +++++----------- src/FrameMapper.cpp | 26 +++++----------- src/ImageReader.cpp | 26 +++++----------- src/KeyFrame.cpp | 33 +++++---------------- src/Point.cpp | 26 +++++----------- src/Profiles.cpp | 26 +++++----------- src/QtHtmlReader.cpp | 26 +++++----------- src/QtImageReader.cpp | 26 +++++----------- src/QtTextReader.cpp | 26 +++++----------- src/ReaderBase.cpp | 12 ++++---- src/TextReader.cpp | 28 +++++------------- src/Timeline.cpp | 44 +++++++-------------------- src/WriterBase.cpp | 26 +++++----------- src/effects/Bars.cpp | 28 +++++------------- src/effects/Blur.cpp | 28 +++++------------- src/effects/Brightness.cpp | 28 +++++------------- src/effects/ChromaKey.cpp | 28 +++++------------- src/effects/ColorShift.cpp | 28 +++++------------- src/effects/Crop.cpp | 28 +++++------------- src/effects/Deinterlace.cpp | 28 +++++------------- src/effects/Hue.cpp | 28 +++++------------- src/effects/Mask.cpp | 28 +++++------------- src/effects/Negate.cpp | 28 +++++------------- src/effects/Pixelate.cpp | 28 +++++------------- src/effects/Saturation.cpp | 28 +++++------------- src/effects/Shift.cpp | 28 +++++------------- src/effects/Wave.cpp | 28 +++++------------- tests/ReaderBase_Tests.cpp | 4 +-- 81 files changed, 483 insertions(+), 945 deletions(-) diff --git a/include/CacheBase.h b/include/CacheBase.h index aad65a846..da72e5dbd 100644 --- a/include/CacheBase.h +++ b/include/CacheBase.h @@ -110,9 +110,9 @@ namespace openshot { /// Get and Set JSON methods virtual std::string Json() = 0; ///< Generate JSON string of this object - virtual void SetJson(std::string value) = 0; ///< Load JSON string into this object - virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object - virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object + virtual void SetJson(const std::string value) = 0; ///< Load JSON string into this object + virtual Json::Value JsonValue() = 0; ///< Generate Json::Value for this object + virtual void SetJsonValue(const Json::Value root) = 0; ///< Load Json::Value into this object virtual ~CacheBase() = default; }; diff --git a/include/CacheDisk.h b/include/CacheDisk.h index e69cc3578..09ebd4abc 100644 --- a/include/CacheDisk.h +++ b/include/CacheDisk.h @@ -129,9 +129,9 @@ namespace openshot { /// Get and Set JSON methods std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue(); ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object }; } diff --git a/include/CacheMemory.h b/include/CacheMemory.h index fb3c75f66..ba771cedf 100644 --- a/include/CacheMemory.h +++ b/include/CacheMemory.h @@ -111,9 +111,9 @@ namespace openshot { /// Get and Set JSON methods std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue(); ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object }; } diff --git a/include/ChunkReader.h b/include/ChunkReader.h index 9d99fcd47..4d72c31da 100644 --- a/include/ChunkReader.h +++ b/include/ChunkReader.h @@ -157,10 +157,10 @@ namespace openshot std::string Name() { return "ChunkReader"; }; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Open the reader. This is required before you can access frames or data from the reader. void Open(); diff --git a/include/Clip.h b/include/Clip.h index 4fdccea98..6891df6c2 100644 --- a/include/Clip.h +++ b/include/Clip.h @@ -192,18 +192,18 @@ namespace openshot { openshot::ReaderBase* Reader(); /// Override End() method - float End(); ///< Get end position (in seconds) of clip (trim end of video), which can be affected by the time curve. + float End() const; ///< Get end position (in seconds) of clip (trim end of video), which can be affected by the time curve. void End(float value) { end = value; } ///< Set end position (in seconds) of clip (trim end of video) /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; /// @brief Remove an effect from the clip /// @param effect Remove an effect from the clip. diff --git a/include/ClipBase.h b/include/ClipBase.h index 2890f5d8f..729b1c898 100644 --- a/include/ClipBase.h +++ b/include/ClipBase.h @@ -61,10 +61,10 @@ namespace openshot { std::string previous_properties; ///< This string contains the previous JSON properties /// Generate JSON for a property - Json::Value add_property_json(std::string name, float value, std::string type, std::string memo, Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame); + Json::Value add_property_json(std::string name, float value, std::string type, std::string memo, const Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame) const; /// Generate JSON choice for a property (dropdown properties) - Json::Value add_property_choice_json(std::string name, int value, int selected_value); + Json::Value add_property_choice_json(std::string name, int value, int selected_value) const; public: @@ -78,12 +78,12 @@ namespace openshot { bool operator>= ( ClipBase& a) { return (Position() >= a.Position()); } /// Get basic properties - std::string Id() { return id; } ///< Get the Id of this clip object - float Position() { return position; } ///< Get position on timeline (in seconds) - int Layer() { return layer; } ///< Get layer of clip on timeline (lower number is covered by higher numbers) - float Start() { return start; } ///< Get start position (in seconds) of clip (trim start of video) - float End() { return end; } ///< Get end position (in seconds) of clip (trim end of video) - float Duration() { return end - start; } ///< Get the length of this clip (in seconds) + std::string Id() const { return id; } ///< Get the Id of this clip object + float Position() const { return position; } ///< Get position on timeline (in seconds) + int Layer() const { return layer; } ///< Get layer of clip on timeline (lower number is covered by higher numbers) + float Start() const { return start; } ///< Get start position (in seconds) of clip (trim start of video) + float End() const { return end; } ///< Get end position (in seconds) of clip (trim end of video) + float Duration() const { return end - start; } ///< Get the length of this clip (in seconds) /// Set basic properties void Id(std::string value) { id = value; } ///> Set the Id of this clip object @@ -93,14 +93,14 @@ namespace openshot { void End(float value) { end = value; } ///< Set end position (in seconds) of clip (trim end of video) /// Get and Set JSON methods - virtual std::string Json() = 0; ///< Generate JSON string of this object - virtual void SetJson(std::string value) = 0; ///< Load JSON string into this object - virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object - virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object + virtual std::string Json() const = 0; ///< Generate JSON string of this object + virtual void SetJson(const std::string value) = 0; ///< Load JSON string into this object + virtual Json::Value JsonValue() const = 0; ///< Generate Json::Value for this object + virtual void SetJsonValue(const Json::Value root) = 0; ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - virtual std::string PropertiesJSON(int64_t requested_frame) = 0; + virtual std::string PropertiesJSON(int64_t requested_frame) const = 0; virtual ~ClipBase() = default; }; diff --git a/include/Color.h b/include/Color.h index 47db29a7f..2b4a6d771 100644 --- a/include/Color.h +++ b/include/Color.h @@ -69,10 +69,10 @@ namespace openshot { static long GetDistance(long R1, long G1, long B1, long R2, long G2, long B2); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJson(std::string value); ///< Load JSON string into this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const; ///< Generate JSON string of this object + Json::Value JsonValue() const; ///< Generate Json::Value for this object + void SetJson(const std::string value); ///< Load JSON string into this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object }; diff --git a/include/Coordinate.h b/include/Coordinate.h index 5bfd893a8..a4b9599d2 100644 --- a/include/Coordinate.h +++ b/include/Coordinate.h @@ -66,10 +66,10 @@ namespace openshot { Coordinate(double x, double y); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJson(std::string value); ///< Load JSON string into this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const; ///< Generate JSON string of this object + Json::Value JsonValue() const; ///< Generate Json::Value for this object + void SetJson(const std::string value); ///< Load JSON string into this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object }; } diff --git a/include/DecklinkReader.h b/include/DecklinkReader.h index de077bdf8..d846cca90 100644 --- a/include/DecklinkReader.h +++ b/include/DecklinkReader.h @@ -118,10 +118,10 @@ namespace openshot std::string Name() { return "DecklinkReader"; }; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Open device and video stream - which is called by the constructor automatically void Open(); diff --git a/include/DummyReader.h b/include/DummyReader.h index 0b40f0790..fd17bed1c 100644 --- a/include/DummyReader.h +++ b/include/DummyReader.h @@ -87,10 +87,10 @@ namespace openshot std::string Name() { return "DummyReader"; }; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Open File - which is called by the constructor automatically void Open(); diff --git a/include/EffectBase.h b/include/EffectBase.h index 29e98b589..d104cf0a4 100644 --- a/include/EffectBase.h +++ b/include/EffectBase.h @@ -95,14 +95,14 @@ namespace openshot void InitEffectInfo(); /// Get and Set JSON methods - virtual std::string Json() = 0; ///< Generate JSON string of this object - virtual void SetJson(std::string value) = 0; ///< Load JSON string into this object - virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object - virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object - Json::Value JsonInfo(); ///< Generate JSON object of meta data / info + virtual std::string Json() const = 0; ///< Generate JSON string of this object + virtual void SetJson(const std::string value) = 0; ///< Load JSON string into this object + virtual Json::Value JsonValue() const = 0; ///< Generate Json::Value for this object + virtual void SetJsonValue(const Json::Value root) = 0; ///< Load Json::Value into this object + Json::Value JsonInfo() const; ///< Generate JSON object of meta data / info /// Get the order that this effect should be executed. - int Order() { return order; } + int Order() const { return order; } /// Set the order that this effect should be executed. void Order(int new_order) { order = new_order; } diff --git a/include/EffectInfo.h b/include/EffectInfo.h index 1015b0da7..0e64327bb 100644 --- a/include/EffectInfo.h +++ b/include/EffectInfo.h @@ -51,7 +51,7 @@ namespace openshot /// JSON methods static std::string Json(); ///< Generate JSON string of this object - static Json::Value JsonValue(); ///< Generate Json::JsonValue for this object + static Json::Value JsonValue(); ///< Generate Json::Value for this object }; diff --git a/include/FFmpegReader.h b/include/FFmpegReader.h index 9faa86a35..aad2c1ab9 100644 --- a/include/FFmpegReader.h +++ b/include/FFmpegReader.h @@ -265,10 +265,10 @@ namespace openshot { std::string Name() { return "FFmpegReader"; }; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Open File - which is called by the constructor automatically void Open(); diff --git a/include/FrameMapper.h b/include/FrameMapper.h index f2b030a36..8be4ec1bd 100644 --- a/include/FrameMapper.h +++ b/include/FrameMapper.h @@ -199,10 +199,10 @@ namespace openshot std::string Name() { return "FrameMapper"; }; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Open the internal reader void Open(); diff --git a/include/ImageReader.h b/include/ImageReader.h index 8da450eb7..bb19dd3dc 100644 --- a/include/ImageReader.h +++ b/include/ImageReader.h @@ -106,10 +106,10 @@ namespace openshot std::string Name() { return "ImageReader"; }; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Open File - which is called by the constructor automatically void Open(); diff --git a/include/Json.h b/include/Json.h index 3a10ab744..0bdf6e2c3 100644 --- a/include/Json.h +++ b/include/Json.h @@ -31,6 +31,12 @@ #ifndef OPENSHOT_JSON_H #define OPENSHOT_JSON_H +#include #include "json/json.h" +#include "Exceptions.h" + +namespace openshot { + const Json::Value stringToJson(const std::string value); +} #endif diff --git a/include/KeyFrame.h b/include/KeyFrame.h index 6ed395530..ee58da8f0 100644 --- a/include/KeyFrame.h +++ b/include/KeyFrame.h @@ -133,9 +133,9 @@ namespace openshot { /// Get and Set JSON methods std::string Json() const; ///< Generate JSON string of this object - Json::Value JsonValue() const; ///< Generate Json::JsonValue for this object - void SetJson(std::string value); ///< Load JSON string into this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + Json::Value JsonValue() const; ///< Generate Json::Value for this object + void SetJson(const std::string value); ///< Load JSON string into this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Remove a point by matching a coordinate void RemovePoint(Point p); diff --git a/include/Point.h b/include/Point.h index 3fdcd9176..4941c5589 100644 --- a/include/Point.h +++ b/include/Point.h @@ -119,10 +119,10 @@ namespace openshot void Initialize_RightHandle(float x, float y); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJson(std::string value); ///< Load JSON string into this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const; ///< Generate JSON string of this object + Json::Value JsonValue() const; ///< Generate Json::Value for this object + void SetJson(const std::string value); ///< Load JSON string into this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object }; diff --git a/include/Profiles.h b/include/Profiles.h index bc5fe3e01..3b5ebd0d1 100644 --- a/include/Profiles.h +++ b/include/Profiles.h @@ -90,10 +90,10 @@ namespace openshot Profile(std::string path); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJson(std::string value); ///< Load JSON string into this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const; ///< Generate JSON string of this object + Json::Value JsonValue() const; ///< Generate Json::Value for this object + void SetJson(const std::string value); ///< Load JSON string into this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object }; } diff --git a/include/QtHtmlReader.h b/include/QtHtmlReader.h index c102038c4..d7052d494 100644 --- a/include/QtHtmlReader.h +++ b/include/QtHtmlReader.h @@ -131,10 +131,10 @@ namespace openshot std::string Name() { return "QtHtmlReader"; }; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Open Reader - which is called by the constructor automatically void Open(); diff --git a/include/QtImageReader.h b/include/QtImageReader.h index 3153e7a39..3e456e394 100644 --- a/include/QtImageReader.h +++ b/include/QtImageReader.h @@ -104,10 +104,10 @@ namespace openshot std::string Name() { return "QtImageReader"; }; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Open File - which is called by the constructor automatically void Open(); diff --git a/include/QtTextReader.h b/include/QtTextReader.h index e6a8c84b8..d226e920c 100644 --- a/include/QtTextReader.h +++ b/include/QtTextReader.h @@ -142,10 +142,10 @@ namespace openshot std::string Name() { return "QtTextReader"; }; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Open Reader - which is called by the constructor automatically void Open(); diff --git a/include/ReaderBase.h b/include/ReaderBase.h index 267693388..dfb9873d4 100644 --- a/include/ReaderBase.h +++ b/include/ReaderBase.h @@ -140,10 +140,10 @@ namespace openshot virtual std::string Name() = 0; /// Get and Set JSON methods - virtual std::string Json() = 0; ///< Generate JSON string of this object - virtual void SetJson(std::string value) = 0; ///< Load JSON string into this object - virtual Json::Value JsonValue() = 0; ///< Generate Json::JsonValue for this object - virtual void SetJsonValue(Json::Value root) = 0; ///< Load Json::JsonValue into this object + virtual std::string Json() const = 0; ///< Generate JSON string of this object + virtual void SetJson(const std::string value) = 0; ///< Load JSON string into this object + virtual Json::Value JsonValue() const = 0; ///< Generate Json::Value for this object + virtual void SetJsonValue(const Json::Value root) = 0; ///< Load Json::Value into this object /// Open the reader (and start consuming resources, such as images or video files) virtual void Open() = 0; diff --git a/include/TextReader.h b/include/TextReader.h index 2d54fdc25..779ccf3da 100644 --- a/include/TextReader.h +++ b/include/TextReader.h @@ -142,10 +142,10 @@ namespace openshot std::string Name() { return "TextReader"; }; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Open Reader - which is called by the constructor automatically void Open(); diff --git a/include/Timeline.h b/include/Timeline.h index 2ff03d919..70c6e1a8b 100644 --- a/include/Timeline.h +++ b/include/Timeline.h @@ -268,10 +268,10 @@ namespace openshot { std::string Name() { return "Timeline"; }; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Set Max Image Size (used for performance optimization). Convenience function for setting /// Settings::Instance()->MAX_WIDTH and Settings::Instance()->MAX_HEIGHT. diff --git a/include/WriterBase.h b/include/WriterBase.h index 503be6bfb..1b55c72b6 100644 --- a/include/WriterBase.h +++ b/include/WriterBase.h @@ -107,10 +107,10 @@ namespace openshot virtual void WriteFrame(openshot::ReaderBase* reader, int64_t start, int64_t length) = 0; /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJson(std::string value); ///< Load JSON string into this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const; ///< Generate JSON string of this object + Json::Value JsonValue() const; ///< Generate Json::Value for this object + void SetJson(const std::string value); ///< Load JSON string into this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Display file information in the standard output stream (stdout) void DisplayInfo(); diff --git a/include/effects/Bars.h b/include/effects/Bars.h index 43a77a2ff..fa9df6f80 100644 --- a/include/effects/Bars.h +++ b/include/effects/Bars.h @@ -89,14 +89,14 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/Blur.h b/include/effects/Blur.h index 167e93032..68e0a2cff 100644 --- a/include/effects/Blur.h +++ b/include/effects/Blur.h @@ -102,14 +102,14 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/Brightness.h b/include/effects/Brightness.h index 2a6ab9129..69f2cf343 100644 --- a/include/effects/Brightness.h +++ b/include/effects/Brightness.h @@ -89,14 +89,14 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/ChromaKey.h b/include/effects/ChromaKey.h index d0fa31d84..dbc81e9cf 100644 --- a/include/effects/ChromaKey.h +++ b/include/effects/ChromaKey.h @@ -86,13 +86,13 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object // Get all properties for a specific frame - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/ColorShift.h b/include/effects/ColorShift.h index e9c11d68e..ada2acd68 100644 --- a/include/effects/ColorShift.h +++ b/include/effects/ColorShift.h @@ -93,14 +93,14 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/Crop.h b/include/effects/Crop.h index 34cea89f5..2d4a2b2ee 100644 --- a/include/effects/Crop.h +++ b/include/effects/Crop.h @@ -88,14 +88,14 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/Deinterlace.h b/include/effects/Deinterlace.h index b411b0230..eff7b2fe7 100644 --- a/include/effects/Deinterlace.h +++ b/include/effects/Deinterlace.h @@ -82,13 +82,13 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object // Get all properties for a specific frame - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/Hue.h b/include/effects/Hue.h index 4670b6bff..9d86d5c2b 100644 --- a/include/effects/Hue.h +++ b/include/effects/Hue.h @@ -79,14 +79,14 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/Mask.h b/include/effects/Mask.h index dba3b2d89..390ffa361 100644 --- a/include/effects/Mask.h +++ b/include/effects/Mask.h @@ -101,14 +101,14 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; /// Get the reader object of the mask grayscale image ReaderBase* Reader() { return reader; }; diff --git a/include/effects/Negate.h b/include/effects/Negate.h index 3cbc7988d..6206a6607 100644 --- a/include/effects/Negate.h +++ b/include/effects/Negate.h @@ -70,13 +70,13 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object // Get all properties for a specific frame - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/Pixelate.h b/include/effects/Pixelate.h index 3146d456c..9348ce863 100644 --- a/include/effects/Pixelate.h +++ b/include/effects/Pixelate.h @@ -88,14 +88,14 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/Saturation.h b/include/effects/Saturation.h index de3cc7714..e8d0d9409 100644 --- a/include/effects/Saturation.h +++ b/include/effects/Saturation.h @@ -86,14 +86,14 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/Shift.h b/include/effects/Shift.h index 243e442eb..765da7555 100644 --- a/include/effects/Shift.h +++ b/include/effects/Shift.h @@ -82,14 +82,14 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/include/effects/Wave.h b/include/effects/Wave.h index 62b08d1fa..ad516bde3 100644 --- a/include/effects/Wave.h +++ b/include/effects/Wave.h @@ -88,14 +88,14 @@ namespace openshot std::shared_ptr GetFrame(std::shared_ptr frame, int64_t frame_number); /// Get and Set JSON methods - std::string Json(); ///< Generate JSON string of this object - void SetJson(std::string value); ///< Load JSON string into this object - Json::Value JsonValue(); ///< Generate Json::JsonValue for this object - void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object + std::string Json() const override; ///< Generate JSON string of this object + void SetJson(const std::string value); ///< Load JSON string into this object + Json::Value JsonValue() const override; ///< Generate Json::Value for this object + void SetJsonValue(const Json::Value root); ///< Load Json::Value into this object /// Get all properties for a specific frame (perfect for a UI to display the current state /// of all properties at any time) - std::string PropertiesJSON(int64_t requested_frame); + std::string PropertiesJSON(int64_t requested_frame) const override; }; } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b684aaec6..5314d8806 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -164,6 +164,7 @@ set(OPENSHOT_SOURCES Fraction.cpp Frame.cpp FrameMapper.cpp + Json.cpp KeyFrame.cpp OpenShotVersion.cpp ZmqLogger.cpp diff --git a/src/CacheBase.cpp b/src/CacheBase.cpp index 8a7d541ae..122aba321 100644 --- a/src/CacheBase.cpp +++ b/src/CacheBase.cpp @@ -53,7 +53,7 @@ void CacheBase::SetMaxBytesFromInfo(int64_t number_of_frames, int width, int hei SetMaxBytes(bytes); } -// Generate Json::JsonValue for this object +// Generate Json::Value for this object Json::Value CacheBase::JsonValue() { // Create root json object @@ -66,8 +66,8 @@ Json::Value CacheBase::JsonValue() { return root; } -// Load Json::JsonValue into this object -void CacheBase::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void CacheBase::SetJsonValue(const Json::Value root) { // Set data from Json (if key is found) if (!root["max_bytes"].isNull()) diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp index 5dc677e56..f8e9b9199 100644 --- a/src/CacheDisk.cpp +++ b/src/CacheDisk.cpp @@ -116,12 +116,8 @@ void CacheDisk::CalculateRanges() { // Add JSON object with start/end attributes // Use strings, since int64_ts are supported in JSON - std::stringstream start_str; - start_str << starting_frame; - std::stringstream end_str; - end_str << ending_frame; - range["start"] = start_str.str(); - range["end"] = end_str.str(); + range["start"] = std::to_string(starting_frame); + range["end"] = std::to_string(ending_frame); ranges.append(range); // Set new starting range @@ -137,12 +133,8 @@ void CacheDisk::CalculateRanges() { // Add JSON object with start/end attributes // Use strings, since int64_ts are supported in JSON - std::stringstream start_str; - start_str << starting_frame; - std::stringstream end_str; - end_str << ending_frame; - range["start"] = start_str.str(); - range["end"] = end_str.str(); + range["start"] = std::to_string(starting_frame); + range["end"] = std::to_string(ending_frame); ranges.append(range); // Cache range JSON as string @@ -471,7 +463,7 @@ std::string CacheDisk::Json() { return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object +// Generate Json::Value for this object Json::Value CacheDisk::JsonValue() { // Process range data (if anything has changed) @@ -488,41 +480,23 @@ Json::Value CacheDisk::JsonValue() { root["version"] = range_version_str.str(); // Parse and append range data (if any) - Json::Value ranges; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( json_ranges.c_str(), - json_ranges.c_str() + json_ranges.size(), &ranges, &errors ); - delete reader; - - if (success) + // Parse and append range data (if any) + try { + const Json::Value ranges = openshot::stringToJson(json_ranges); root["ranges"] = ranges; + } catch (...) { } // return JsonValue return root; } // Load JSON string into this object -void CacheDisk::SetJson(std::string value) { +void CacheDisk::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -533,8 +507,8 @@ void CacheDisk::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void CacheDisk::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void CacheDisk::SetJsonValue(const Json::Value root) { // Close timeline before we do anything (this also removes all open and closing clips) Clear(); diff --git a/src/CacheMemory.cpp b/src/CacheMemory.cpp index ff8963fdc..b00fb21f3 100644 --- a/src/CacheMemory.cpp +++ b/src/CacheMemory.cpp @@ -92,12 +92,8 @@ void CacheMemory::CalculateRanges() { // Add JSON object with start/end attributes // Use strings, since int64_ts are supported in JSON - std::stringstream start_str; - start_str << starting_frame; - std::stringstream end_str; - end_str << ending_frame; - range["start"] = start_str.str(); - range["end"] = end_str.str(); + range["start"] = std::to_string(starting_frame); + range["end"] = std::to_string(ending_frame); ranges.append(range); // Set new starting range @@ -113,12 +109,8 @@ void CacheMemory::CalculateRanges() { // Add JSON object with start/end attributes // Use strings, since int64_ts are not supported in JSON - std::stringstream start_str; - start_str << starting_frame; - std::stringstream end_str; - end_str << ending_frame; - range["start"] = start_str.str(); - range["end"] = end_str.str(); + range["start"] = std::to_string(starting_frame); + range["end"] = std::to_string(ending_frame); ranges.append(range); // Cache range JSON as string @@ -327,7 +319,7 @@ std::string CacheMemory::Json() { return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object +// Generate Json::Value for this object Json::Value CacheMemory::JsonValue() { // Process range data (if anything has changed) @@ -337,45 +329,25 @@ Json::Value CacheMemory::JsonValue() { Json::Value root = CacheBase::JsonValue(); // get parent properties root["type"] = cache_type; - std::stringstream range_version_str; - range_version_str << range_version; - root["version"] = range_version_str.str(); + root["version"] = std::to_string(range_version); // Parse and append range data (if any) - Json::Value ranges; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( json_ranges.c_str(), - json_ranges.c_str() + json_ranges.size(), &ranges, &errors ); - delete reader; - - if (success) + try { + const Json::Value ranges = openshot::stringToJson(json_ranges); root["ranges"] = ranges; + } catch (...) { } // return JsonValue return root; } // Load JSON string into this object -void CacheMemory::SetJson(std::string value) { - - // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); +void CacheMemory::SetJson(const std::string value) { try { + // Parse string to Json::Value + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -386,8 +358,8 @@ void CacheMemory::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void CacheMemory::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void CacheMemory::SetJsonValue(const Json::Value root) { // Close timeline before we do anything (this also removes all open and closing clips) Clear(); diff --git a/src/ChunkReader.cpp b/src/ChunkReader.cpp index 7321cb268..c194ce33a 100644 --- a/src/ChunkReader.cpp +++ b/src/ChunkReader.cpp @@ -256,14 +256,14 @@ std::shared_ptr ChunkReader::GetFrame(int64_t requested_frame) } // Generate JSON string of this object -std::string ChunkReader::Json() { +std::string ChunkReader::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value ChunkReader::JsonValue() { +// Generate Json::Value for this object +Json::Value ChunkReader::JsonValue() const { // Create root json object Json::Value root = ReaderBase::JsonValue(); // get parent properties @@ -279,23 +279,11 @@ Json::Value ChunkReader::JsonValue() { } // Load JSON string into this object -void ChunkReader::SetJson(std::string value) { - - // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); +void ChunkReader::SetJson(const std::string value) { try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -306,8 +294,8 @@ void ChunkReader::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void ChunkReader::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void ChunkReader::SetJsonValue(const Json::Value root) { // Set parent data ReaderBase::SetJsonValue(root); diff --git a/src/Clip.cpp b/src/Clip.cpp index 45afd2aa5..269b82d1c 100644 --- a/src/Clip.cpp +++ b/src/Clip.cpp @@ -270,7 +270,7 @@ void Clip::Close() } // Get end position of clip (trim end of video), which can be affected by the time curve. -float Clip::End() +float Clip::End() const { // if a time curve is present, use its length if (time.GetCount() > 1) @@ -645,14 +645,14 @@ std::shared_ptr Clip::GetOrCreateFrame(int64_t number) } // Generate JSON string of this object -std::string Clip::Json() { +std::string Clip::Json() const { // Return formatted string return JsonValue().toStyledString(); } // Get all properties for a specific frame -std::string Clip::PropertiesJSON(int64_t requested_frame) { +std::string Clip::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; @@ -739,8 +739,8 @@ std::string Clip::PropertiesJSON(int64_t requested_frame) { return root.toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Clip::JsonValue() { +// Generate Json::Value for this object +Json::Value Clip::JsonValue() const { // Create root json object Json::Value root = ClipBase::JsonValue(); // get parent properties @@ -782,7 +782,7 @@ Json::Value Clip::JsonValue() { root["effects"] = Json::Value(Json::arrayValue); // loop through effects - std::list::iterator effect_itr; + std::list::const_iterator effect_itr; for (effect_itr=effects.begin(); effect_itr != effects.end(); ++effect_itr) { // Get clip object from the iterator @@ -798,24 +798,12 @@ Json::Value Clip::JsonValue() { } // Load JSON string into this object -void Clip::SetJson(std::string value) { +void Clip::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -826,8 +814,8 @@ void Clip::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Clip::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Clip::SetJsonValue(const Json::Value root) { // Set parent data ClipBase::SetJsonValue(root); diff --git a/src/ClipBase.cpp b/src/ClipBase.cpp index d1370205b..a51c65735 100644 --- a/src/ClipBase.cpp +++ b/src/ClipBase.cpp @@ -32,8 +32,8 @@ using namespace openshot; -// Generate Json::JsonValue for this object -Json::Value ClipBase::JsonValue() { +// Generate Json::Value for this object +Json::Value ClipBase::JsonValue() const { // Create root json object Json::Value root; @@ -48,8 +48,8 @@ Json::Value ClipBase::JsonValue() { return root; } -// Load Json::JsonValue into this object -void ClipBase::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void ClipBase::SetJsonValue(const Json::Value root) { // Set data from Json (if key is found) if (!root["id"].isNull()) @@ -65,10 +65,10 @@ void ClipBase::SetJsonValue(Json::Value root) { } // Generate JSON for a property -Json::Value ClipBase::add_property_json(std::string name, float value, std::string type, std::string memo, Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame) { +Json::Value ClipBase::add_property_json(std::string name, float value, std::string type, std::string memo, const Keyframe* keyframe, float min_value, float max_value, bool readonly, int64_t requested_frame) const { // Requested Point - Point requested_point(requested_frame, requested_frame); + const Point requested_point(requested_frame, requested_frame); // Create JSON Object Json::Value prop = Json::Value(Json::objectValue); @@ -101,7 +101,7 @@ Json::Value ClipBase::add_property_json(std::string name, float value, std::stri return prop; } -Json::Value ClipBase::add_property_choice_json(std::string name, int value, int selected_value) { +Json::Value ClipBase::add_property_choice_json(std::string name, int value, int selected_value) const { // Create choice Json::Value new_choice = Json::Value(Json::objectValue); diff --git a/src/Color.cpp b/src/Color.cpp index 927fc1624..705ece4a1 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -85,14 +85,14 @@ long Color::GetDistance(long R1, long G1, long B1, long R2, long G2, long B2) } // Generate JSON string of this object -std::string Color::Json() { +std::string Color::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Color::JsonValue() { +// Generate Json::Value for this object +Json::Value Color::JsonValue() const { // Create root json object Json::Value root; @@ -106,24 +106,12 @@ Json::Value Color::JsonValue() { } // Load JSON string into this object -void Color::SetJson(std::string value) { +void Color::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -134,8 +122,8 @@ void Color::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Color::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Color::SetJsonValue(const Json::Value root) { // Set data from Json (if key is found) if (!root["red"].isNull()) diff --git a/src/Coordinate.cpp b/src/Coordinate.cpp index a0bdabcc3..f87fb7a0e 100644 --- a/src/Coordinate.cpp +++ b/src/Coordinate.cpp @@ -45,14 +45,14 @@ Coordinate::Coordinate(double x, double y) : // Generate JSON string of this object -std::string Coordinate::Json() { +std::string Coordinate::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Coordinate::JsonValue() { +// Generate Json::Value for this object +Json::Value Coordinate::JsonValue() const { // Create root json object Json::Value root; @@ -69,24 +69,12 @@ Json::Value Coordinate::JsonValue() { } // Load JSON string into this object -void Coordinate::SetJson(std::string value) { +void Coordinate::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -97,8 +85,8 @@ void Coordinate::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Coordinate::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Coordinate::SetJsonValue(const Json::Value root) { // Set data from Json (if key is found) if (!root["X"].isNull()) diff --git a/src/DecklinkReader.cpp b/src/DecklinkReader.cpp index 35ed18578..14c2f87ca 100644 --- a/src/DecklinkReader.cpp +++ b/src/DecklinkReader.cpp @@ -246,14 +246,14 @@ std::shared_ptr DecklinkReader::GetFrame(int64_t requested_frame) // Generate JSON string of this object -std::string DecklinkReader::Json() { +std::string DecklinkReader::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value DecklinkReader::JsonValue() { +// Generate Json::Value for this object +Json::Value DecklinkReader::JsonValue() const { // Create root json object Json::Value root = ReaderBase::JsonValue(); // get parent properties @@ -264,24 +264,12 @@ Json::Value DecklinkReader::JsonValue() { } // Load JSON string into this object -void DecklinkReader::SetJson(std::string value) { +void DecklinkReader::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -292,8 +280,8 @@ void DecklinkReader::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void DecklinkReader::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void DecklinkReader::SetJsonValue(const Json::Value root) { // Set parent data ReaderBase::SetJsonValue(root); diff --git a/src/DummyReader.cpp b/src/DummyReader.cpp index 997a020ae..8fd98bcbc 100644 --- a/src/DummyReader.cpp +++ b/src/DummyReader.cpp @@ -124,14 +124,14 @@ std::shared_ptr DummyReader::GetFrame(int64_t requested_frame) } // Generate JSON string of this object -std::string DummyReader::Json() { +std::string DummyReader::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value DummyReader::JsonValue() { +// Generate Json::Value for this object +Json::Value DummyReader::JsonValue() const { // Create root json object Json::Value root = ReaderBase::JsonValue(); // get parent properties @@ -142,24 +142,12 @@ Json::Value DummyReader::JsonValue() { } // Load JSON string into this object -void DummyReader::SetJson(std::string value) { +void DummyReader::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -170,8 +158,8 @@ void DummyReader::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void DummyReader::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void DummyReader::SetJsonValue(const Json::Value root) { // Set parent data ReaderBase::SetJsonValue(root); diff --git a/src/EffectBase.cpp b/src/EffectBase.cpp index 30e837652..653291947 100644 --- a/src/EffectBase.cpp +++ b/src/EffectBase.cpp @@ -74,14 +74,14 @@ int EffectBase::constrain(int color_value) } // Generate JSON string of this object -std::string EffectBase::Json() { +std::string EffectBase::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value EffectBase::JsonValue() { +// Generate Json::Value for this object +Json::Value EffectBase::JsonValue() const { // Create root json object Json::Value root = ClipBase::JsonValue(); // get parent properties @@ -98,24 +98,12 @@ Json::Value EffectBase::JsonValue() { } // Load JSON string into this object -void EffectBase::SetJson(std::string value) { +void EffectBase::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -126,8 +114,8 @@ void EffectBase::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void EffectBase::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void EffectBase::SetJsonValue(const Json::Value root) { // Set parent data ClipBase::SetJsonValue(root); @@ -137,8 +125,8 @@ void EffectBase::SetJsonValue(Json::Value root) { Order(root["order"].asInt()); } -// Generate Json::JsonValue for this object -Json::Value EffectBase::JsonInfo() { +// Generate Json::Value for this object +Json::Value EffectBase::JsonInfo() const { // Create root json object Json::Value root; diff --git a/src/EffectInfo.cpp b/src/EffectInfo.cpp index 8fb8a4fe4..5d786fe76 100644 --- a/src/EffectInfo.cpp +++ b/src/EffectInfo.cpp @@ -88,7 +88,7 @@ EffectBase* EffectInfo::CreateEffect(std::string effect_type) { return NULL; } -// Generate Json::JsonValue for this object +// Generate Json::Value for this object Json::Value EffectInfo::JsonValue() { // Create root json object diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp index e8ac4af91..503d28a31 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp @@ -2424,14 +2424,14 @@ int64_t FFmpegReader::GetSmallestAudioFrame() { } // Generate JSON string of this object -std::string FFmpegReader::Json() { +std::string FFmpegReader::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value FFmpegReader::JsonValue() { +// Generate Json::Value for this object +Json::Value FFmpegReader::JsonValue() const { // Create root json object Json::Value root = ReaderBase::JsonValue(); // get parent properties @@ -2443,23 +2443,11 @@ Json::Value FFmpegReader::JsonValue() { } // Load JSON string into this object -void FFmpegReader::SetJson(std::string value) { +void FFmpegReader::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse(value.c_str(), value.c_str() + value.size(), - &root, &errors); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -2469,8 +2457,8 @@ void FFmpegReader::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void FFmpegReader::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void FFmpegReader::SetJsonValue(const Json::Value root) { // Set parent data ReaderBase::SetJsonValue(root); diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp index fe12a780b..62aac6f5f 100644 --- a/src/FrameMapper.cpp +++ b/src/FrameMapper.cpp @@ -675,14 +675,14 @@ void FrameMapper::Close() // Generate JSON string of this object -std::string FrameMapper::Json() { +std::string FrameMapper::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value FrameMapper::JsonValue() { +// Generate Json::Value for this object +Json::Value FrameMapper::JsonValue() const { // Create root json object Json::Value root = ReaderBase::JsonValue(); // get parent properties @@ -693,24 +693,12 @@ Json::Value FrameMapper::JsonValue() { } // Load JSON string into this object -void FrameMapper::SetJson(std::string value) { +void FrameMapper::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -721,8 +709,8 @@ void FrameMapper::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void FrameMapper::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void FrameMapper::SetJsonValue(const Json::Value root) { // Set parent data ReaderBase::SetJsonValue(root); diff --git a/src/ImageReader.cpp b/src/ImageReader.cpp index ad871f1f7..9ce3a70ff 100644 --- a/src/ImageReader.cpp +++ b/src/ImageReader.cpp @@ -136,14 +136,14 @@ std::shared_ptr ImageReader::GetFrame(int64_t requested_frame) } // Generate JSON string of this object -std::string ImageReader::Json() { +std::string ImageReader::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value ImageReader::JsonValue() { +// Generate Json::Value for this object +Json::Value ImageReader::JsonValue() const { // Create root json object Json::Value root = ReaderBase::JsonValue(); // get parent properties @@ -155,24 +155,12 @@ Json::Value ImageReader::JsonValue() { } // Load JSON string into this object -void ImageReader::SetJson(std::string value) { +void ImageReader::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -183,8 +171,8 @@ void ImageReader::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void ImageReader::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void ImageReader::SetJsonValue(const Json::Value root) { // Set parent data ReaderBase::SetJsonValue(root); diff --git a/src/KeyFrame.cpp b/src/KeyFrame.cpp index d16348a2e..5f58c7a07 100644 --- a/src/KeyFrame.cpp +++ b/src/KeyFrame.cpp @@ -325,17 +325,15 @@ std::string Keyframe::Json() const { return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object +// Generate Json::Value for this object Json::Value Keyframe::JsonValue() const { // Create root json object Json::Value root; root["Points"] = Json::Value(Json::arrayValue); - // loop through points, and find a matching coordinate - for (int x = 0; x < Points.size(); x++) { - // Get each point - Point existing_point = Points[x]; + // loop through points + for (const auto existing_point : Points) { root["Points"].append(existing_point.JsonValue()); } @@ -344,24 +342,12 @@ Json::Value Keyframe::JsonValue() const { } // Load JSON string into this object -void Keyframe::SetJson(std::string value) { +void Keyframe::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -372,17 +358,14 @@ void Keyframe::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Keyframe::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Keyframe::SetJsonValue(const Json::Value root) { // Clear existing points Points.clear(); if (!root["Points"].isNull()) // loop through points - for (int64_t x = 0; x < root["Points"].size(); x++) { - // Get each point - Json::Value existing_point = root["Points"][(Json::UInt) x]; - + for (const auto existing_point : root["Points"]) { // Create Point Point p; diff --git a/src/Point.cpp b/src/Point.cpp index 52e7ffbe0..136799778 100644 --- a/src/Point.cpp +++ b/src/Point.cpp @@ -108,14 +108,14 @@ void Point::Initialize_RightHandle(float x, float y) { } // Generate JSON string of this object -std::string Point::Json() { +std::string Point::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Point::JsonValue() { +// Generate Json::Value for this object +Json::Value Point::JsonValue() const { // Create root json object Json::Value root; @@ -132,24 +132,12 @@ Json::Value Point::JsonValue() { } // Load JSON string into this object -void Point::SetJson(std::string value) { +void Point::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -160,8 +148,8 @@ void Point::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Point::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Point::SetJsonValue(const Json::Value root) { if (!root["co"].isNull()) co.SetJsonValue(root["co"]); // update coordinate diff --git a/src/Profiles.cpp b/src/Profiles.cpp index e7c547717..5351520e9 100644 --- a/src/Profiles.cpp +++ b/src/Profiles.cpp @@ -133,14 +133,14 @@ Profile::Profile(std::string path) { } // Generate JSON string of this object -std::string Profile::Json() { +std::string Profile::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Profile::JsonValue() { +// Generate Json::Value for this object +Json::Value Profile::JsonValue() const { // Create root json object Json::Value root; @@ -163,24 +163,12 @@ Json::Value Profile::JsonValue() { } // Load JSON string into this object -void Profile::SetJson(std::string value) { +void Profile::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -191,8 +179,8 @@ void Profile::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Profile::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Profile::SetJsonValue(const Json::Value root) { if (!root["height"].isNull()) info.height = root["height"].asInt(); diff --git a/src/QtHtmlReader.cpp b/src/QtHtmlReader.cpp index cfdde9f39..6b502fbd4 100644 --- a/src/QtHtmlReader.cpp +++ b/src/QtHtmlReader.cpp @@ -180,14 +180,14 @@ std::shared_ptr QtHtmlReader::GetFrame(int64_t requested_frame) } // Generate JSON string of this object -std::string QtHtmlReader::Json() { +std::string QtHtmlReader::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value QtHtmlReader::JsonValue() { +// Generate Json::Value for this object +Json::Value QtHtmlReader::JsonValue() const { // Create root json object Json::Value root = ReaderBase::JsonValue(); // get parent properties @@ -206,24 +206,12 @@ Json::Value QtHtmlReader::JsonValue() { } // Load JSON string into this object -void QtHtmlReader::SetJson(std::string value) { +void QtHtmlReader::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -234,8 +222,8 @@ void QtHtmlReader::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void QtHtmlReader::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void QtHtmlReader::SetJsonValue(const Json::Value root) { // Set parent data ReaderBase::SetJsonValue(root); diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp index 7163b0979..b33a57773 100644 --- a/src/QtImageReader.cpp +++ b/src/QtImageReader.cpp @@ -277,14 +277,14 @@ std::shared_ptr QtImageReader::GetFrame(int64_t requested_frame) } // Generate JSON string of this object -std::string QtImageReader::Json() { +std::string QtImageReader::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value QtImageReader::JsonValue() { +// Generate Json::Value for this object +Json::Value QtImageReader::JsonValue() const { // Create root json object Json::Value root = ReaderBase::JsonValue(); // get parent properties @@ -296,24 +296,12 @@ Json::Value QtImageReader::JsonValue() { } // Load JSON string into this object -void QtImageReader::SetJson(std::string value) { +void QtImageReader::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -324,8 +312,8 @@ void QtImageReader::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void QtImageReader::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void QtImageReader::SetJsonValue(const Json::Value root) { // Set parent data ReaderBase::SetJsonValue(root); diff --git a/src/QtTextReader.cpp b/src/QtTextReader.cpp index ee0c598a4..d91d164e6 100644 --- a/src/QtTextReader.cpp +++ b/src/QtTextReader.cpp @@ -197,14 +197,14 @@ std::shared_ptr QtTextReader::GetFrame(int64_t requested_frame) } // Generate JSON string of this object -std::string QtTextReader::Json() { +std::string QtTextReader::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value QtTextReader::JsonValue() { +// Generate Json::Value for this object +Json::Value QtTextReader::JsonValue() const { // Create root json object Json::Value root = ReaderBase::JsonValue(); // get parent properties @@ -225,24 +225,12 @@ Json::Value QtTextReader::JsonValue() { } // Load JSON string into this object -void QtTextReader::SetJson(std::string value) { +void QtTextReader::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -253,8 +241,8 @@ void QtTextReader::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void QtTextReader::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void QtTextReader::SetJsonValue(const Json::Value root) { // Set parent data ReaderBase::SetJsonValue(root); diff --git a/src/ReaderBase.cpp b/src/ReaderBase.cpp index ccd271f48..1f06760cc 100644 --- a/src/ReaderBase.cpp +++ b/src/ReaderBase.cpp @@ -113,8 +113,8 @@ void ReaderBase::DisplayInfo() { std::cout << "--> " << it->first << ": " << it->second << std::endl; } -// Generate Json::JsonValue for this object -Json::Value ReaderBase::JsonValue() { +// Generate Json::Value for this object +Json::Value ReaderBase::JsonValue() const { // Create root json object Json::Value root; @@ -160,7 +160,7 @@ Json::Value ReaderBase::JsonValue() { // Append metadata map root["metadata"] = Json::Value(Json::objectValue); - std::map::iterator it; + std::map::const_iterator it; for (it = info.metadata.begin(); it != info.metadata.end(); it++) root["metadata"][it->first] = it->second; @@ -168,8 +168,8 @@ Json::Value ReaderBase::JsonValue() { return root; } -// Load Json::JsonValue into this object -void ReaderBase::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void ReaderBase::SetJsonValue(const Json::Value root) { // Set data from Json (if key is found) if (!root["has_video"].isNull()) @@ -244,7 +244,7 @@ void ReaderBase::SetJsonValue(Json::Value root) { info.audio_timebase.den = root["audio_timebase"]["den"].asInt(); } if (!root["metadata"].isNull() && root["metadata"].isObject()) { - for( Json::Value::iterator itr = root["metadata"].begin() ; itr != root["metadata"].end() ; itr++ ) { + for( Json::Value::const_iterator itr = root["metadata"].begin() ; itr != root["metadata"].end() ; itr++ ) { std::string key = itr.key().asString(); info.metadata[key] = root["metadata"][key].asString(); } diff --git a/src/TextReader.cpp b/src/TextReader.cpp index 1983b104f..e317700c9 100644 --- a/src/TextReader.cpp +++ b/src/TextReader.cpp @@ -187,14 +187,14 @@ std::shared_ptr TextReader::GetFrame(int64_t requested_frame) } // Generate JSON string of this object -std::string TextReader::Json() { +std::string TextReader::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value TextReader::JsonValue() { +// Generate Json::Value for this object +Json::Value TextReader::JsonValue() const { // Create root json object Json::Value root = ReaderBase::JsonValue(); // get parent properties @@ -216,24 +216,10 @@ Json::Value TextReader::JsonValue() { } // Load JSON string into this object -void TextReader::SetJson(std::string value) { - - // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - +void TextReader::SetJson(const std::string value) { try { + Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -244,8 +230,8 @@ void TextReader::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void TextReader::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void TextReader::SetJsonValue(const Json::Value root) { // Set parent data ReaderBase::SetJsonValue(root); diff --git a/src/Timeline.cpp b/src/Timeline.cpp index 86ef2911f..70f9b1ceb 100644 --- a/src/Timeline.cpp +++ b/src/Timeline.cpp @@ -977,14 +977,14 @@ void Timeline::SetCache(CacheBase* new_cache) { } // Generate JSON string of this object -std::string Timeline::Json() { +std::string Timeline::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Timeline::JsonValue() { +// Generate Json::Value for this object +Json::Value Timeline::JsonValue() const { // Create root json object Json::Value root = ReaderBase::JsonValue(); // get parent properties @@ -998,7 +998,7 @@ Json::Value Timeline::JsonValue() { root["clips"] = Json::Value(Json::arrayValue); // Find Clips at this time - std::list::iterator clip_itr; + std::list::const_iterator clip_itr; for (clip_itr=clips.begin(); clip_itr != clips.end(); ++clip_itr) { // Get clip object from the iterator @@ -1010,7 +1010,7 @@ Json::Value Timeline::JsonValue() { root["effects"] = Json::Value(Json::arrayValue); // loop through effects - std::list::iterator effect_itr; + std::list::const_iterator effect_itr; for (effect_itr=effects.begin(); effect_itr != effects.end(); ++effect_itr) { // Get clip object from the iterator @@ -1023,27 +1023,15 @@ Json::Value Timeline::JsonValue() { } // Load JSON string into this object -void Timeline::SetJson(std::string value) { +void Timeline::SetJson(const std::string value) { // Get lock (prevent getting frames while this happens) const GenericScopedLock lock(getFrameCriticalSection); // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -1054,8 +1042,8 @@ void Timeline::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Timeline::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Timeline::SetJsonValue(const Json::Value root) { // Close timeline before we do anything (this also removes all open and closing clips) bool was_open = is_open; @@ -1128,21 +1116,9 @@ void Timeline::ApplyJsonDiff(std::string value) { const GenericScopedLock lock(getFrameCriticalSection); // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success || !root.isArray()) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)."); - try { + const Json::Value root = openshot::stringToJson(value); // Process the JSON change array, loop through each item for (int x = 0; x < root.size(); x++) { // Get each change diff --git a/src/WriterBase.cpp b/src/WriterBase.cpp index 72b86b611..388219179 100644 --- a/src/WriterBase.cpp +++ b/src/WriterBase.cpp @@ -139,14 +139,14 @@ void WriterBase::DisplayInfo() { } // Generate JSON string of this object -std::string WriterBase::Json() { +std::string WriterBase::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value WriterBase::JsonValue() { +// Generate Json::Value for this object +Json::Value WriterBase::JsonValue() const { // Create root json object Json::Value root; @@ -195,24 +195,12 @@ Json::Value WriterBase::JsonValue() { } // Load JSON string into this object -void WriterBase::SetJson(std::string value) { +void WriterBase::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -223,8 +211,8 @@ void WriterBase::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void WriterBase::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void WriterBase::SetJsonValue(const Json::Value root) { // Set data from Json (if key is found) if (!root["has_video"].isNull()) diff --git a/src/effects/Bars.cpp b/src/effects/Bars.cpp index fcb684e3f..3f9aac344 100644 --- a/src/effects/Bars.cpp +++ b/src/effects/Bars.cpp @@ -114,14 +114,14 @@ std::shared_ptr Bars::GetFrame(std::shared_ptr frame, int64_t fram } // Generate JSON string of this object -std::string Bars::Json() { +std::string Bars::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Bars::JsonValue() { +// Generate Json::Value for this object +Json::Value Bars::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -137,24 +137,12 @@ Json::Value Bars::JsonValue() { } // Load JSON string into this object -void Bars::SetJson(std::string value) { +void Bars::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -165,8 +153,8 @@ void Bars::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Bars::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Bars::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -185,7 +173,7 @@ void Bars::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Bars::PropertiesJSON(int64_t requested_frame) { +std::string Bars::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/Blur.cpp b/src/effects/Blur.cpp index e0315fda4..0973d19cc 100644 --- a/src/effects/Blur.cpp +++ b/src/effects/Blur.cpp @@ -252,14 +252,14 @@ void Blur::boxBlurT(unsigned char *scl, unsigned char *tcl, int w, int h, int r) } // Generate JSON string of this object -std::string Blur::Json() { +std::string Blur::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Blur::JsonValue() { +// Generate Json::Value for this object +Json::Value Blur::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -274,24 +274,12 @@ Json::Value Blur::JsonValue() { } // Load JSON string into this object -void Blur::SetJson(std::string value) { +void Blur::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -302,8 +290,8 @@ void Blur::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Blur::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Blur::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -320,7 +308,7 @@ void Blur::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Blur::PropertiesJSON(int64_t requested_frame) { +std::string Blur::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/Brightness.cpp b/src/effects/Brightness.cpp index b8113b876..6b80fac12 100644 --- a/src/effects/Brightness.cpp +++ b/src/effects/Brightness.cpp @@ -108,14 +108,14 @@ std::shared_ptr Brightness::GetFrame(std::shared_ptr frame, int64_ } // Generate JSON string of this object -std::string Brightness::Json() { +std::string Brightness::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Brightness::JsonValue() { +// Generate Json::Value for this object +Json::Value Brightness::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -128,24 +128,12 @@ Json::Value Brightness::JsonValue() { } // Load JSON string into this object -void Brightness::SetJson(std::string value) { +void Brightness::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -156,8 +144,8 @@ void Brightness::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Brightness::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Brightness::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -170,7 +158,7 @@ void Brightness::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Brightness::PropertiesJSON(int64_t requested_frame) { +std::string Brightness::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/ChromaKey.cpp b/src/effects/ChromaKey.cpp index 30c4dfce8..dbb56a693 100644 --- a/src/effects/ChromaKey.cpp +++ b/src/effects/ChromaKey.cpp @@ -101,14 +101,14 @@ std::shared_ptr ChromaKey::GetFrame(std::shared_ptr frame, int64_t } // Generate JSON string of this object -std::string ChromaKey::Json() { +std::string ChromaKey::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value ChromaKey::JsonValue() { +// Generate Json::Value for this object +Json::Value ChromaKey::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -121,24 +121,12 @@ Json::Value ChromaKey::JsonValue() { } // Load JSON string into this object -void ChromaKey::SetJson(std::string value) { +void ChromaKey::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -149,8 +137,8 @@ void ChromaKey::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void ChromaKey::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void ChromaKey::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -163,7 +151,7 @@ void ChromaKey::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string ChromaKey::PropertiesJSON(int64_t requested_frame) { +std::string ChromaKey::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/ColorShift.cpp b/src/effects/ColorShift.cpp index ea8ae136e..5d8b5160b 100644 --- a/src/effects/ColorShift.cpp +++ b/src/effects/ColorShift.cpp @@ -194,14 +194,14 @@ std::shared_ptr ColorShift::GetFrame(std::shared_ptr frame, int64_ } // Generate JSON string of this object -std::string ColorShift::Json() { +std::string ColorShift::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value ColorShift::JsonValue() { +// Generate Json::Value for this object +Json::Value ColorShift::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -220,24 +220,12 @@ Json::Value ColorShift::JsonValue() { } // Load JSON string into this object -void ColorShift::SetJson(std::string value) { +void ColorShift::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -248,8 +236,8 @@ void ColorShift::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void ColorShift::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void ColorShift::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -274,7 +262,7 @@ void ColorShift::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string ColorShift::PropertiesJSON(int64_t requested_frame) { +std::string ColorShift::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/Crop.cpp b/src/effects/Crop.cpp index 8a4afa5e1..b1c3d38d9 100644 --- a/src/effects/Crop.cpp +++ b/src/effects/Crop.cpp @@ -114,14 +114,14 @@ std::shared_ptr Crop::GetFrame(std::shared_ptr frame, int64_t fram } // Generate JSON string of this object -std::string Crop::Json() { +std::string Crop::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Crop::JsonValue() { +// Generate Json::Value for this object +Json::Value Crop::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -136,24 +136,12 @@ Json::Value Crop::JsonValue() { } // Load JSON string into this object -void Crop::SetJson(std::string value) { +void Crop::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -164,8 +152,8 @@ void Crop::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Crop::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Crop::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -182,7 +170,7 @@ void Crop::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Crop::PropertiesJSON(int64_t requested_frame) { +std::string Crop::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/Deinterlace.cpp b/src/effects/Deinterlace.cpp index a78af9314..39b3316a5 100644 --- a/src/effects/Deinterlace.cpp +++ b/src/effects/Deinterlace.cpp @@ -96,14 +96,14 @@ std::shared_ptr Deinterlace::GetFrame(std::shared_ptr frame, int64 } // Generate JSON string of this object -std::string Deinterlace::Json() { +std::string Deinterlace::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Deinterlace::JsonValue() { +// Generate Json::Value for this object +Json::Value Deinterlace::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -115,24 +115,12 @@ Json::Value Deinterlace::JsonValue() { } // Load JSON string into this object -void Deinterlace::SetJson(std::string value) { +void Deinterlace::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -143,8 +131,8 @@ void Deinterlace::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Deinterlace::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Deinterlace::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -155,7 +143,7 @@ void Deinterlace::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Deinterlace::PropertiesJSON(int64_t requested_frame) { +std::string Deinterlace::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/Hue.cpp b/src/effects/Hue.cpp index 4083d0356..644f6772d 100644 --- a/src/effects/Hue.cpp +++ b/src/effects/Hue.cpp @@ -103,14 +103,14 @@ std::shared_ptr Hue::GetFrame(std::shared_ptr frame, int64_t frame } // Generate JSON string of this object -std::string Hue::Json() { +std::string Hue::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Hue::JsonValue() { +// Generate Json::Value for this object +Json::Value Hue::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -122,24 +122,12 @@ Json::Value Hue::JsonValue() { } // Load JSON string into this object -void Hue::SetJson(std::string value) { +void Hue::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -150,8 +138,8 @@ void Hue::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Hue::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Hue::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -162,7 +150,7 @@ void Hue::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Hue::PropertiesJSON(int64_t requested_frame) { +std::string Hue::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/Mask.cpp b/src/effects/Mask.cpp index b804c2148..11c37f053 100644 --- a/src/effects/Mask.cpp +++ b/src/effects/Mask.cpp @@ -150,14 +150,14 @@ std::shared_ptr Mask::GetFrame(std::shared_ptr frame, int64_t fram } // Generate JSON string of this object -std::string Mask::Json() { +std::string Mask::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Mask::JsonValue() { +// Generate Json::Value for this object +Json::Value Mask::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -175,24 +175,12 @@ Json::Value Mask::JsonValue() { } // Load JSON string into this object -void Mask::SetJson(std::string value) { +void Mask::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -203,8 +191,8 @@ void Mask::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Mask::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Mask::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -271,7 +259,7 @@ void Mask::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Mask::PropertiesJSON(int64_t requested_frame) { +std::string Mask::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/Negate.cpp b/src/effects/Negate.cpp index cce594984..18a5d194c 100644 --- a/src/effects/Negate.cpp +++ b/src/effects/Negate.cpp @@ -58,14 +58,14 @@ std::shared_ptr Negate::GetFrame(std::shared_ptr frame, int64_t fr } // Generate JSON string of this object -std::string Negate::Json() { +std::string Negate::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Negate::JsonValue() { +// Generate Json::Value for this object +Json::Value Negate::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -76,24 +76,12 @@ Json::Value Negate::JsonValue() { } // Load JSON string into this object -void Negate::SetJson(std::string value) { +void Negate::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -104,8 +92,8 @@ void Negate::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Negate::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Negate::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -113,7 +101,7 @@ void Negate::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Negate::PropertiesJSON(int64_t requested_frame) { +std::string Negate::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/Pixelate.cpp b/src/effects/Pixelate.cpp index a57a186f1..804634218 100644 --- a/src/effects/Pixelate.cpp +++ b/src/effects/Pixelate.cpp @@ -110,14 +110,14 @@ std::shared_ptr Pixelate::GetFrame(std::shared_ptr frame, int64_t } // Generate JSON string of this object -std::string Pixelate::Json() { +std::string Pixelate::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Pixelate::JsonValue() { +// Generate Json::Value for this object +Json::Value Pixelate::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -133,24 +133,12 @@ Json::Value Pixelate::JsonValue() { } // Load JSON string into this object -void Pixelate::SetJson(std::string value) { +void Pixelate::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -161,8 +149,8 @@ void Pixelate::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Pixelate::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Pixelate::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -181,7 +169,7 @@ void Pixelate::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Pixelate::PropertiesJSON(int64_t requested_frame) { +std::string Pixelate::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/Saturation.cpp b/src/effects/Saturation.cpp index 06bcb02c2..6b0c7b3c2 100644 --- a/src/effects/Saturation.cpp +++ b/src/effects/Saturation.cpp @@ -114,14 +114,14 @@ std::shared_ptr Saturation::GetFrame(std::shared_ptr frame, int64_ } // Generate JSON string of this object -std::string Saturation::Json() { +std::string Saturation::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Saturation::JsonValue() { +// Generate Json::Value for this object +Json::Value Saturation::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -133,24 +133,12 @@ Json::Value Saturation::JsonValue() { } // Load JSON string into this object -void Saturation::SetJson(std::string value) { +void Saturation::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -161,8 +149,8 @@ void Saturation::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Saturation::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Saturation::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -173,7 +161,7 @@ void Saturation::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Saturation::PropertiesJSON(int64_t requested_frame) { +std::string Saturation::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/Shift.cpp b/src/effects/Shift.cpp index d0908fd88..0a58d152b 100644 --- a/src/effects/Shift.cpp +++ b/src/effects/Shift.cpp @@ -133,14 +133,14 @@ std::shared_ptr Shift::GetFrame(std::shared_ptr frame, int64_t fra } // Generate JSON string of this object -std::string Shift::Json() { +std::string Shift::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Shift::JsonValue() { +// Generate Json::Value for this object +Json::Value Shift::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -153,24 +153,12 @@ Json::Value Shift::JsonValue() { } // Load JSON string into this object -void Shift::SetJson(std::string value) { +void Shift::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -181,8 +169,8 @@ void Shift::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Shift::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Shift::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -195,7 +183,7 @@ void Shift::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Shift::PropertiesJSON(int64_t requested_frame) { +std::string Shift::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/src/effects/Wave.cpp b/src/effects/Wave.cpp index 2139e4ac8..1b6520989 100644 --- a/src/effects/Wave.cpp +++ b/src/effects/Wave.cpp @@ -113,14 +113,14 @@ std::shared_ptr Wave::GetFrame(std::shared_ptr frame, int64_t fram } // Generate JSON string of this object -std::string Wave::Json() { +std::string Wave::Json() const { // Return formatted string return JsonValue().toStyledString(); } -// Generate Json::JsonValue for this object -Json::Value Wave::JsonValue() { +// Generate Json::Value for this object +Json::Value Wave::JsonValue() const { // Create root json object Json::Value root = EffectBase::JsonValue(); // get parent properties @@ -136,24 +136,12 @@ Json::Value Wave::JsonValue() { } // Load JSON string into this object -void Wave::SetJson(std::string value) { +void Wave::SetJson(const std::string value) { // Parse JSON string into JSON objects - Json::Value root; - Json::CharReaderBuilder rbuilder; - Json::CharReader* reader(rbuilder.newCharReader()); - - std::string errors; - bool success = reader->parse( value.c_str(), - value.c_str() + value.size(), &root, &errors ); - delete reader; - - if (!success) - // Raise exception - throw InvalidJSON("JSON could not be parsed (or is invalid)"); - try { + const Json::Value root = openshot::stringToJson(value); // Set all values that match SetJsonValue(root); } @@ -164,8 +152,8 @@ void Wave::SetJson(std::string value) { } } -// Load Json::JsonValue into this object -void Wave::SetJsonValue(Json::Value root) { +// Load Json::Value into this object +void Wave::SetJsonValue(const Json::Value root) { // Set parent data EffectBase::SetJsonValue(root); @@ -184,7 +172,7 @@ void Wave::SetJsonValue(Json::Value root) { } // Get all properties for a specific frame -std::string Wave::PropertiesJSON(int64_t requested_frame) { +std::string Wave::PropertiesJSON(int64_t requested_frame) const { // Generate JSON properties list Json::Value root; diff --git a/tests/ReaderBase_Tests.cpp b/tests/ReaderBase_Tests.cpp index 8ac283218..e3062bc18 100644 --- a/tests/ReaderBase_Tests.cpp +++ b/tests/ReaderBase_Tests.cpp @@ -49,9 +49,9 @@ TEST(ReaderBase_Derived_Class) std::shared_ptr GetFrame(int64_t number) { std::shared_ptr f(new Frame()); return f; } void Close() { }; void Open() { }; - string Json() { return NULL; }; + string Json() const { return NULL; }; void SetJson(string value) { }; - Json::Value JsonValue() { return (int) NULL; }; + Json::Value JsonValue() const { return (int) NULL; }; void SetJsonValue(Json::Value root) { }; bool IsOpen() { return true; }; string Name() { return "TestReader"; }; From 09ae8f1e0083d019752e47518b09d7f7d2f496ce Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Fri, 27 Dec 2019 10:28:18 -0500 Subject: [PATCH 02/47] Add Json.cpp --- src/Json.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/Json.cpp diff --git a/src/Json.cpp b/src/Json.cpp new file mode 100644 index 000000000..0c83d9d62 --- /dev/null +++ b/src/Json.cpp @@ -0,0 +1,50 @@ +/** + * @file + * @brief Helper functions for Json parsing + * @author FeRD (Frank Dana) + * + * @ref License + */ + +/* LICENSE + * + * Copyright (c) 2008-2019 OpenShot Studios, LLC + * . This file is part of + * OpenShot Library (libopenshot), an open-source project dedicated to + * delivering high quality video editing and animation solutions to the + * world. For more information visit . + * + * OpenShot Library (libopenshot) is free software: you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * OpenShot Library (libopenshot) 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with OpenShot Library. If not, see . + */ + +#include "../include/Json.h" + +const Json::Value openshot::stringToJson(const std::string value) { + + // Parse JSON string into JSON objects + Json::Value root; + Json::CharReaderBuilder rbuilder; + Json::CharReader* reader(rbuilder.newCharReader()); + + std::string errors; + bool success = reader->parse( value.c_str(), value.c_str() + value.size(), + &root, &errors ); + delete reader; + + if (!success) + // Raise exception + throw openshot::InvalidJSON("JSON could not be parsed (or is invalid)"); + + return root; +} From ffa5aab17a29e305329a74e4c304f7cb438d27c5 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Tue, 7 Jan 2020 17:06:22 -0500 Subject: [PATCH 03/47] Bump version for development --- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31b0de2cc..cce01d357 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,8 @@ For more information, please visit . set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") ################ PROJECT VERSION #################### -set(PROJECT_VERSION_FULL "0.2.3-dev1") -set(PROJECT_SO_VERSION 17) +set(PROJECT_VERSION_FULL "0.2.4-dev1") +set(PROJECT_SO_VERSION 18) # Remove the dash and anything following, to get the #.#.# version for project() STRING(REGEX REPLACE "\-.*$" "" VERSION_NUM "${PROJECT_VERSION_FULL}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b684aaec6..41c425c2a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -79,7 +79,7 @@ ENDIF (ImageMagick_FOUND) ################# LIBOPENSHOT-AUDIO ################### # Find JUCE-based openshot Audio libraries -FIND_PACKAGE(OpenShotAudio 0.1.8 REQUIRED) +FIND_PACKAGE(OpenShotAudio 0.1.9 REQUIRED) # Include Juce headers (needed for compile) include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS}) From a95772079038202e97f5719f6f3d2070a19fb852 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 8 Jan 2020 16:40:52 -0500 Subject: [PATCH 04/47] FindRESVG: Modernize with targets --- cmake/Modules/FindRESVG.cmake | 135 +++++++++++++++++++++++++++------- src/CMakeLists.txt | 39 +++++----- tests/CMakeLists.txt | 12 +-- 3 files changed, 129 insertions(+), 57 deletions(-) diff --git a/cmake/Modules/FindRESVG.cmake b/cmake/Modules/FindRESVG.cmake index b03a0667e..1d5d1c10f 100644 --- a/cmake/Modules/FindRESVG.cmake +++ b/cmake/Modules/FindRESVG.cmake @@ -1,28 +1,107 @@ -# - Try to find RESVG -# Once done this will define -# RESVG_FOUND - System has RESVG -# RESVG_INCLUDE_DIRS - The RESVG include directories -# RESVG_LIBRARIES - The libraries needed to use RESVG -find_path ( RESVG_INCLUDE_DIR ResvgQt.h - PATHS ${RESVGDIR}/include/resvg - $ENV{RESVGDIR}/include/resvg - $ENV{RESVGDIR}/include - /usr/include/resvg - /usr/include - /usr/local/include/resvg - /usr/local/include ) - -find_library ( RESVG_LIBRARY NAMES resvg - PATHS /usr/lib - /usr/local/lib - $ENV{RESVGDIR} - $ENV{RESVGDIR}/lib ) - -set ( RESVG_LIBRARIES ${RESVG_LIBRARY} ) -set ( RESVG_INCLUDE_DIRS ${RESVG_INCLUDE_DIR} ) - -include ( FindPackageHandleStandardArgs ) -# handle the QUIETLY and REQUIRED arguments and set RESVG_FOUND to TRUE -# if all listed variables are TRUE -find_package_handle_standard_args ( RESVG "Could NOT find RESVG, using Qt SVG parsing instead" RESVG_LIBRARY RESVG_INCLUDE_DIR ) -mark_as_advanced( RESVG_LIBRARY RESVG_INCLUDE_DIR ) +# vim: ts=2 sw=2 +#[=======================================================================[.rst: +FindRESVG +--------- +Try to find the shared-library build of resvg, the Rust SVG library + +IMPORTED targets +^^^^^^^^^^^^^^^^ + +This module defines :prop_tgt:`IMPORTED` target ``RESVG::resvg`` when +the library and headers are found. + +Result Variables +^^^^^^^^^^^^^^^^ + +This module defines the following variables: + +:: + + RESVG_FOUND - Library and header files found + RESVG_INCLUDE_DIRS - Include directory path + RESVG_LIBRARIES - Link path to the library + RESVG_DEFINITIONS - Compiler switches (currently unused) + +Backwards compatibility +^^^^^^^^^^^^^^^^^^^^^^^ + +For compatibility with previous versions of this module, uppercase names +for FFmpeg and for all components are also recognized, and all-uppercase +versions of the cache variables are also created. + +Control variables +^^^^^^^^^^^^^^^^^ + +The following variables can be used to provide path hints to the module: + +RESVGDIR - Set in the calling CMakeLists.txt or on the command line +ENV{RESVGDIR} - An environment variable in the cmake process context + +Copyright (c) 2020, FeRD (Frank Dana) +#]=======================================================================] +include(FindPackageHandleStandardArgs) + +# CMake 3.4+ only: Convert relative paths to absolute +if(CMAKE_VERSION VERSION_GREATER 3.4) + get_filename_component(RESVGDIR ${RESVGDIR} ABSOLUTE + BASE_DIR ${CMAKE_CURRENT_BINARY_DIR}) +endif() + +find_path(RESVG_INCLUDE_DIRS + ResvgQt.h + PATHS + ${RESVGDIR} + ${RESVGDIR}/include + $ENV{RESVGDIR} + $ENV{RESVGDIR}/include + /usr/include + /usr/local/include + PATH_SUFFIXES + resvg + capi/include + resvg/capi/include +) + +find_library(RESVG_LIBRARIES + NAMES resvg + PATHS + ${RESVGDIR} + ${RESVGDIR}/lib + $ENV{RESVGDIR} + $ENV{RESVGDIR}/lib + /usr/lib + /usr/local/lib + PATH_SUFFIXES + resvg + target/release + resvg/target/release +) + +if (RESVG_INCLUDE_DIRS AND RESVG_LIBRARIES) + set(RESVG_FOUND TRUE) +endif() +set(RESVG_LIBRARIES ${RESVG_LIBRARIES} CACHE STRING "The Resvg library link path") +set(RESVG_INCLUDE_DIRS ${RESVG_INCLUDE_DIRS} CACHE STRING "The Resvg include directories") +set(RESVG_DEFINITIONS "" CACHE STRING "The Resvg CFLAGS") + +mark_as_advanced(RESVG_LIBRARIES RESVG_INCLUDE_DIRS RESVG_DEFINITIONS) + +# Give a nice error message if some of the required vars are missing. +find_package_handle_standard_args(RESVG + "Could NOT find RESVG, using Qt SVG parsing instead" + RESVG_LIBRARIES RESVG_INCLUDE_DIRS ) + +# Export target +if(RESVG_FOUND AND NOT TARGET RESVG::resvg) + message(STATUS "Creating IMPORTED target RESVG::resvg") + add_library(RESVG::resvg UNKNOWN IMPORTED) + + set_target_properties(RESVG::resvg PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${RESVG_INCLUDE_DIRS}") + + set_property(TARGET RESVG::resvg APPEND PROPERTY + INTERFACE_COMPILE_DEFINITIONS "${RESVG_DEFINITIONS}") + + set_property(TARGET RESVG::resvg APPEND PROPERTY + IMPORTED_LOCATION "${RESVG_LIBRARIES}") +endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 41c425c2a..fb62de0a2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -100,20 +100,6 @@ IF (ENABLE_BLACKMAGIC) ENDIF (BLACKMAGIC_FOUND) ENDIF (ENABLE_BLACKMAGIC) - -################### RESVG ##################### -# Find resvg library (used for rendering svg files) -FIND_PACKAGE(RESVG) - -# Include resvg headers (optional SVG library) -if (RESVG_FOUND) - include_directories(${RESVG_INCLUDE_DIRS}) - - # define a global var (used in the C++) - add_definitions( -DUSE_RESVG=1 ) - SET(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1") -endif(RESVG_FOUND) - ############### PROFILING ################# #set(PROFILER "/usr/lib/libprofiler.so.0.3.2") #set(PROFILER "/usr/lib/libtcmalloc.so.4") @@ -357,6 +343,27 @@ if (TARGET cppzmq) target_link_libraries(openshot PUBLIC cppzmq) endif() +################### RESVG ##################### +# Migrate some legacy variable names +if(DEFINED RESVGDIR AND NOT DEFINED RESVG_ROOT) + set(RESVG_ROOT ${RESVGDIR}) +endif() +if(DEFINED ENV{RESVGDIR} AND NOT DEFINED RESVG_ROOT) + set(RESVG_ROOT $ENV{RESVGDIR}) +endif() + +# Find resvg library (used for rendering svg files) +FIND_PACKAGE(RESVG) + +# Include resvg headers (optional SVG library) +if (TARGET RESVG::resvg) + #include_directories(${RESVG_INCLUDE_DIRS}) + target_link_libraries(openshot PUBLIC RESVG::resvg) + + # define a global var (used in the C++) + add_definitions( -DUSE_RESVG=1 ) + set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1") +endif() ############### LINK LIBRARY ################# # Link remaining dependency libraries @@ -368,10 +375,6 @@ if(ImageMagick_FOUND) target_link_libraries(openshot PUBLIC ${ImageMagick_LIBRARIES}) endif() -if(RESVG_FOUND) - target_link_libraries(openshot PUBLIC ${RESVG_LIBRARIES}) -endif() - if(BLACKMAGIC_FOUND) target_link_libraries(openshot PUBLIC ${BLACKMAGIC_LIBRARY_DIR}) endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 12f84bb6c..4b2284f63 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -76,7 +76,7 @@ ENDIF (ImageMagick_FOUND) ################# LIBOPENSHOT-AUDIO ################### # Find JUCE-based openshot Audio libraries -FIND_PACKAGE(OpenShotAudio 0.1.8 REQUIRED) +FIND_PACKAGE(OpenShotAudio 0.1.9 REQUIRED) # Include Juce headers (needed for compile) include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS}) @@ -94,16 +94,6 @@ IF (ENABLE_BLACKMAGIC) ENDIF (ENABLE_BLACKMAGIC) -################### RESVG ##################### -# Find resvg library (used for rendering svg files) -FIND_PACKAGE(RESVG) - -# Include resvg headers (optional SVG library) -if (RESVG_FOUND) - include_directories(${RESVG_INCLUDE_DIRS}) -endif(RESVG_FOUND) - - ############### SET TEST SOURCE FILES ################# SET ( OPENSHOT_TEST_FILES Cache_Tests.cpp From 6aa799cb518f57339f52fdef8f39d74f88e062b1 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 8 Jan 2020 16:40:52 -0500 Subject: [PATCH 05/47] FindRESVG: Modernize with targets --- cmake/Modules/FindRESVG.cmake | 135 +++++++++++++++++++++++++++------- src/CMakeLists.txt | 39 +++++----- tests/CMakeLists.txt | 12 +-- 3 files changed, 129 insertions(+), 57 deletions(-) diff --git a/cmake/Modules/FindRESVG.cmake b/cmake/Modules/FindRESVG.cmake index b03a0667e..d9942730c 100644 --- a/cmake/Modules/FindRESVG.cmake +++ b/cmake/Modules/FindRESVG.cmake @@ -1,28 +1,107 @@ -# - Try to find RESVG -# Once done this will define -# RESVG_FOUND - System has RESVG -# RESVG_INCLUDE_DIRS - The RESVG include directories -# RESVG_LIBRARIES - The libraries needed to use RESVG -find_path ( RESVG_INCLUDE_DIR ResvgQt.h - PATHS ${RESVGDIR}/include/resvg - $ENV{RESVGDIR}/include/resvg - $ENV{RESVGDIR}/include - /usr/include/resvg - /usr/include - /usr/local/include/resvg - /usr/local/include ) - -find_library ( RESVG_LIBRARY NAMES resvg - PATHS /usr/lib - /usr/local/lib - $ENV{RESVGDIR} - $ENV{RESVGDIR}/lib ) - -set ( RESVG_LIBRARIES ${RESVG_LIBRARY} ) -set ( RESVG_INCLUDE_DIRS ${RESVG_INCLUDE_DIR} ) - -include ( FindPackageHandleStandardArgs ) -# handle the QUIETLY and REQUIRED arguments and set RESVG_FOUND to TRUE -# if all listed variables are TRUE -find_package_handle_standard_args ( RESVG "Could NOT find RESVG, using Qt SVG parsing instead" RESVG_LIBRARY RESVG_INCLUDE_DIR ) -mark_as_advanced( RESVG_LIBRARY RESVG_INCLUDE_DIR ) +# vim: ts=2 sw=2 +#[=======================================================================[.rst: +FindRESVG +--------- +Try to find the shared-library build of resvg, the Rust SVG library + +IMPORTED targets +^^^^^^^^^^^^^^^^ + +This module defines :prop_tgt:`IMPORTED` target ``RESVG::resvg`` when +the library and headers are found. + +Result Variables +^^^^^^^^^^^^^^^^ + +This module defines the following variables: + +:: + + RESVG_FOUND - Library and header files found + RESVG_INCLUDE_DIRS - Include directory path + RESVG_LIBRARIES - Link path to the library + RESVG_DEFINITIONS - Compiler switches (currently unused) + +Backwards compatibility +^^^^^^^^^^^^^^^^^^^^^^^ + +For compatibility with previous versions of this module, uppercase names +for FFmpeg and for all components are also recognized, and all-uppercase +versions of the cache variables are also created. + +Control variables +^^^^^^^^^^^^^^^^^ + +The following variables can be used to provide path hints to the module: + +RESVGDIR - Set in the calling CMakeLists.txt or on the command line +ENV{RESVGDIR} - An environment variable in the cmake process context + +Copyright (c) 2020, FeRD (Frank Dana) +#]=======================================================================] +include(FindPackageHandleStandardArgs) + +# CMake 3.4+ only: Convert relative paths to absolute +if(DEFINED RESVGDIR AND CMAKE_VERSION VERSION_GREATER 3.4) + get_filename_component(RESVGDIR "${RESVGDIR}" ABSOLUTE + BASE_DIR ${CMAKE_CURRENT_BINARY_DIR}) +endif() + +find_path(RESVG_INCLUDE_DIRS + ResvgQt.h + PATHS + ${RESVGDIR} + ${RESVGDIR}/include + $ENV{RESVGDIR} + $ENV{RESVGDIR}/include + /usr/include + /usr/local/include + PATH_SUFFIXES + resvg + capi/include + resvg/capi/include +) + +find_library(RESVG_LIBRARIES + NAMES resvg + PATHS + ${RESVGDIR} + ${RESVGDIR}/lib + $ENV{RESVGDIR} + $ENV{RESVGDIR}/lib + /usr/lib + /usr/local/lib + PATH_SUFFIXES + resvg + target/release + resvg/target/release +) + +if (RESVG_INCLUDE_DIRS AND RESVG_LIBRARIES) + set(RESVG_FOUND TRUE) +endif() +set(RESVG_LIBRARIES ${RESVG_LIBRARIES} CACHE STRING "The Resvg library link path") +set(RESVG_INCLUDE_DIRS ${RESVG_INCLUDE_DIRS} CACHE STRING "The Resvg include directories") +set(RESVG_DEFINITIONS "" CACHE STRING "The Resvg CFLAGS") + +mark_as_advanced(RESVG_LIBRARIES RESVG_INCLUDE_DIRS RESVG_DEFINITIONS) + +# Give a nice error message if some of the required vars are missing. +find_package_handle_standard_args(RESVG + "Could NOT find RESVG, using Qt SVG parsing instead" + RESVG_LIBRARIES RESVG_INCLUDE_DIRS ) + +# Export target +if(RESVG_FOUND AND NOT TARGET RESVG::resvg) + message(STATUS "Creating IMPORTED target RESVG::resvg") + add_library(RESVG::resvg UNKNOWN IMPORTED) + + set_target_properties(RESVG::resvg PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${RESVG_INCLUDE_DIRS}") + + set_property(TARGET RESVG::resvg APPEND PROPERTY + INTERFACE_COMPILE_DEFINITIONS "${RESVG_DEFINITIONS}") + + set_property(TARGET RESVG::resvg APPEND PROPERTY + IMPORTED_LOCATION "${RESVG_LIBRARIES}") +endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 41c425c2a..fb62de0a2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -100,20 +100,6 @@ IF (ENABLE_BLACKMAGIC) ENDIF (BLACKMAGIC_FOUND) ENDIF (ENABLE_BLACKMAGIC) - -################### RESVG ##################### -# Find resvg library (used for rendering svg files) -FIND_PACKAGE(RESVG) - -# Include resvg headers (optional SVG library) -if (RESVG_FOUND) - include_directories(${RESVG_INCLUDE_DIRS}) - - # define a global var (used in the C++) - add_definitions( -DUSE_RESVG=1 ) - SET(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1") -endif(RESVG_FOUND) - ############### PROFILING ################# #set(PROFILER "/usr/lib/libprofiler.so.0.3.2") #set(PROFILER "/usr/lib/libtcmalloc.so.4") @@ -357,6 +343,27 @@ if (TARGET cppzmq) target_link_libraries(openshot PUBLIC cppzmq) endif() +################### RESVG ##################### +# Migrate some legacy variable names +if(DEFINED RESVGDIR AND NOT DEFINED RESVG_ROOT) + set(RESVG_ROOT ${RESVGDIR}) +endif() +if(DEFINED ENV{RESVGDIR} AND NOT DEFINED RESVG_ROOT) + set(RESVG_ROOT $ENV{RESVGDIR}) +endif() + +# Find resvg library (used for rendering svg files) +FIND_PACKAGE(RESVG) + +# Include resvg headers (optional SVG library) +if (TARGET RESVG::resvg) + #include_directories(${RESVG_INCLUDE_DIRS}) + target_link_libraries(openshot PUBLIC RESVG::resvg) + + # define a global var (used in the C++) + add_definitions( -DUSE_RESVG=1 ) + set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1") +endif() ############### LINK LIBRARY ################# # Link remaining dependency libraries @@ -368,10 +375,6 @@ if(ImageMagick_FOUND) target_link_libraries(openshot PUBLIC ${ImageMagick_LIBRARIES}) endif() -if(RESVG_FOUND) - target_link_libraries(openshot PUBLIC ${RESVG_LIBRARIES}) -endif() - if(BLACKMAGIC_FOUND) target_link_libraries(openshot PUBLIC ${BLACKMAGIC_LIBRARY_DIR}) endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 12f84bb6c..4b2284f63 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -76,7 +76,7 @@ ENDIF (ImageMagick_FOUND) ################# LIBOPENSHOT-AUDIO ################### # Find JUCE-based openshot Audio libraries -FIND_PACKAGE(OpenShotAudio 0.1.8 REQUIRED) +FIND_PACKAGE(OpenShotAudio 0.1.9 REQUIRED) # Include Juce headers (needed for compile) include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS}) @@ -94,16 +94,6 @@ IF (ENABLE_BLACKMAGIC) ENDIF (ENABLE_BLACKMAGIC) -################### RESVG ##################### -# Find resvg library (used for rendering svg files) -FIND_PACKAGE(RESVG) - -# Include resvg headers (optional SVG library) -if (RESVG_FOUND) - include_directories(${RESVG_INCLUDE_DIRS}) -endif(RESVG_FOUND) - - ############### SET TEST SOURCE FILES ################# SET ( OPENSHOT_TEST_FILES Cache_Tests.cpp From 4f2800664baaf9e2ac1afec52ff7e184b9784ba5 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 8 Jan 2020 17:00:46 -0500 Subject: [PATCH 06/47] Change RESVG image format to ARGB32_Pre --- src/QtImageReader.cpp | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp index 7163b0979..e2ee5d7ad 100644 --- a/src/QtImageReader.cpp +++ b/src/QtImageReader.cpp @@ -71,7 +71,7 @@ void QtImageReader::Open() if (!is_open) { bool success = true; - image = std::shared_ptr(new QImage()); + bool loaded = false; #if USE_RESVG == 1 // If defined and found in CMake, utilize the libresvg for parsing @@ -80,38 +80,32 @@ void QtImageReader::Open() if (path.toLower().endsWith(".svg") || path.toLower().endsWith(".svgz")) { ResvgRenderer renderer(path); - if (!renderer.isValid()) { - // Attempt to open file (old method using Qt5 limited SVG parsing) - success = image->load(path); - if (success) { - image = std::shared_ptr(new QImage(image->convertToFormat(QImage::Format_RGBA8888))); - } - } else { + if (renderer.isValid()) { - image = std::shared_ptr(new QImage(renderer.defaultSize(), QImage::Format_RGBA8888)); + image = std::shared_ptr(new QImage(renderer.defaultSize(), QImage::Format_ARGB32_Premultiplied)); image->fill(Qt::transparent); QPainter p(image.get()); renderer.render(&p); p.end(); + loaded = true; } + } +#endif - } else { - // Attempt to open file (old method) + if (!loaded) { + // Attempt to open file using Qt's build in image processing capabilities + image = std::shared_ptr(new QImage()); success = image->load(path); - if (success) - image = std::shared_ptr(new QImage(image->convertToFormat(QImage::Format_RGBA8888))); } -#else - // Attempt to open file using Qt's build in image processing capabilities - success = image->load(path); - if (success) - image = std::shared_ptr(new QImage(image->convertToFormat(QImage::Format_RGBA8888))); -#endif - if (!success) + if (!success) { // raise exception throw InvalidFile("File could not be opened.", path.toStdString()); + } + + // Convert to proper format + image = std::shared_ptr(new QImage(image->convertToFormat(QImage::Format_RGBA8888))); // Update image properties info.has_audio = false; From 8e2bcd00d5b2c72cfe360965c448e6cbbe3a58db Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 8 Jan 2020 18:47:19 -0500 Subject: [PATCH 07/47] Set IMPORTED_NO_SONAME on RESVG target --- cmake/Modules/FindRESVG.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/Modules/FindRESVG.cmake b/cmake/Modules/FindRESVG.cmake index d9942730c..c70b2e885 100644 --- a/cmake/Modules/FindRESVG.cmake +++ b/cmake/Modules/FindRESVG.cmake @@ -94,7 +94,7 @@ find_package_handle_standard_args(RESVG # Export target if(RESVG_FOUND AND NOT TARGET RESVG::resvg) message(STATUS "Creating IMPORTED target RESVG::resvg") - add_library(RESVG::resvg UNKNOWN IMPORTED) + add_library(RESVG::resvg SHARED IMPORTED) set_target_properties(RESVG::resvg PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${RESVG_INCLUDE_DIRS}") @@ -102,6 +102,10 @@ if(RESVG_FOUND AND NOT TARGET RESVG::resvg) set_property(TARGET RESVG::resvg APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "${RESVG_DEFINITIONS}") + # libresvg.so doesn't have a SONAME + set_property(TARGET RESVG::resvg APPEND PROPERTY + IMPORTED_NO_SONAME TRUE) + set_property(TARGET RESVG::resvg APPEND PROPERTY IMPORTED_LOCATION "${RESVG_LIBRARIES}") endif() From 5b31ba112efce8f43ff333ca4bef5126f41f5880 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 8 Jan 2020 18:47:19 -0500 Subject: [PATCH 08/47] Set IMPORTED_NO_SONAME on RESVG target --- cmake/Modules/FindRESVG.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/Modules/FindRESVG.cmake b/cmake/Modules/FindRESVG.cmake index d9942730c..c70b2e885 100644 --- a/cmake/Modules/FindRESVG.cmake +++ b/cmake/Modules/FindRESVG.cmake @@ -94,7 +94,7 @@ find_package_handle_standard_args(RESVG # Export target if(RESVG_FOUND AND NOT TARGET RESVG::resvg) message(STATUS "Creating IMPORTED target RESVG::resvg") - add_library(RESVG::resvg UNKNOWN IMPORTED) + add_library(RESVG::resvg SHARED IMPORTED) set_target_properties(RESVG::resvg PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${RESVG_INCLUDE_DIRS}") @@ -102,6 +102,10 @@ if(RESVG_FOUND AND NOT TARGET RESVG::resvg) set_property(TARGET RESVG::resvg APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "${RESVG_DEFINITIONS}") + # libresvg.so doesn't have a SONAME + set_property(TARGET RESVG::resvg APPEND PROPERTY + IMPORTED_NO_SONAME TRUE) + set_property(TARGET RESVG::resvg APPEND PROPERTY IMPORTED_LOCATION "${RESVG_LIBRARIES}") endif() From 290c7a7e84050c6d7d5d18a543e0245f77295557 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Thu, 9 Jan 2020 01:59:26 -0500 Subject: [PATCH 09/47] Fix FindRESVG for Windows --- cmake/Modules/FindRESVG.cmake | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/FindRESVG.cmake b/cmake/Modules/FindRESVG.cmake index c70b2e885..f49ad1f2a 100644 --- a/cmake/Modules/FindRESVG.cmake +++ b/cmake/Modules/FindRESVG.cmake @@ -94,18 +94,28 @@ find_package_handle_standard_args(RESVG # Export target if(RESVG_FOUND AND NOT TARGET RESVG::resvg) message(STATUS "Creating IMPORTED target RESVG::resvg") - add_library(RESVG::resvg SHARED IMPORTED) + if (WIN32) + # Windows mis-links SHARED library targets + add_library(RESVG::resvg UNKNOWN IMPORTED) + message(STATUS " UNKNOWN IMPORTED target for Win32") + else() + # Linux needs SHARED to link because libresvg has no SONAME + add_library(RESVG::resvg SHARED IMPORTED) + set_property(TARGET RESVG::resvg APPEND PROPERTY + IMPORTED_NO_SONAME TRUE) + message(STATUS " SHARED IMPORTED target with IMPORTED_NO_SONAME") + endif() + + message(STATUS " INCLUDE_DIRECTORIES: ${RESVG_INCLUDE_DIRS}") + message(STATUS " COMPILE_DEFINITIONS: ${RESVG_DEFINITIONS}") + message(STATUS " IMPORTED_LOCATION: ${RESVG_LIBRARIES}") - set_target_properties(RESVG::resvg PROPERTIES + set_property(TARGET RESVG::resvg APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${RESVG_INCLUDE_DIRS}") set_property(TARGET RESVG::resvg APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "${RESVG_DEFINITIONS}") - # libresvg.so doesn't have a SONAME - set_property(TARGET RESVG::resvg APPEND PROPERTY - IMPORTED_NO_SONAME TRUE) - set_property(TARGET RESVG::resvg APPEND PROPERTY IMPORTED_LOCATION "${RESVG_LIBRARIES}") endif() From 48fc7de326d85fce63d46a1948fe725bf7b85b98 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sat, 11 Jan 2020 17:59:03 -0500 Subject: [PATCH 10/47] Fix RESVG format in GetFrame --- src/QtImageReader.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/QtImageReader.cpp b/src/QtImageReader.cpp index e2ee5d7ad..3e51d769b 100644 --- a/src/QtImageReader.cpp +++ b/src/QtImageReader.cpp @@ -218,11 +218,14 @@ std::shared_ptr QtImageReader::GetFrame(int64_t requested_frame) // Scale image smaller (or use a previous scaled image) if (!cached_image || (max_size.width() != max_width || max_size.height() != max_height)) { + + bool rendered = false; #if USE_RESVG == 1 // If defined and found in CMake, utilize the libresvg for parsing // SVG files and rasterizing them to QImages. // Only use resvg for files ending in '.svg' or '.svgz' if (path.toLower().endsWith(".svg") || path.toLower().endsWith(".svgz")) { + ResvgRenderer renderer(path); if (renderer.isValid()) { // Scale SVG size to keep aspect ratio, and fill the max_size as best as possible @@ -230,30 +233,25 @@ std::shared_ptr QtImageReader::GetFrame(int64_t requested_frame) svg_size.scale(max_width, max_height, Qt::KeepAspectRatio); // Create empty QImage - cached_image = std::shared_ptr(new QImage(QSize(svg_size.width(), svg_size.height()), QImage::Format_RGBA8888)); + cached_image = std::shared_ptr(new QImage(QSize(svg_size.width(), svg_size.height()), QImage::Format_ARGB32_Premultiplied)); cached_image->fill(Qt::transparent); // Render SVG into QImage QPainter p(cached_image.get()); renderer.render(&p); p.end(); - } else { - // Resize current rasterized SVG (since we failed to parse original SVG file with resvg) - cached_image = std::shared_ptr(new QImage(image->scaled(max_width, max_height, Qt::KeepAspectRatio, Qt::SmoothTransformation))); - cached_image = std::shared_ptr(new QImage(cached_image->convertToFormat(QImage::Format_RGBA8888))); + rendered = true; } - } else { + } +#endif + + if (!rendered) { // We need to resize the original image to a smaller image (for performance reasons) // Only do this once, to prevent tons of unneeded scaling operations cached_image = std::shared_ptr(new QImage(image->scaled(max_width, max_height, Qt::KeepAspectRatio, Qt::SmoothTransformation))); - cached_image = std::shared_ptr(new QImage(cached_image->convertToFormat(QImage::Format_RGBA8888))); } -#else - // We need to resize the original image to a smaller image (for performance reasons) - // Only do this once, to prevent tons of unneeded scaling operations - cached_image = std::shared_ptr(new QImage(image->scaled(max_width, max_height, Qt::KeepAspectRatio, Qt::SmoothTransformation))); + cached_image = std::shared_ptr(new QImage(cached_image->convertToFormat(QImage::Format_RGBA8888))); -#endif // Set max size (to later determine if max_size is changed) max_size.setWidth(max_width); From 63baee14b93be1228a425e5ac4d17e8457a464d7 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sat, 11 Jan 2020 18:11:02 -0500 Subject: [PATCH 11/47] Define USE_RESVG for openshot target --- src/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fb62de0a2..619d78ed6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -360,8 +360,7 @@ if (TARGET RESVG::resvg) #include_directories(${RESVG_INCLUDE_DIRS}) target_link_libraries(openshot PUBLIC RESVG::resvg) - # define a global var (used in the C++) - add_definitions( -DUSE_RESVG=1 ) + target_compile_definitions(openshot PUBLIC "-DUSE_RESVG=1") set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1") endif() From 43ff40cf27548bae9e41dcb5806d961227bcc692 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 8 Jan 2020 19:12:16 -0500 Subject: [PATCH 12/47] Travis: Add libjsoncpp-dev to apt package list --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4635f86c3..36a3cf06a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,6 +66,7 @@ matrix: packages: - *ff_common - qt5-default + - libjsoncpp-dev - name: "FFmpeg 4 GCC (Ubuntu 18.04 Bionic)" env: @@ -83,6 +84,7 @@ matrix: packages: - *ff_common - qt5-default + - libjsoncpp-dev - libavcodec58 - libavformat58 - libavdevice58 From 8c53f25091d9335713e7354391283b2f4d0c5030 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sun, 12 Jan 2020 05:27:17 -0500 Subject: [PATCH 13/47] FindRESVG: Remove debugging messages --- cmake/Modules/FindRESVG.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cmake/Modules/FindRESVG.cmake b/cmake/Modules/FindRESVG.cmake index f49ad1f2a..0538eacd5 100644 --- a/cmake/Modules/FindRESVG.cmake +++ b/cmake/Modules/FindRESVG.cmake @@ -97,19 +97,13 @@ if(RESVG_FOUND AND NOT TARGET RESVG::resvg) if (WIN32) # Windows mis-links SHARED library targets add_library(RESVG::resvg UNKNOWN IMPORTED) - message(STATUS " UNKNOWN IMPORTED target for Win32") else() # Linux needs SHARED to link because libresvg has no SONAME add_library(RESVG::resvg SHARED IMPORTED) set_property(TARGET RESVG::resvg APPEND PROPERTY IMPORTED_NO_SONAME TRUE) - message(STATUS " SHARED IMPORTED target with IMPORTED_NO_SONAME") endif() - message(STATUS " INCLUDE_DIRECTORIES: ${RESVG_INCLUDE_DIRS}") - message(STATUS " COMPILE_DEFINITIONS: ${RESVG_DEFINITIONS}") - message(STATUS " IMPORTED_LOCATION: ${RESVG_LIBRARIES}") - set_property(TARGET RESVG::resvg APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${RESVG_INCLUDE_DIRS}") From c83c098bc5afe812a2180cd344387a760491ef85 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 1 Jan 2020 04:00:07 -0500 Subject: [PATCH 14/47] Use Codecov.io for coverage reporting --- .travis.yml | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1034042d9..f4cb329bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ addons: - qtmultimedia5-dev - doxygen - graphviz + - curl packages: &ff_common # Common set of FFmpeg packages - *p_common - libfdk-aac-dev @@ -34,7 +35,10 @@ addons: matrix: include: - name: "FFmpeg 2 GCC (Ubuntu 16.04 Xenial)" - env: BUILD_VERSION=ffmpeg2 + env: + - BUILD_VERSION=ffmpeg2 + - CMAKE_EXTRA_ARGS="" + - TEST_TARGET="os_test" os: linux dist: xenial addons: @@ -46,7 +50,10 @@ matrix: - *ff_common - name: "FFmpeg 3 GCC (Ubuntu 18.04 Bionic)" - env: BUILD_VERSION=ffmpeg3 + env: + - BUILD_VERSION=ffmpeg3 + - CMAKE_EXTRA_ARGS="" + - TEST_TARGET=test os: linux dist: bionic addons: @@ -59,7 +66,10 @@ matrix: - qt5-default - name: "FFmpeg 4 GCC (Ubuntu 18.04 Bionic)" - env: BUILD_VERSION=ffmpeg4 + env: + - BUILD_VERSION=ffmpeg4 + - CMAKE_EXTRA_ARGS="" + - TEST_TARGET=test os: linux dist: bionic addons: @@ -82,7 +92,10 @@ matrix: - libswresample3 - name: "FFmpeg 3 Clang (Ubuntu 18.04 Bionic)" - env: BUILD_VERSION=ffmpeg3 + env: + - BUILD_VERSION=clang_ffmpeg3 + - CMAKE_EXTRA_ARGS="" + - TEST_TARGET=test os: linux dist: bionic compiler: clang @@ -96,9 +109,31 @@ matrix: - qt5-default - libomp-dev + - name: "Coverage (Ubuntu 18.04 Bionic)" + env: + - BUILD_VERSION=coverage_ffmpeg3 + - CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1" + - TEST_TARGET=coverage + os: linux + dist: bionic + addons: + apt: + sources: + - sourceline: 'ppa:openshot.developers/libopenshot-daily' + - sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic' + packages: + - *ff_common + - qt5-default + - lcov + - binutils-common # For c++filt + script: - mkdir -p build; cd build; - cmake -DCMAKE_BUILD_TYPE:STRING="Debug" ../ - make VERBOSE=1 - - make os_test + - make ${TEST_TARGET} - make install DESTDIR="$BUILD_VERSION" + - cd .. + +after_success: + - if [ "x$TEST_TARGET" = "xcoverage" ]; then bash <(curl -s https://codecov.io/bash) -f build/coverage.info || echo "Codecov did not collect coverage reports"; fi From 6d95bcef12c22f4ef73dd7cf87916c0da0c99780 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sun, 12 Jan 2020 08:47:08 -0500 Subject: [PATCH 15/47] Configuration for Codecov --- codecov.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 codecov.yml diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 000000000..dfdc93755 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,15 @@ +codecov: + branch: default +coverage: + status: + project: + default: + base: pr # Only post a status to pull requests + informational: true # Don't block PRs based on coverage stats (yet?) +ignore: + - "/src/examples" + - "/src/Qt/demo" + - "/thirdparty" + - "/doc" + - "/cmake" + - "/*.md" From 6b16162b26b2aad72082823a7ec665cd9f483fe3 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sun, 12 Jan 2020 08:53:19 -0500 Subject: [PATCH 16/47] Reorder Travis matrix --- .travis.yml | 58 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6b63b066..f449c3f0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,28 +33,13 @@ addons: - libswresample-dev matrix: - include: - - name: "FFmpeg 2 GCC (Ubuntu 16.04 Xenial)" - env: - - BUILD_VERSION=ffmpeg2 - - CMAKE_EXTRA_ARGS="" - - TEST_TARGET="os_test" - os: linux - dist: xenial - addons: - apt: - sources: - - sourceline: 'ppa:openshot.developers/libopenshot-daily' - - sourceline: 'ppa:beineri/opt-qt-5.10.0-xenial' - packages: - - *ff_common - - name: "FFmpeg 3 GCC (Ubuntu 18.04 Bionic)" + - name: "Coverage (Ubuntu 18.04 Bionic)" env: - - BUILD_VERSION=ffmpeg3 - - CMAKE_EXTRA_ARGS="" - - TEST_TARGET=test + - BUILD_VERSION=coverage_ffmpeg3 + - CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1" + - TEST_TARGET=coverage os: linux dist: bionic addons: @@ -65,7 +50,8 @@ matrix: packages: - *ff_common - qt5-default - - libjsoncpp-dev + - lcov + - binutils-common # For c++filt - name: "FFmpeg 4 GCC (Ubuntu 18.04 Bionic)" env: @@ -94,6 +80,23 @@ matrix: - libavresample4 - libswresample3 + - name: "FFmpeg 3 GCC (Ubuntu 18.04 Bionic)" + env: + - BUILD_VERSION=ffmpeg3 + - CMAKE_EXTRA_ARGS="" + - TEST_TARGET=test + os: linux + dist: bionic + addons: + apt: + sources: + - sourceline: 'ppa:openshot.developers/libopenshot-daily' + - sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic' + packages: + - *ff_common + - qt5-default + - libjsoncpp-dev + - name: "FFmpeg 3 Clang (Ubuntu 18.04 Bionic)" env: - BUILD_VERSION=clang_ffmpeg3 @@ -112,23 +115,20 @@ matrix: - qt5-default - libomp-dev - - name: "Coverage (Ubuntu 18.04 Bionic)" + - name: "FFmpeg 2 GCC (Ubuntu 16.04 Xenial)" env: - - BUILD_VERSION=coverage_ffmpeg3 - - CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1" - - TEST_TARGET=coverage + - BUILD_VERSION=ffmpeg2 + - CMAKE_EXTRA_ARGS="" + - TEST_TARGET="os_test" os: linux - dist: bionic + dist: xenial addons: apt: sources: - sourceline: 'ppa:openshot.developers/libopenshot-daily' - - sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic' + - sourceline: 'ppa:beineri/opt-qt-5.10.0-xenial' packages: - *ff_common - - qt5-default - - lcov - - binutils-common # For c++filt script: - mkdir -p build; cd build; From 33210426721c026eba3f1e1769c59acb1126a7ed Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Tue, 14 Jan 2020 00:42:30 -0500 Subject: [PATCH 17/47] Raise preview cache to CPUs*8 frames, max 64 --- src/Qt/VideoCacheThread.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Qt/VideoCacheThread.cpp b/src/Qt/VideoCacheThread.cpp index 46b6f030a..6cff46ba8 100644 --- a/src/Qt/VideoCacheThread.cpp +++ b/src/Qt/VideoCacheThread.cpp @@ -29,13 +29,14 @@ */ #include "../../include/Qt/VideoCacheThread.h" +#include namespace openshot { // Constructor VideoCacheThread::VideoCacheThread() : Thread("video-cache"), speed(1), is_playing(false), position(1) - , reader(NULL), max_frames(OPEN_MP_NUM_PROCESSORS * 2), current_display_frame(1) + , reader(NULL), max_frames(std::min(OPEN_MP_NUM_PROCESSORS * 8, 64)), current_display_frame(1) { } From 86bfa2fa4a83fad489cf70248fe6d8843271de9d Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Tue, 21 Jan 2020 10:56:57 -0500 Subject: [PATCH 18/47] Frame: Fix interlaced AddImage --- src/Frame.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/Frame.cpp b/src/Frame.cpp index 8a843aa81..7d4dc42ec 100644 --- a/src/Frame.cpp +++ b/src/Frame.cpp @@ -818,16 +818,23 @@ void Frame::AddImage(std::shared_ptr new_image, bool only_odd_lines) // Ignore image of different sizes or formats bool ret=false; #pragma omp critical (AddImage) - if (image == new_image || image->size() != image->size() || image->format() != image->format()) - ret=true; - if (ret) + { + if (image == new_image || image->size() != new_image->size()) { + ret = true; + } + else if (new_image->format() != image->format()) { + new_image = std::shared_ptr(new QImage(new_image->convertToFormat(image->format()))); + } + } + if (ret) { return; - + } + // Get the frame's image const GenericScopedLock lock(addingImageSection); #pragma omp critical (AddImage) { - const unsigned char *pixels = image->constBits(); + unsigned char *pixels = image->bits(); const unsigned char *new_pixels = new_image->constBits(); // Loop through the scanlines of the image (even or odd) @@ -836,13 +843,13 @@ void Frame::AddImage(std::shared_ptr new_image, bool only_odd_lines) start = 1; for (int row = start; row < image->height(); row += 2) { - memcpy((unsigned char *) pixels, new_pixels + (row * image->bytesPerLine()), image->bytesPerLine()); - new_pixels += image->bytesPerLine(); + int offset = row * image->bytesPerLine(); + memcpy(pixels + offset, new_pixels + offset, image->bytesPerLine()); } // Update height and width - width = image->width(); height = image->height(); + width = image->width(); has_image_data = true; } } From 0a063b84b73ac41d2154f627d2dbed035b3739ff Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Fri, 31 Jan 2020 03:53:53 -0500 Subject: [PATCH 19/47] FFmpegWriter: Overload Set___Options() methods Add overloaded forms of SetVideoOptions() and SetAudioOptions() that apply some sensible defaults to rarely-changed parameters. --- include/FFmpegWriter.h | 21 +++++++++++++++++++++ src/FFmpegWriter.cpp | 16 ++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/include/FFmpegWriter.h b/include/FFmpegWriter.h index dc3a2cf7b..654e72cc0 100644 --- a/include/FFmpegWriter.h +++ b/include/FFmpegWriter.h @@ -287,6 +287,15 @@ namespace openshot { /// @param bit_rate The audio bit rate used during encoding void SetAudioOptions(bool has_audio, std::string codec, int sample_rate, int channels, openshot::ChannelLayout channel_layout, int bit_rate); + /// @brief Set audio export options. + /// + /// Enables the stream and configures a default 2-channel stereo layout. + /// + /// @param codec The codec used to encode the audio for this file + /// @param sample_rate The number of audio samples needed in this file + /// @param bit_rate The audio bit rate used during encoding + void SetAudioOptions(std::string codec, int sample_rate, int bit_rate); + /// @brief Set the cache size /// @param new_size The number of frames to queue before writing to the file void SetCacheSize(int new_size) { cache_size = new_size; }; @@ -303,8 +312,20 @@ namespace openshot { /// @param bit_rate The video bit rate used during encoding void SetVideoOptions(bool has_video, std::string codec, openshot::Fraction fps, int width, int height, openshot::Fraction pixel_ratio, bool interlaced, bool top_field_first, int bit_rate); + /// @brief Set video export options. + /// + /// Enables the stream and configures non-interlaced video with a 1:1 pixel aspect ratio. + /// + /// @param codec The codec used to encode the images in this video + /// @param fps The number of frames per second + /// @param width The width in pixels of this video + /// @param height The height in pixels of this video + /// @param bit_rate The video bit rate used during encoding + void SetVideoOptions(std::string codec, openshot::Fraction fps, int width, int height, int bit_rate); + /// @brief Set custom options (some codecs accept additional params). This must be called after the /// PrepareStreams() method, otherwise the streams have not been initialized yet. + /// /// @param stream The stream (openshot::StreamType) this option should apply to /// @param name The name of the option you want to set (i.e. qmin, qmax, etc...) /// @param value The new value of this option diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp index 245bd9bd6..c01a09ed2 100644 --- a/src/FFmpegWriter.cpp +++ b/src/FFmpegWriter.cpp @@ -277,6 +277,14 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std::string codec, Fraction f info.has_video = has_video; } +// Set video export options (overloaded function) +void FFmpegWriter::SetVideoOptions(std::string codec, Fraction fps, int width, int height, int bit_rate) { + // Call full signature with some default parameters + FFmpegWriter::SetVideoOptions(true, codec, fps, width, height, + openshot::Fraction(1, 1), false, true, bit_rate); +} + + // Set audio export options void FFmpegWriter::SetAudioOptions(bool has_audio, std::string codec, int sample_rate, int channels, ChannelLayout channel_layout, int bit_rate) { // Set audio options @@ -312,6 +320,14 @@ void FFmpegWriter::SetAudioOptions(bool has_audio, std::string codec, int sample info.has_audio = has_audio; } + +// Set audio export options (overloaded function) +void FFmpegWriter::SetAudioOptions(std::string codec, int sample_rate, int bit_rate) { + // Call full signature with some default parameters + FFmpegWriter::SetAudioOptions(true, codec, sample_rate, 2, openshot::LAYOUT_STEREO, bit_rate); +} + + // Set custom options (some codecs accept additional params) void FFmpegWriter::SetOption(StreamType stream, std::string name, std::string value) { // Declare codec context From bad0a34a654f15f7509ac1358663bb5a3fa87014 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Fri, 31 Jan 2020 04:35:43 -0500 Subject: [PATCH 20/47] Add unit test for overloads --- tests/FFmpegWriter_Tests.cpp | 46 +++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/tests/FFmpegWriter_Tests.cpp b/tests/FFmpegWriter_Tests.cpp index 21940b1b3..a4646eb00 100644 --- a/tests/FFmpegWriter_Tests.cpp +++ b/tests/FFmpegWriter_Tests.cpp @@ -36,7 +36,8 @@ using namespace std; using namespace openshot; -TEST(FFmpegWriter_Test_Webm) +SUITE(FFMpegWriter) { +TEST(Webm) { // Reader stringstream path; @@ -82,3 +83,46 @@ TEST(FFmpegWriter_Test_Webm) CHECK_CLOSE(23, (int)pixels[pixel_index + 2], 5); CHECK_CLOSE(255, (int)pixels[pixel_index + 3], 5); } + +TEST(Options_Overloads) +{ + // Reader + stringstream path; + path << TEST_MEDIA_PATH << "sintel_trailer-720p.mp4"; + FFmpegReader r(path.str()); + r.Open(); + + /* WRITER ---------------- */ + FFmpegWriter w("output1.mp4"); + + // Set options + w.SetAudioOptions("aac", 48000, 192000); + w.SetVideoOptions("libx264", Fraction(30,1), 1280, 720, 5000000); + + // Open writer + w.Open(); + + // Write some frames + w.WriteFrame(&r, 24, 50); + + // Close writer & reader + w.Close(); + r.Close(); + + FFmpegReader r1("output1.mp4"); + r1.Open(); + + // Verify implied settings + CHECK_EQUAL(true, r1.info.has_audio); + CHECK_EQUAL(true, r1.info.has_video); + + CHECK_EQUAL(2, r1.GetFrame(1)->GetAudioChannelsCount()); + CHECK_EQUAL(LAYOUT_STEREO, r1.info.channel_layout); + + CHECK_EQUAL(1, r1.info.pixel_ratio.num); + CHECK_EQUAL(1, r1.info.pixel_ratio.den); + CHECK_EQUAL(false, r1.info.interlaced_frame); + CHECK_EQUAL(true, r1.info.top_field_first); +} + +} // SUITE() From 7868157be555322e8f10e3c712d83e1ee08f6321 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sun, 2 Feb 2020 23:56:13 -0500 Subject: [PATCH 21/47] Streamline blur effect code --- include/effects/Blur.h | 1 - src/effects/Blur.cpp | 170 ++++++++++++++++++----------------------- 2 files changed, 74 insertions(+), 97 deletions(-) diff --git a/include/effects/Blur.h b/include/effects/Blur.h index 167e93032..00a6aeaeb 100644 --- a/include/effects/Blur.h +++ b/include/effects/Blur.h @@ -67,7 +67,6 @@ namespace openshot void init_effect_details(); /// Internal blur methods (inspired and credited to http://blog.ivank.net/fastest-gaussian-blur.html) - int* initBoxes(float sigma, int n); void boxBlurH(unsigned char *scl, unsigned char *tcl, int w, int h, int r); void boxBlurT(unsigned char *scl, unsigned char *tcl, int w, int h, int r); diff --git a/src/effects/Blur.cpp b/src/effects/Blur.cpp index e0315fda4..97c9b84d4 100644 --- a/src/effects/Blur.cpp +++ b/src/effects/Blur.cpp @@ -74,133 +74,111 @@ std::shared_ptr Blur::GetFrame(std::shared_ptr frame, int64_t fram float sigma_value = sigma.GetValue(frame_number); int iteration_value = iterations.GetInt(frame_number); - - // Declare arrays for each color channel - unsigned char *red = new unsigned char[frame_image->width() * frame_image->height()](); - unsigned char *green = new unsigned char[frame_image->width() * frame_image->height()](); - unsigned char *blue = new unsigned char[frame_image->width() * frame_image->height()](); - unsigned char *alpha = new unsigned char[frame_image->width() * frame_image->height()](); - // Create empty target RGBA arrays (for the results of our blur) - unsigned char *blur_red = new unsigned char[frame_image->width() * frame_image->height()](); - unsigned char *blur_green = new unsigned char[frame_image->width() * frame_image->height()](); - unsigned char *blur_blue = new unsigned char[frame_image->width() * frame_image->height()](); - unsigned char *blur_alpha = new unsigned char[frame_image->width() * frame_image->height()](); + int w = frame_image->width(); + int h = frame_image->height(); + + // Declare 2-column arrays for each color channel + typedef struct { + unsigned char *red; + unsigned char *green; + unsigned char *blue; + unsigned char *alpha; + } channels; + + channels arrays_in { + new unsigned char[w * h](), + new unsigned char[w * h](), + new unsigned char[w * h](), + new unsigned char[w * h]() + }; + channels arrays_out { + new unsigned char[w * h](), + new unsigned char[w * h](), + new unsigned char[w * h](), + new unsigned char[w * h]() + }; // Loop through pixels and split RGBA channels into separate arrays unsigned char *pixels = (unsigned char *) frame_image->bits(); - for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4) + + #pragma omp parallel for + for (int pixel = 0; pixel < w * h; ++pixel) { // Get the RGBA values from each pixel - unsigned char R = pixels[byte_index]; - unsigned char G = pixels[byte_index + 1]; - unsigned char B = pixels[byte_index + 2]; - unsigned char A = pixels[byte_index + 3]; - - // Split channels into their own arrays - red[pixel] = R; - green[pixel] = G; - blue[pixel] = B; - alpha[pixel] = A; + arrays_in.red[pixel] = arrays_out.red[pixel] = pixels[pixel * 4]; + arrays_in.green[pixel] = arrays_out.green[pixel] = pixels[pixel * 4 + 1]; + arrays_in.blue[pixel] = arrays_out.blue[pixel] = pixels[pixel * 4 + 2]; + arrays_in.alpha[pixel] = arrays_out.alpha[pixel] = pixels[pixel * 4 + 3]; } - // Init target RGBA arrays - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blur_red[i] = red[i]; - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blur_green[i] = green[i]; - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blur_blue[i] = blue[i]; - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blur_alpha[i] = alpha[i]; + // Initialize target struct pointers for boxBlur operations + channels *array_a = &arrays_in; + channels *array_b = &arrays_out; // Loop through each iteration - for (int iteration = 0; iteration < iteration_value; iteration++) + for (int iteration = 0; iteration < iteration_value; ++iteration) { // HORIZONTAL BLUR (if any) if (horizontal_radius_value > 0.0) { - // Init boxes for computing blur - int *bxs = initBoxes(sigma_value, horizontal_radius_value); - // Apply horizontal blur to target RGBA channels - boxBlurH(red, blur_red, frame_image->width(), frame_image->height(), horizontal_radius_value); - boxBlurH(green, blur_green, frame_image->width(), frame_image->height(), horizontal_radius_value); - boxBlurH(blue, blur_blue, frame_image->width(), frame_image->height(), horizontal_radius_value); - boxBlurH(alpha, blur_alpha, frame_image->width(), frame_image->height(), horizontal_radius_value); - - // Remove boxes - delete[] bxs; - - // Copy blur_ back to for vertical blur or next iteration - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) red[i] = blur_red[i]; - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) green[i] = blur_green[i]; - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blue[i] = blur_blue[i]; - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) alpha[i] = blur_alpha[i]; + #pragma omp parallel + { + boxBlurH(array_a->red, array_b->red, w, h, horizontal_radius_value); + boxBlurH(array_a->green, array_b->green, w, h, horizontal_radius_value); + boxBlurH(array_a->blue, array_b->blue, w, h, horizontal_radius_value); + boxBlurH(array_a->alpha, array_b->alpha, w, h, horizontal_radius_value); + } + + // Swap input and output arrays + channels *temp = array_a; + array_a = array_b; + array_b = temp; } // VERTICAL BLUR (if any) if (vertical_radius_value > 0.0) { - // Init boxes for computing blur - int *bxs = initBoxes(sigma_value, vertical_radius_value); - // Apply vertical blur to target RGBA channels - boxBlurT(red, blur_red, frame_image->width(), frame_image->height(), vertical_radius_value); - boxBlurT(green, blur_green, frame_image->width(), frame_image->height(), vertical_radius_value); - boxBlurT(blue, blur_blue, frame_image->width(), frame_image->height(), vertical_radius_value); - boxBlurT(alpha, blur_alpha, frame_image->width(), frame_image->height(), vertical_radius_value); - - // Remove boxes - delete[] bxs; - - // Copy blur_ back to for vertical blur or next iteration - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) red[i] = blur_red[i]; - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) green[i] = blur_green[i]; - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) blue[i] = blur_blue[i]; - for (int i = 0; i < (frame_image->width() * frame_image->height()); i++) alpha[i] = blur_alpha[i]; + #pragma omp parallel + { + boxBlurT(array_a->red, array_b->red, w, h, vertical_radius_value); + boxBlurT(array_a->green, array_b->green, w, h, vertical_radius_value); + boxBlurT(array_a->blue, array_b->blue, w, h, vertical_radius_value); + boxBlurT(array_a->alpha, array_b->alpha, w, h, vertical_radius_value); + } + + // Swap input and output arrays + channels *temp = array_a; + array_a = array_b; + array_b = temp; } } // Copy RGBA channels back to original image - for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4) + #pragma omp parallel for + for (int pixel = 0; pixel < w * h; ++pixel) { - // Get the RGB values from the pixel - unsigned char R = blur_red[pixel]; - unsigned char G = blur_green[pixel]; - unsigned char B = blur_blue[pixel]; - unsigned char A = blur_alpha[pixel]; - - // Split channels into their own arrays - pixels[byte_index] = R; - pixels[byte_index + 1] = G; - pixels[byte_index + 2] = B; - pixels[byte_index + 3] = A; + // Combine channels + pixels[pixel * 4] = array_b->red[pixel]; + pixels[pixel * 4 + 1] = array_b->green[pixel]; + pixels[pixel * 4 + 2] = array_b->blue[pixel]; + pixels[pixel * 4 + 3] = array_b->alpha[pixel]; } // Delete channel arrays - delete[] red; - delete[] green; - delete[] blue; - delete[] alpha; - delete[] blur_red; - delete[] blur_green; - delete[] blur_blue; - delete[] blur_alpha; + delete[] arrays_in.red; + delete[] arrays_in.green; + delete[] arrays_in.blue; + delete[] arrays_in.alpha; + + delete[] arrays_out.red; + delete[] arrays_out.green; + delete[] arrays_out.blue; + delete[] arrays_out.alpha; // return the modified frame return frame; } -// Credit: http://blog.ivank.net/fastest-gaussian-blur.html (MIT License) -int* Blur::initBoxes(float sigma, int n) // standard deviation, number of boxes -{ - float wIdeal = sqrt((12.0 * sigma * sigma / n) + 1.0); // Ideal averaging filter width - int wl = floor(wIdeal); - if (wl % 2 == 0) wl--; - int wu = wl + 2; - - float mIdeal = (12.0 * sigma * sigma - n * wl * wl - 4 * n * wl - 3 * n) / (-4.0 * wl - 4); - int m = round(mIdeal); - - int *sizes = new int[n](); - for (int i = 0; i < n; i++) sizes[i] = i < m ? wl : wu; - return sizes; -} - // Credit: http://blog.ivank.net/fastest-gaussian-blur.html (MIT License) void Blur::boxBlurH(unsigned char *scl, unsigned char *tcl, int w, int h, int r) { float iarr = 1.0 / (r + r + 1); From 1a42b4538f03ba0a1676d567d99b7321dfdac3e0 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 3 Feb 2020 02:43:15 -0500 Subject: [PATCH 22/47] Parallelize and streamline Brightness effect --- src/effects/Brightness.cpp | 43 ++++++++++++++------------------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/src/effects/Brightness.cpp b/src/effects/Brightness.cpp index b8113b876..7176cd43f 100644 --- a/src/effects/Brightness.cpp +++ b/src/effects/Brightness.cpp @@ -72,35 +72,24 @@ std::shared_ptr Brightness::GetFrame(std::shared_ptr frame, int64_ // Loop through pixels unsigned char *pixels = (unsigned char *) frame_image->bits(); - for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4) - { - // Get the RGB values from the pixel - int R = pixels[byte_index]; - int G = pixels[byte_index + 1]; - int B = pixels[byte_index + 2]; - int A = pixels[byte_index + 3]; + int pixel_count = frame_image->width() * frame_image->height(); - // Adjust the contrast + #pragma omp parallel for + for (int pixel = 0; pixel < pixel_count; ++pixel) + { + // Compute contrast adjustment factor float factor = (259 * (contrast_value + 255)) / (255 * (259 - contrast_value)); - R = constrain((factor * (R - 128)) + 128); - G = constrain((factor * (G - 128)) + 128); - B = constrain((factor * (B - 128)) + 128); - - // Adjust the brightness - R += (255 * brightness_value); - G += (255 * brightness_value); - B += (255 * brightness_value); - - // Constrain the value from 0 to 255 - R = constrain(R); - G = constrain(G); - B = constrain(B); - - // Set all pixels to new value - pixels[byte_index] = R; - pixels[byte_index + 1] = G; - pixels[byte_index + 2] = B; - pixels[byte_index + 3] = A; // leave the alpha value alone + + // Get RGB pixels from image and apply constrained contrast adjustment + int R = constrain((factor * (pixels[pixel * 4] - 128)) + 128); + int G = constrain((factor * (pixels[pixel * 4 + 1] - 128)) + 128); + int B = constrain((factor * (pixels[pixel * 4 + 2] - 128)) + 128); + // (Don't modify Alpha value) + + // Adjust brightness and write constrained values back to image + pixels[pixel * 4] = constrain(R + (255 * brightness_value)); + pixels[pixel * 4 + 1] = constrain(G + (255 * brightness_value)); + pixels[pixel * 4 + 2] = constrain(B + (255 * brightness_value)); } // return the modified frame From 7d2ff3a5cddeac07f94d4ad56a9fc7c9b610214d Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 3 Feb 2020 03:13:35 -0500 Subject: [PATCH 23/47] Streamline and parallelize Wave effect --- src/effects/Wave.cpp | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/src/effects/Wave.cpp b/src/effects/Wave.cpp index 3b1cfb210..6bce40015 100644 --- a/src/effects/Wave.cpp +++ b/src/effects/Wave.cpp @@ -68,12 +68,10 @@ std::shared_ptr Wave::GetFrame(std::shared_ptr frame, int64_t fram // Get the frame's image std::shared_ptr frame_image = frame->GetImage(); - // Get pixels for frame image + // Get original pixels for frame image, and also make a copy for editing + const unsigned char *original_pixels = (unsigned char *) frame_image->constBits(); unsigned char *pixels = (unsigned char *) frame_image->bits(); - - // Make temp copy of pixels before we start changing them - unsigned char *temp_image = new unsigned char[frame_image->width() * frame_image->height() * 4](); - memcpy(temp_image, pixels, sizeof(char) * frame_image->width() * frame_image->height() * 4); + int pixel_count = frame_image->width() * frame_image->height(); // Get current keyframe values double time = frame_number;//abs(((frame_number + 255) % 510) - 255); @@ -84,30 +82,28 @@ std::shared_ptr Wave::GetFrame(std::shared_ptr frame, int64_t fram double speed_y_value = speed_y.GetValue(frame_number); // Loop through pixels - for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4) + #pragma omp parallel for + for (int pixel = 0; pixel < pixel_count; ++pixel) { - // Calculate X and Y pixel coordinates + // Calculate pixel Y value int Y = pixel / frame_image->width(); // Calculate wave pixel offsets - float noiseVal = (100 + Y * 0.001) * multiplier_value; // Time and time multiplier (to make the wave move) - float noiseAmp = noiseVal * amplitude_value; // Apply amplitude / height of the wave - float waveformVal = sin((Y * wavelength_value) + (time * speed_y_value)); // Waveform algorithm on y-axis - float waveVal = (waveformVal + shift_x_value) * noiseAmp; // Shifts pixels on the x-axis + float noiseVal = (100 + Y * 0.001) * multiplier_value; // Time and time multiplier (to make the wave move) + float noiseAmp = noiseVal * amplitude_value; // Apply amplitude / height of the wave + float waveformVal = sin((Y * wavelength_value) + (time * speed_y_value)); // Waveform algorithm on y-axis + float waveVal = (waveformVal + shift_x_value) * noiseAmp; // Shifts pixels on the x-axis - long unsigned int source_X = round(pixel + waveVal) * 4; - if (source_X < 0) - source_X = 0; - if (source_X > frame_image->width() * frame_image->height() * 4 * sizeof(char)) - source_X = (frame_image->width() * frame_image->height() * 4 * sizeof(char)) - (sizeof(char) * 4); + long unsigned int source_px = round(pixel + waveVal); + if (source_px < 0) + source_px = 0; + if (source_px >= pixel_count) + source_px = pixel_count - 1; // Calculate source array location, and target array location, and copy the 4 color values - memcpy(&pixels[byte_index], &temp_image[source_X], sizeof(char) * 4); + memcpy(&pixels[pixel * 4], &original_pixels[source_px * 4], sizeof(char) * 4); } - // Delete arrays - delete[] temp_image; - // return the modified frame return frame; } From 423f0cebc6f94c5f8d169f42a99eaf81c0663b31 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 3 Feb 2020 08:56:58 -0500 Subject: [PATCH 24/47] Rewrite Pixelate effect to use QPainter/QRect --- src/effects/Pixelate.cpp | 42 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/src/effects/Pixelate.cpp b/src/effects/Pixelate.cpp index a57a186f1..4de3823d2 100644 --- a/src/effects/Pixelate.cpp +++ b/src/effects/Pixelate.cpp @@ -75,34 +75,20 @@ std::shared_ptr Pixelate::GetFrame(std::shared_ptr frame, int64_t double bottom_value = bottom.GetValue(frame_number); if (pixelization_value > 0.0) { - // Resize frame image smaller (based on pixelization value) - std::shared_ptr smaller_frame_image = std::shared_ptr(new QImage(frame_image->scaledToWidth(std::max(frame_image->width() * pixelization_value, 2.0), Qt::SmoothTransformation))); - - // Resize image back to original size (with no smoothing to create pixelated image) - std::shared_ptr pixelated_image = std::shared_ptr(new QImage(smaller_frame_image->scaledToWidth(frame_image->width(), Qt::FastTransformation).convertToFormat(QImage::Format_RGBA8888))); - - // Get pixel array pointer - unsigned char *pixels = (unsigned char *) frame_image->bits(); - unsigned char *pixelated_pixels = (unsigned char *) pixelated_image->bits(); - - // Get pixels sizes of all margins - int top_bar_height = top_value * frame_image->height(); - int bottom_bar_height = bottom_value * frame_image->height(); - int left_bar_width = left_value * frame_image->width(); - int right_bar_width = right_value * frame_image->width(); - - // Loop through rows - for (int row = 0; row < frame_image->height(); row++) { - - // Copy pixelated pixels into original frame image (where needed) - if ((row >= top_bar_height) && (row <= frame_image->height() - bottom_bar_height)) { - memcpy(&pixels[(row * frame_image->width() + left_bar_width) * 4], &pixelated_pixels[(row * frame_image->width() + left_bar_width) * 4], sizeof(char) * (frame_image->width() - left_bar_width - right_bar_width) * 4); - } - } - - // Cleanup temp images - smaller_frame_image.reset(); - pixelated_image.reset(); + int w = frame_image->width(); + int h = frame_image->height(); + + // Define area we're working on in terms of a QRect with QMargins applied + QRect area(QPoint(0,0), frame_image->size()); + area = area.marginsRemoved({int(left_value * w), int(top_value * h), int(right_value * w), int(bottom_value * h)}); + + // Copy and scale pixels in area to be pixelated + auto frame_scaled = frame_image->copy(area).scaledToWidth(area.width() * pixelization_value, Qt::SmoothTransformation); + + // Draw pixelated image back over original + QPainter painter(frame_image.get()); + painter.drawImage(area, frame_scaled); + painter.end(); } // return the modified frame From fd663c4cddf9b5a12c31f9ed0f0a7541067969f6 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 5 Feb 2020 21:27:37 -0500 Subject: [PATCH 25/47] Blur: Improve parallelization --- src/effects/Blur.cpp | 175 ++++++++++++++----------------------------- 1 file changed, 57 insertions(+), 118 deletions(-) diff --git a/src/effects/Blur.cpp b/src/effects/Blur.cpp index 97c9b84d4..7efa851c0 100644 --- a/src/effects/Blur.cpp +++ b/src/effects/Blur.cpp @@ -77,43 +77,9 @@ std::shared_ptr Blur::GetFrame(std::shared_ptr frame, int64_t fram int w = frame_image->width(); int h = frame_image->height(); - // Declare 2-column arrays for each color channel - typedef struct { - unsigned char *red; - unsigned char *green; - unsigned char *blue; - unsigned char *alpha; - } channels; - - channels arrays_in { - new unsigned char[w * h](), - new unsigned char[w * h](), - new unsigned char[w * h](), - new unsigned char[w * h]() - }; - channels arrays_out { - new unsigned char[w * h](), - new unsigned char[w * h](), - new unsigned char[w * h](), - new unsigned char[w * h]() - }; - - // Loop through pixels and split RGBA channels into separate arrays - unsigned char *pixels = (unsigned char *) frame_image->bits(); - - #pragma omp parallel for - for (int pixel = 0; pixel < w * h; ++pixel) - { - // Get the RGBA values from each pixel - arrays_in.red[pixel] = arrays_out.red[pixel] = pixels[pixel * 4]; - arrays_in.green[pixel] = arrays_out.green[pixel] = pixels[pixel * 4 + 1]; - arrays_in.blue[pixel] = arrays_out.blue[pixel] = pixels[pixel * 4 + 2]; - arrays_in.alpha[pixel] = arrays_out.alpha[pixel] = pixels[pixel * 4 + 3]; - } - - // Initialize target struct pointers for boxBlur operations - channels *array_a = &arrays_in; - channels *array_b = &arrays_out; + // Grab two copies of the image pixel data + QImage image_copy = frame_image->copy(); + std::shared_ptr frame_image_2 = std::make_shared(image_copy); // Loop through each iteration for (int iteration = 0; iteration < iteration_value; ++iteration) @@ -121,110 +87,83 @@ std::shared_ptr Blur::GetFrame(std::shared_ptr frame, int64_t fram // HORIZONTAL BLUR (if any) if (horizontal_radius_value > 0.0) { // Apply horizontal blur to target RGBA channels - #pragma omp parallel - { - boxBlurH(array_a->red, array_b->red, w, h, horizontal_radius_value); - boxBlurH(array_a->green, array_b->green, w, h, horizontal_radius_value); - boxBlurH(array_a->blue, array_b->blue, w, h, horizontal_radius_value); - boxBlurH(array_a->alpha, array_b->alpha, w, h, horizontal_radius_value); - } - - // Swap input and output arrays - channels *temp = array_a; - array_a = array_b; - array_b = temp; + boxBlurH(frame_image->bits(), frame_image_2->bits(), w, h, horizontal_radius_value); + + // Swap output image back to input + frame_image.swap(frame_image_2); } // VERTICAL BLUR (if any) if (vertical_radius_value > 0.0) { // Apply vertical blur to target RGBA channels - #pragma omp parallel - { - boxBlurT(array_a->red, array_b->red, w, h, vertical_radius_value); - boxBlurT(array_a->green, array_b->green, w, h, vertical_radius_value); - boxBlurT(array_a->blue, array_b->blue, w, h, vertical_radius_value); - boxBlurT(array_a->alpha, array_b->alpha, w, h, vertical_radius_value); - } + boxBlurT(frame_image->bits(), frame_image_2->bits(), w, h, vertical_radius_value); - // Swap input and output arrays - channels *temp = array_a; - array_a = array_b; - array_b = temp; + // Swap output image back to input + frame_image.swap(frame_image_2); } } - // Copy RGBA channels back to original image - #pragma omp parallel for - for (int pixel = 0; pixel < w * h; ++pixel) - { - // Combine channels - pixels[pixel * 4] = array_b->red[pixel]; - pixels[pixel * 4 + 1] = array_b->green[pixel]; - pixels[pixel * 4 + 2] = array_b->blue[pixel]; - pixels[pixel * 4 + 3] = array_b->alpha[pixel]; - } - - // Delete channel arrays - delete[] arrays_in.red; - delete[] arrays_in.green; - delete[] arrays_in.blue; - delete[] arrays_in.alpha; - - delete[] arrays_out.red; - delete[] arrays_out.green; - delete[] arrays_out.blue; - delete[] arrays_out.alpha; - // return the modified frame return frame; } // Credit: http://blog.ivank.net/fastest-gaussian-blur.html (MIT License) +// Modified to process all four channels in a pixel array void Blur::boxBlurH(unsigned char *scl, unsigned char *tcl, int w, int h, int r) { float iarr = 1.0 / (r + r + 1); - for (int i = 0; i < h; i++) { - int ti = i * w, li = ti, ri = ti + r; - int fv = scl[ti], lv = scl[ti + w - 1], val = (r + 1) * fv; - for (int j = 0; j < r; j++) val += scl[ti + j]; - for (int j = 0; j <= r; j++) { - val += scl[ri++] - fv; - tcl[ti++] = round(val * iarr); - } - for (int j = r + 1; j < w - r; j++) { - val += scl[ri++] - scl[li++]; - tcl[ti++] = round(val * iarr); - } - for (int j = w - r; j < w; j++) { - val += lv - scl[li++]; - tcl[ti++] = round(val * iarr); + + #pragma omp parallel for shared (scl, tcl) + for (int i = 0; i < h; ++i) { + for (int ch = 0; ch < 4; ++ch) { + int ti = i * w, li = ti, ri = ti + r; + int fv = scl[ti * 4 + ch], lv = scl[(ti + w - 1) * 4 + ch], val = (r + 1) * fv; + for (int j = 0; j < r; ++j) { + val += scl[(ti + j) * 4 + ch]; + } + for (int j = 0; j <= r; ++j) { + val += scl[ri++ * 4 + ch] - fv; + tcl[ti++ * 4 + ch] = round(val * iarr); + } + for (int j = r + 1; j < w - r; ++j) { + val += scl[ri++ * 4 + ch] - scl[li++ * 4 + ch]; + tcl[ti++ * 4 + ch] = round(val * iarr); + } + for (int j = w - r; j < w; ++j) { + val += lv - scl[li++ * 4 + ch]; + tcl[ti++ * 4 + ch] = round(val * iarr); + } } } } void Blur::boxBlurT(unsigned char *scl, unsigned char *tcl, int w, int h, int r) { float iarr = 1.0 / (r + r + 1); + + #pragma omp parallel for shared (scl, tcl) for (int i = 0; i < w; i++) { - int ti = i, li = ti, ri = ti + r * w; - int fv = scl[ti], lv = scl[ti + w * (h - 1)], val = (r + 1) * fv; - for (int j = 0; j < r; j++) val += scl[ti + j * w]; - for (int j = 0; j <= r; j++) { - val += scl[ri] - fv; - tcl[ti] = round(val * iarr); - ri += w; - ti += w; - } - for (int j = r + 1; j < h - r; j++) { - val += scl[ri] - scl[li]; - tcl[ti] = round(val * iarr); - li += w; - ri += w; - ti += w; - } - for (int j = h - r; j < h; j++) { - val += lv - scl[li]; - tcl[ti] = round(val * iarr); - li += w; - ti += w; + for (int ch = 0; ch < 4; ++ch) { + int ti = i, li = ti, ri = ti + r * w; + int fv = scl[ti * 4 + ch], lv = scl[(ti + w * (h - 1)) * 4 + ch], val = (r + 1) * fv; + for (int j = 0; j < r; j++) val += scl[(ti + j * w) * 4 + ch]; + for (int j = 0; j <= r; j++) { + val += scl[ri * 4 + ch] - fv; + tcl[ti * 4 + ch] = round(val * iarr); + ri += w; + ti += w; + } + for (int j = r + 1; j < h - r; j++) { + val += scl[ri * 4 + ch] - scl[li * 4 + ch]; + tcl[ti * 4 + ch] = round(val * iarr); + li += w; + ri += w; + ti += w; + } + for (int j = h - r; j < h; j++) { + val += lv - scl[li * 4 + ch]; + tcl[ti * 4 + ch] = round(val * iarr); + li += w; + ti += w; + } } } } From 89d1667dae6621ba7a9a5d341789f2b522063d80 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 5 Feb 2020 21:56:25 -0500 Subject: [PATCH 26/47] Hue: Optimize and parallelize --- src/effects/Hue.cpp | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/effects/Hue.cpp b/src/effects/Hue.cpp index 4083d0356..d8b3a2a97 100644 --- a/src/effects/Hue.cpp +++ b/src/effects/Hue.cpp @@ -66,36 +66,35 @@ std::shared_ptr Hue::GetFrame(std::shared_ptr frame, int64_t frame // Get the frame's image std::shared_ptr frame_image = frame->GetImage(); + int pixel_count = frame_image->width() * frame_image->height(); + // Get the current hue percentage shift amount, and convert to degrees double degrees = 360.0 * hue.GetValue(frame_number); float cosA = cos(degrees*3.14159265f/180); float sinA = sin(degrees*3.14159265f/180); // Calculate a rotation matrix for the RGB colorspace (based on the current hue shift keyframe value) - float matrix[3][3] = {{cosA + (1.0f - cosA) / 3.0f, 1.0f/3.0f * (1.0f - cosA) - sqrtf(1.0f/3.0f) * sinA, 1.0f/3.0f * (1.0f - cosA) + sqrtf(1.0f/3.0f) * sinA}, - {1.0f/3.0f * (1.0f - cosA) + sqrtf(1.0f/3.0f) * sinA, cosA + 1.0f/3.0f*(1.0f - cosA), 1.0f/3.0f * (1.0f - cosA) - sqrtf(1.0f/3.0f) * sinA}, - {1.0f/3.0f * (1.0f - cosA) - sqrtf(1.0f/3.0f) * sinA, 1.0f/3.0f * (1.0f - cosA) + sqrtf(1.0f/3.0f) * sinA, cosA + 1.0f/3.0f * (1.0f - cosA)}}; + float matrix[3] = { + cosA + (1.0f - cosA) / 3.0f, + 1.0f/3.0f * (1.0f - cosA) - sqrtf(1.0f/3.0f) * sinA, + 1.0f/3.0f * (1.0f - cosA) + sqrtf(1.0f/3.0f) * sinA + }; // Loop through pixels unsigned char *pixels = (unsigned char *) frame_image->bits(); - for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4) + + #pragma omp parallel for shared (pixels) + for (int pixel = 0; pixel < pixel_count; ++pixel) { - // Get the RGB values from the pixel - int R = pixels[byte_index]; - int G = pixels[byte_index + 1]; - int B = pixels[byte_index + 2]; - int A = pixels[byte_index + 3]; + // Get the RGB values from the pixel (ignore the alpha channel) + int R = pixels[pixel * 4]; + int G = pixels[pixel * 4 + 1]; + int B = pixels[pixel * 4 + 2]; // Multiply each color by the hue rotation matrix - float rx = constrain(R * matrix[0][0] + G * matrix[0][1] + B * matrix[0][2]); - float gx = constrain(R * matrix[1][0] + G * matrix[1][1] + B * matrix[1][2]); - float bx = constrain(R * matrix[2][0] + G * matrix[2][1] + B * matrix[2][2]); - - // Set all pixels to new value - pixels[byte_index] = rx; - pixels[byte_index + 1] = gx; - pixels[byte_index + 2] = bx; - pixels[byte_index + 3] = A; // leave the alpha value alone + pixels[pixel * 4] = constrain(R * matrix[0] + G * matrix[1] + B * matrix[2]); + pixels[pixel * 4 + 1] = constrain(R * matrix[2] + G * matrix[0] + B * matrix[1]); + pixels[pixel * 4 + 2] = constrain(R * matrix[1] + G * matrix[2] + B * matrix[0]); } // return the modified frame From 49790282b96192af3a736a3fa3efad7fb1f6a45b Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 5 Feb 2020 22:06:57 -0500 Subject: [PATCH 27/47] Saturation: streamline and parallelize --- src/effects/Saturation.cpp | 44 ++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/src/effects/Saturation.cpp b/src/effects/Saturation.cpp index 06bcb02c2..dd90b9744 100644 --- a/src/effects/Saturation.cpp +++ b/src/effects/Saturation.cpp @@ -69,44 +69,36 @@ std::shared_ptr Saturation::GetFrame(std::shared_ptr frame, int64_ if (!frame_image) return frame; + int pixel_count = frame_image->width() * frame_image->height(); + // Get keyframe values for this frame float saturation_value = saturation.GetValue(frame_number); // Constants used for color saturation formula - double pR = .299; - double pG = .587; - double pB = .114; + const double pR = .299; + const double pG = .587; + const double pB = .114; // Loop through pixels unsigned char *pixels = (unsigned char *) frame_image->bits(); - for (int pixel = 0, byte_index=0; pixel < frame_image->width() * frame_image->height(); pixel++, byte_index+=4) + + #pragma omp parallel for shared (pixels) + for (int pixel = 0; pixel < pixel_count; ++pixel) { // Get the RGB values from the pixel - int R = pixels[byte_index]; - int G = pixels[byte_index + 1]; - int B = pixels[byte_index + 2]; - int A = pixels[byte_index + 3]; + int R = pixels[pixel * 4]; + int G = pixels[pixel * 4 + 1]; + int B = pixels[pixel * 4 + 2]; // Calculate the saturation multiplier double p = sqrt( (R * R * pR) + - (G * G * pG) + - (B * B * pB) ); - - // Adjust the saturation - R = p + (R - p) * saturation_value; - G = p + (G - p) * saturation_value; - B = p + (B - p) * saturation_value; - - // Constrain the value from 0 to 255 - R = constrain(R); - G = constrain(G); - B = constrain(B); - - // Set all pixels to new value - pixels[byte_index] = R; - pixels[byte_index + 1] = G; - pixels[byte_index + 2] = B; - pixels[byte_index + 3] = A; // leave the alpha value alone + (G * G * pG) + + (B * B * pB) ); + + // Apply adjusted and constrained saturation + pixels[pixel * 4] = constrain(p + (R - p) * saturation_value); + pixels[pixel * 4 + 1] = constrain(p + (G - p) * saturation_value); + pixels[pixel * 4 + 2] = constrain(p + (B - p) * saturation_value); } // return the modified frame From e74d71f5451c6f2be9c546d61fac412f2d55f851 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 10 Feb 2020 01:50:31 -0500 Subject: [PATCH 28/47] FFmpegReader/Writer: limit hwaccel to FFmpeg 3.4+ Add a new #define HAVE_HW_ACCEL, which is only set on FFmpeg 3.4+, and use that to restrict the use of hw-accel features, leaving IS_FFMPEG_3_2 to determine only whether code is compatible with FFmpeg 3.2+. --- include/FFmpegReader.h | 7 ++-- include/FFmpegUtilities.h | 4 +++ src/FFmpegReader.cpp | 41 +++++++++++++---------- src/FFmpegWriter.cpp | 70 +++++++++++++++++++++------------------ 4 files changed, 68 insertions(+), 54 deletions(-) diff --git a/include/FFmpegReader.h b/include/FFmpegReader.h index 9faa86a35..cc782cd55 100644 --- a/include/FFmpegReader.h +++ b/include/FFmpegReader.h @@ -98,7 +98,7 @@ namespace openshot { AVFormatContext *pFormatCtx; int i, videoStream, audioStream; AVCodecContext *pCodecCtx, *aCodecCtx; -#if (LIBAVFORMAT_VERSION_MAJOR >= 57) +#if HAVE_HW_ACCEL AVBufferRef *hw_device_ctx = NULL; //PM #endif AVStream *pStream, *aStream; @@ -147,12 +147,11 @@ namespace openshot { int64_t current_video_frame; // can't reliably use PTS of video to determine this int hw_de_supported = 0; // Is set by FFmpegReader -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL AVPixelFormat hw_de_av_pix_fmt = AV_PIX_FMT_NONE; AVHWDeviceType hw_de_av_device_type = AV_HWDEVICE_TYPE_NONE; -#endif - int IsHardwareDecodeSupported(int codecid); +#endif /// Check for the correct frames per second value by scanning the 1st few seconds of video packets. void CheckFPS(); diff --git a/include/FFmpegUtilities.h b/include/FFmpegUtilities.h index c673305eb..62d64df17 100644 --- a/include/FFmpegUtilities.h +++ b/include/FFmpegUtilities.h @@ -40,6 +40,10 @@ #ifndef IS_FFMPEG_3_2 #define IS_FFMPEG_3_2 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 64, 101)) #endif + + #ifndef HAVE_HW_ACCEL + #define HAVE_HW_ACCEL (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 107, 100)) + #endif // Include the FFmpeg headers extern "C" { diff --git a/src/FFmpegReader.cpp b/src/FFmpegReader.cpp index 9234ecfe1..b548fa8fd 100644 --- a/src/FFmpegReader.cpp +++ b/src/FFmpegReader.cpp @@ -35,13 +35,13 @@ #define ENABLE_VAAPI 0 -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL #pragma message "You are compiling with experimental hardware decode" #else #pragma message "You are compiling only with software decode" #endif -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL #define MAX_SUPPORTED_WIDTH 1950 #define MAX_SUPPORTED_HEIGHT 1100 @@ -71,14 +71,14 @@ typedef struct VAAPIDecodeContext { enum AVPixelFormat surface_format; int surface_count; } VAAPIDecodeContext; -#endif -#endif +#endif // ENABLE_VAAPI +#endif // HAVE_HW_ACCEL using namespace openshot; int hw_de_on = 0; -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL AVPixelFormat hw_de_av_pix_fmt_global = AV_PIX_FMT_NONE; AVHWDeviceType hw_de_av_device_type_global = AV_HWDEVICE_TYPE_NONE; #endif @@ -153,7 +153,7 @@ bool AudioLocation::is_near(AudioLocation location, int samples_per_frame, int64 return false; } -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL // Get hardware pix format static enum AVPixelFormat get_hw_dec_format(AVCodecContext *ctx, const enum AVPixelFormat *pix_fmts) @@ -234,7 +234,7 @@ int FFmpegReader::IsHardwareDecodeSupported(int codecid) } return ret; } -#endif +#endif // HAVE_HW_ACCEL void FFmpegReader::Open() { // Open reader if not already open @@ -287,7 +287,7 @@ void FFmpegReader::Open() { // If hw accel is selected but hardware cannot handle repeat with software decoding do { pCodecCtx = AV_GET_CODEC_CONTEXT(pStream, pCodec); -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL if (hw_de_on && (retry_decode_open==2)) { // Up to here no decision is made if hardware or software decode hw_de_supported = IsHardwareDecodeSupported(pCodecCtx->codec_id); @@ -304,7 +304,7 @@ void FFmpegReader::Open() { // Init options av_dict_set(&opts, "strict", "experimental", 0); -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL if (hw_de_on && hw_de_supported) { // Open Hardware Acceleration int i_decoder_hw = 0; @@ -433,13 +433,13 @@ void FFmpegReader::Open() { throw InvalidCodec("Hardware device create failed.", path); } } -#endif +#endif // HAVE_HW_ACCEL // Open video codec if (avcodec_open2(pCodecCtx, pCodec, &opts) < 0) throw InvalidCodec("A video codec was found, but could not be opened.", path); -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL if (hw_de_on && hw_de_supported) { AVHWFramesConstraints *constraints = NULL; void *hwconfig = NULL; @@ -449,7 +449,7 @@ void FFmpegReader::Open() { #if ENABLE_VAAPI ((AVVAAPIHWConfig *)hwconfig)->config_id = ((VAAPIDecodeContext *)(pCodecCtx->priv_data))->va_config; constraints = av_hwdevice_get_hwframe_constraints(hw_device_ctx,hwconfig); -#endif +#endif // ENABLE_VAAPI if (constraints) { if (pCodecCtx->coded_width < constraints->min_width || pCodecCtx->coded_height < constraints->min_height || @@ -506,7 +506,7 @@ void FFmpegReader::Open() { } #else retry_decode_open = 0; -#endif +#endif // HAVE_HW_ACCEL } while (retry_decode_open); // retry_decode_open // Free options av_dict_free(&opts); @@ -592,14 +592,14 @@ void FFmpegReader::Close() { if (info.has_video) { avcodec_flush_buffers(pCodecCtx); AV_FREE_CONTEXT(pCodecCtx); -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL if (hw_de_on) { if (hw_device_ctx) { av_buffer_unref(&hw_device_ctx); hw_device_ctx = NULL; } } -#endif +#endif // HAVE_HW_ACCEL } if (info.has_audio) { avcodec_flush_buffers(aCodecCtx); @@ -1100,19 +1100,22 @@ bool FFmpegReader::GetAVFrame() { ret = avcodec_send_packet(pCodecCtx, packet); + #if HAVE_HW_ACCEL // Get the format from the variables set in get_hw_dec_format hw_de_av_pix_fmt = hw_de_av_pix_fmt_global; hw_de_av_device_type = hw_de_av_device_type_global; - + #endif // HAVE_HW_ACCEL if (ret < 0 || ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) { ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::GetAVFrame (Packet not sent)"); } else { AVFrame *next_frame2; + #if HAVE_HW_ACCEL if (hw_de_on && hw_de_supported) { next_frame2 = AV_ALLOCATE_FRAME(); } else + #endif // HAVE_HW_ACCEL { next_frame2 = next_frame; } @@ -1125,6 +1128,7 @@ bool FFmpegReader::GetAVFrame() { if (ret != 0) { ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::GetAVFrame (invalid return frame received)"); } + #if HAVE_HW_ACCEL if (hw_de_on && hw_de_supported) { int err; if (next_frame2->format == hw_de_av_pix_fmt) { @@ -1138,6 +1142,7 @@ bool FFmpegReader::GetAVFrame() { } } else + #endif // HAVE_HW_ACCEL { // No hardware acceleration used -> no copy from GPU memory needed next_frame = next_frame2; } @@ -1151,9 +1156,11 @@ bool FFmpegReader::GetAVFrame() { (AVPixelFormat)(pStream->codecpar->format), info.width, info.height); } } + #if HAVE_HW_ACCEL if (hw_de_on && hw_de_supported) { AV_FREE_FRAME(&next_frame2); } + #endif // HAVE_HW_ACCEL } #else avcodec_decode_video2(pCodecCtx, next_frame, &frameFinished, packet); @@ -1169,7 +1176,7 @@ bool FFmpegReader::GetAVFrame() { av_picture_copy((AVPicture *) pFrame, (AVPicture *) next_frame, pCodecCtx->pix_fmt, info.width, info.height); } -#endif +#endif // IS_FFMPEG_3_2 } // deallocate the frame diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp index 245bd9bd6..8d060d776 100644 --- a/src/FFmpegWriter.cpp +++ b/src/FFmpegWriter.cpp @@ -35,7 +35,7 @@ using namespace openshot; -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL #pragma message "You are compiling with experimental hardware encode" #else #pragma message "You are compiling only with software encode" @@ -44,7 +44,7 @@ using namespace openshot; // Multiplexer parameters temporary storage AVDictionary *mux_dict = NULL; -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL int hw_en_on = 1; // Is set in UI int hw_en_supported = 0; // Is set by FFmpegWriter AVPixelFormat hw_en_av_pix_fmt = AV_PIX_FMT_NONE; @@ -81,7 +81,7 @@ static int set_hwframe_ctx(AVCodecContext *ctx, AVBufferRef *hw_device_ctx, int6 av_buffer_unref(&hw_frames_ref); return err; } -#endif +#endif // HAVE_HW_ACCEL FFmpegWriter::FFmpegWriter(std::string path) : path(path), fmt(NULL), oc(NULL), audio_st(NULL), video_st(NULL), audio_pts(0), video_pts(0), samples(NULL), @@ -171,7 +171,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std::string codec, Fraction f if (codec.length() > 0) { AVCodec *new_codec; // Check if the codec selected is a hardware accelerated codec -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL #if defined(__linux__) if (strstr(codec.c_str(), "_vaapi") != NULL) { new_codec = avcodec_find_encoder_by_name(codec.c_str()); @@ -225,7 +225,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std::string codec, Fraction f #endif //__linux__ #else // not ffmpeg 3 new_codec = avcodec_find_encoder_by_name(codec.c_str()); -#endif //IS_FFMPEG_3_2 +#endif // HAVE_HW_ACCEL if (new_codec == NULL) throw InvalidCodec("A valid video codec could not be found for this file.", path); else { @@ -392,11 +392,11 @@ void FFmpegWriter::SetOption(StreamType stream, std::string name, std::string va // This might be better in an extra methods as more options // and way to set quality are possible #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 39, 101) - #if IS_FFMPEG_3_2 + #if HAVE_HW_ACCEL if (hw_en_on) { av_opt_set_int(c->priv_data, "qp", std::min(std::stoi(value),63), 0); // 0-63 } else - #endif + #endif // HAVE_HW_ACCEL { switch (c->codec_id) { #if (LIBAVCODEC_VERSION_MAJOR >= 58) @@ -442,7 +442,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::string name, std::string va // This might be better in an extra methods as more options // and way to set quality are possible #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 39, 101) -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL if (hw_en_on) { double mbs = 15000000.0; if (info.video_bit_rate > 0) { @@ -455,7 +455,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::string name, std::string va } c->bit_rate = (int)(mbs); } else -#endif +#endif // HAVE_HW_ACCEL { switch (c->codec_id) { #if (LIBAVCODEC_VERSION_MAJOR >= 58) @@ -955,16 +955,14 @@ void FFmpegWriter::flush_encoders() { // Close the video codec void FFmpegWriter::close_video(AVFormatContext *oc, AVStream *st) { -#if IS_FFMPEG_3_2 - // #if defined(__linux__) - if (hw_en_on && hw_en_supported) { - if (hw_device_ctx) { - av_buffer_unref(&hw_device_ctx); - hw_device_ctx = NULL; - } +#if HAVE_HW_ACCEL + if (hw_en_on && hw_en_supported) { + if (hw_device_ctx) { + av_buffer_unref(&hw_device_ctx); + hw_device_ctx = NULL; } - // #endif -#endif + } +#endif // HAVE_HW_ACCEL } // Close the audio codec @@ -1342,7 +1340,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) { // Set number of threads equal to number of processors (not to exceed 16) video_codec->thread_count = std::min(FF_NUM_PROCESSORS, 16); -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL if (hw_en_on && hw_en_supported) { //char *dev_hw = NULL; char adapter[256]; @@ -1385,7 +1383,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) { throw InvalidCodec("Could not create hwdevice", path); } } -#endif +#endif // HAVE_HW_ACCEL /* find the video encoder */ codec = avcodec_find_encoder_by_name(info.vcodec.c_str()); @@ -1402,7 +1400,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) { AVDictionary *opts = NULL; av_dict_set(&opts, "strict", "experimental", 0); -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL if (hw_en_on && hw_en_supported) { video_codec->pix_fmt = hw_en_av_pix_fmt; @@ -1451,7 +1449,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) { "width", info.width, "height", info.height, av_err2str(err), -1); } } -#endif +#endif // HAVE_HW_ACCEL /* open the codec */ if (avcodec_open2(video_codec, codec, &opts) < 0) @@ -1900,14 +1898,17 @@ void FFmpegWriter::process_video_packet(std::shared_ptr frame) { frame_source = allocate_avframe(PIX_FMT_RGBA, source_image_width, source_image_height, &bytes_source, (uint8_t *) pixels); #if IS_FFMPEG_3_2 AVFrame *frame_final; + #if HAVE_HW_ACCEL if (hw_en_on && hw_en_supported) { frame_final = allocate_avframe(AV_PIX_FMT_NV12, info.width, info.height, &bytes_final, NULL); - } else { + } else + #endif // HAVE_HW_ACCEL + { frame_final = allocate_avframe((AVPixelFormat)(video_st->codecpar->format), info.width, info.height, &bytes_final, NULL); } #else AVFrame *frame_final = allocate_avframe(video_codec->pix_fmt, info.width, info.height, &bytes_final, NULL); -#endif +#endif // IS_FFMPEG_3_2 // Fill with data AV_COPY_PICTURE_DATA(frame_source, (uint8_t *) pixels, PIX_FMT_RGBA, source_image_width, source_image_height); @@ -1977,7 +1978,7 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr frame, AVFrame *fra // Assign the initial AVFrame PTS from the frame counter frame_final->pts = write_video_count; -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL if (hw_en_on && hw_en_supported) { if (!(hw_frame = av_frame_alloc())) { fprintf(stderr, "Error code: av_hwframe_alloc\n"); @@ -1994,7 +1995,7 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr frame, AVFrame *fra } av_frame_copy_props(hw_frame, frame_final); } -#endif +#endif // HAVE_HW_ACCEL /* encode the image */ int got_packet_ptr = 0; int error_code = 0; @@ -2003,9 +2004,12 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr frame, AVFrame *fra int frameFinished = 0; int ret; + #if HAVE_HW_ACCEL if (hw_en_on && hw_en_supported) { ret = avcodec_send_frame(video_codec, hw_frame); //hw_frame!!! - } else { + } else + #endif // HAVE_HW_ACCEL + { ret = avcodec_send_frame(video_codec, frame_final); } error_code = ret; @@ -2062,8 +2066,8 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr frame, AVFrame *fra // got data back (so encode this frame) got_packet_ptr = 1; } -#endif -#endif +#endif // LIBAVFORMAT_VERSION_MAJOR >= 54 +#endif // IS_FFMPEG_3_2 /* if zero size, it means the image was buffered */ if (error_code == 0 && got_packet_ptr) { @@ -2095,14 +2099,14 @@ bool FFmpegWriter::write_video_packet(std::shared_ptr frame, AVFrame *fra // Deallocate packet AV_FREE_PACKET(&pkt); -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL if (hw_en_on && hw_en_supported) { if (hw_frame) { av_frame_free(&hw_frame); hw_frame = NULL; } } -#endif +#endif // HAVE_HW_ACCEL } // Success @@ -2125,11 +2129,11 @@ void FFmpegWriter::InitScalers(int source_width, int source_height) { // Init software rescalers vector (many of them, one for each thread) for (int x = 0; x < num_of_rescalers; x++) { // Init the software scaler from FFMpeg -#if IS_FFMPEG_3_2 +#if HAVE_HW_ACCEL if (hw_en_on && hw_en_supported) { img_convert_ctx = sws_getContext(source_width, source_height, PIX_FMT_RGBA, info.width, info.height, AV_PIX_FMT_NV12, scale_mode, NULL, NULL, NULL); } else -#endif +#endif // HAVE_HW_ACCEL { img_convert_ctx = sws_getContext(source_width, source_height, PIX_FMT_RGBA, info.width, info.height, AV_GET_CODEC_PIXEL_FORMAT(video_st, video_st->codec), scale_mode, NULL, NULL, NULL); From 023f5df5122441877933fe414dc8078fb64220da Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 10 Feb 2020 01:59:25 -0500 Subject: [PATCH 29/47] doc/HW-ACCEL: List 3.4 as minimum FFmpeg version --- doc/HW-ACCEL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/HW-ACCEL.md b/doc/HW-ACCEL.md index cbcf5e63f..497ae2b9b 100644 --- a/doc/HW-ACCEL.md +++ b/doc/HW-ACCEL.md @@ -26,7 +26,7 @@ The following table summarizes our current level of support: ## Supported FFmpeg Versions -* HW accel is supported from FFmpeg version 3.2 (3.3 for nVidia drivers) +* HW accel is supported from FFmpeg version 3.4 * HW accel was removed for nVidia drivers in Ubuntu for FFmpeg 4+ **Notice:** The FFmpeg versions of Ubuntu and PPAs for Ubuntu show the From 4106b99164dc215624d67695103b0d23adb6e87a Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 10 Feb 2020 00:32:21 -0500 Subject: [PATCH 30/47] Travis: Add FFmpeg 3.2 build --- .travis.yml | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f449c3f0d..a89aa74f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ matrix: - name: "Coverage (Ubuntu 18.04 Bionic)" env: - - BUILD_VERSION=coverage_ffmpeg3 + - BUILD_VERSION=coverage_ffmpeg34 - CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1" - TEST_TARGET=coverage os: linux @@ -80,9 +80,9 @@ matrix: - libavresample4 - libswresample3 - - name: "FFmpeg 3 GCC (Ubuntu 18.04 Bionic)" + - name: "FFmpeg 3.4 GCC (Ubuntu 18.04 Bionic)" env: - - BUILD_VERSION=ffmpeg3 + - BUILD_VERSION=ffmpeg34 - CMAKE_EXTRA_ARGS="" - TEST_TARGET=test os: linux @@ -97,9 +97,9 @@ matrix: - qt5-default - libjsoncpp-dev - - name: "FFmpeg 3 Clang (Ubuntu 18.04 Bionic)" + - name: "FFmpeg 3.4 Clang (Ubuntu 18.04 Bionic)" env: - - BUILD_VERSION=clang_ffmpeg3 + - BUILD_VERSION=clang_ffmpeg34 - CMAKE_EXTRA_ARGS="" - TEST_TARGET=test os: linux @@ -115,6 +115,31 @@ matrix: - qt5-default - libomp-dev + - name: "FFmpeg 3.2 GCC (Ubuntu 16.04 Xenial)" + env: + - BUILD_VERSION=ffmpeg32 + - CMAKE_EXTRA_ARGS="" + - TEST_TARGET="os_test" + os: linux + dist: xenial + addons: + apt: + sources: + - sourceline: 'ppa:openshot.developers/libopenshot-daily' + - sourceline: 'ppa:beineri/opt-qt-5.10.0-xenial' + - sourceline: 'ppa:jon-hedgerows/ffmpeg-backports' + packages: + - *ff_common + - libavcodec57 + - libavdevice57 + - libavfilter6 + - libavformat57 + - libavresample3 + - libavutil55 + - libpostproc54 + - libswresample2 + - libswscale4 + - name: "FFmpeg 2 GCC (Ubuntu 16.04 Xenial)" env: - BUILD_VERSION=ffmpeg2 From e39a1fc809d21d64ef8b96fcba6b56f554ccb550 Mon Sep 17 00:00:00 2001 From: Christoph Willing Date: Mon, 10 Feb 2020 18:28:56 +1000 Subject: [PATCH 31/47] Resolve ambiguous abs() call Signed-off-by: Christoph Willing --- src/KeyFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/KeyFrame.cpp b/src/KeyFrame.cpp index c54bc7d44..457ed9b71 100644 --- a/src/KeyFrame.cpp +++ b/src/KeyFrame.cpp @@ -71,7 +71,7 @@ namespace { } double const x = p0.X * B[0] + p1.X * B[1] + p2.X * B[2] + p3.X * B[3]; double const y = p0.Y * B[0] + p1.Y * B[1] + p2.Y * B[2] + p3.Y * B[3]; - if (abs(target - x) < allowed_error) { + if (fabs(target - x) < allowed_error) { return y; } if (x > target) { From ba1155e44f94a17c43d1925f45e30dd3c8fb4791 Mon Sep 17 00:00:00 2001 From: albert-github Date: Mon, 10 Feb 2020 15:35:58 +0100 Subject: [PATCH 32/47] Documentation error Correcting small documentation error. --- include/TextReader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/TextReader.h b/include/TextReader.h index 2d54fdc25..57f36d0bd 100644 --- a/include/TextReader.h +++ b/include/TextReader.h @@ -119,7 +119,7 @@ namespace openshot TextReader(int width, int height, int x_offset, int y_offset, GravityType gravity, std::string text, std::string font, double size, std::string text_color, std::string background_color); /// Draw a box under rendered text using the specified color. - /// @param text_background_color The background color behind the text + /// @param color The background color behind the text void SetTextBackgroundColor(std::string color); /// Close Reader From 61366ca7877d1046c1efafa8c84170abe4da8146 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 19 Jun 2019 22:21:50 -0400 Subject: [PATCH 33/47] Add -no-integrated-cpp for G++ < 9 --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index cce01d357..1b138b0c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,13 @@ configure_file(include/OpenShotVersion.h.in include/OpenShotVersion.h @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/OpenShotVersion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libopenshot) +#### Work around a GCC < 9 bug with handling of _Pragma() in macros +#### See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55578 +if ((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND + (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "9.0.0")) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-integrated-cpp") +endif() + #### Enable C++11 (for std::shared_ptr support) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) From 1fb945c62c154d49b33954e072cc0bfa0830b151 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Thu, 13 Feb 2020 00:54:02 -0500 Subject: [PATCH 34/47] ColorShift effect: Don't init with random values --- src/effects/ColorShift.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/effects/ColorShift.cpp b/src/effects/ColorShift.cpp index 4fc9c941c..10c089808 100644 --- a/src/effects/ColorShift.cpp +++ b/src/effects/ColorShift.cpp @@ -33,7 +33,7 @@ using namespace openshot; /// Blank constructor, useful when using Json to load the effect properties -ColorShift::ColorShift() : red_x(-0.05), red_y(0.0), green_x(0.05), green_y(0.0), blue_x(0.0), blue_y(0.0), alpha_x(0.0), alpha_y(0.0) { +ColorShift::ColorShift() : red_x(0.0), red_y(0.0), green_x(0.0), green_y(0.0), blue_x(0.0), blue_y(0.0), alpha_x(0.0), alpha_y(0.0) { // Init effect properties init_effect_details(); } From 7867cf01b8da91af65a3f8b4234107acffa06e07 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Fri, 14 Feb 2020 11:42:31 -0500 Subject: [PATCH 35/47] Reorder arguments in setVideoOptions overload - The new ordering (with the frame rate AFTER width and height) doesn't match the other signature, but it *is* consistent with the Timeline constructor, and it just feels more natural - Added overloaded-function notes to doxygen strings in FFmpegWriter.h - Also added a warning about the argument order mismatch above --- include/FFmpegWriter.h | 17 +++++++++++++++-- src/FFmpegWriter.cpp | 5 +++-- tests/FFmpegWriter_Tests.cpp | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/include/FFmpegWriter.h b/include/FFmpegWriter.h index 654e72cc0..b25778e5f 100644 --- a/include/FFmpegWriter.h +++ b/include/FFmpegWriter.h @@ -285,6 +285,8 @@ namespace openshot { /// @param channels The number of audio channels needed in this file /// @param channel_layout The 'layout' of audio channels (i.e. mono, stereo, surround, etc...) /// @param bit_rate The audio bit rate used during encoding + /// + /// \note This is an overloaded function. void SetAudioOptions(bool has_audio, std::string codec, int sample_rate, int channels, openshot::ChannelLayout channel_layout, int bit_rate); /// @brief Set audio export options. @@ -294,6 +296,8 @@ namespace openshot { /// @param codec The codec used to encode the audio for this file /// @param sample_rate The number of audio samples needed in this file /// @param bit_rate The audio bit rate used during encoding + /// + /// \note This is an overloaded function. void SetAudioOptions(std::string codec, int sample_rate, int bit_rate); /// @brief Set the cache size @@ -310,6 +314,8 @@ namespace openshot { /// @param interlaced Does this video need to be interlaced? /// @param top_field_first Which frame should be used as the top field? /// @param bit_rate The video bit rate used during encoding + /// + /// \note This is an overloaded function. void SetVideoOptions(bool has_video, std::string codec, openshot::Fraction fps, int width, int height, openshot::Fraction pixel_ratio, bool interlaced, bool top_field_first, int bit_rate); /// @brief Set video export options. @@ -317,11 +323,14 @@ namespace openshot { /// Enables the stream and configures non-interlaced video with a 1:1 pixel aspect ratio. /// /// @param codec The codec used to encode the images in this video - /// @param fps The number of frames per second /// @param width The width in pixels of this video /// @param height The height in pixels of this video + /// @param fps The number of frames per second /// @param bit_rate The video bit rate used during encoding - void SetVideoOptions(std::string codec, openshot::Fraction fps, int width, int height, int bit_rate); + /// + /// \note This is an overloaded function. + /// \warning Observe the argument order, which is consistent with the openshot::Timeline constructor, but differs from the other signature. + void SetVideoOptions(std::string codec, int width, int height, openshot::Fraction fps, int bit_rate); /// @brief Set custom options (some codecs accept additional params). This must be called after the /// PrepareStreams() method, otherwise the streams have not been initialized yet. @@ -337,12 +346,16 @@ namespace openshot { /// @brief Add a frame to the stack waiting to be encoded. /// @param frame The openshot::Frame object to write to this image + /// + /// \note This is an overloaded function. void WriteFrame(std::shared_ptr frame); /// @brief Write a block of frames from a reader /// @param reader A openshot::ReaderBase object which will provide frames to be written /// @param start The starting frame number of the reader /// @param length The number of frames to write + /// + /// \note This is an overloaded function. void WriteFrame(openshot::ReaderBase *reader, int64_t start, int64_t length); /// @brief Write the file trailer (after all frames are written). This is called automatically diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp index c01a09ed2..244412f6a 100644 --- a/src/FFmpegWriter.cpp +++ b/src/FFmpegWriter.cpp @@ -278,7 +278,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std::string codec, Fraction f } // Set video export options (overloaded function) -void FFmpegWriter::SetVideoOptions(std::string codec, Fraction fps, int width, int height, int bit_rate) { +void FFmpegWriter::SetVideoOptions(std::string codec, int width, int height, Fraction fps, int bit_rate) { // Call full signature with some default parameters FFmpegWriter::SetVideoOptions(true, codec, fps, width, height, openshot::Fraction(1, 1), false, true, bit_rate); @@ -324,7 +324,8 @@ void FFmpegWriter::SetAudioOptions(bool has_audio, std::string codec, int sample // Set audio export options (overloaded function) void FFmpegWriter::SetAudioOptions(std::string codec, int sample_rate, int bit_rate) { // Call full signature with some default parameters - FFmpegWriter::SetAudioOptions(true, codec, sample_rate, 2, openshot::LAYOUT_STEREO, bit_rate); + FFmpegWriter::SetAudioOptions(true, codec, sample_rate, 2, + openshot::LAYOUT_STEREO, bit_rate); } diff --git a/tests/FFmpegWriter_Tests.cpp b/tests/FFmpegWriter_Tests.cpp index a4646eb00..cb75a118a 100644 --- a/tests/FFmpegWriter_Tests.cpp +++ b/tests/FFmpegWriter_Tests.cpp @@ -97,7 +97,7 @@ TEST(Options_Overloads) // Set options w.SetAudioOptions("aac", 48000, 192000); - w.SetVideoOptions("libx264", Fraction(30,1), 1280, 720, 5000000); + w.SetVideoOptions("libx264", 1280, 720, Fraction(30,1), 5000000); // Open writer w.Open(); From 895c2f0e2466008f845ddc27b32fb83d1c662339 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Fri, 14 Feb 2020 12:07:02 -0500 Subject: [PATCH 36/47] FFmpegReader/Writer: Reformat example code - Reduced crazy-long line lengths by moving trailing comments to previous line - Added more openshot:: prefixing, which causes Doxygen to link to the referenced object's documentation. (It doesn't always pick up cross-class links, without the prefix.) --- include/FFmpegReader.h | 4 ++-- include/FFmpegWriter.h | 26 +++++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/include/FFmpegReader.h b/include/FFmpegReader.h index 9faa86a35..5f1444f9f 100644 --- a/include/FFmpegReader.h +++ b/include/FFmpegReader.h @@ -76,11 +76,11 @@ namespace openshot { * * @code * // Create a reader for a video - * FFmpegReader r("MyAwesomeVideo.webm"); + * openshot::FFmpegReader r("MyAwesomeVideo.webm"); * r.Open(); // Open the reader * * // Get frame number 1 from the video - * std::shared_ptr f = r.GetFrame(1); + * std::shared_ptr f = r.GetFrame(1); * * // Now that we have an openshot::Frame object, lets have some fun! * f->Display(); // Display the frame on the screen diff --git a/include/FFmpegWriter.h b/include/FFmpegWriter.h index b25778e5f..1dfb21a93 100644 --- a/include/FFmpegWriter.h +++ b/include/FFmpegWriter.h @@ -75,15 +75,19 @@ namespace openshot { * @code SIMPLE EXAMPLE * * // Create a reader for a video - * FFmpegReader r("MyAwesomeVideo.webm"); - * r.Open(); // Open thetarget_ reader + * openshot::FFmpegReader r("MyAwesomeVideo.webm"); + * r.Open(); // Open the target reader * * // Create a writer (which will create a WebM video) - * FFmpegWriter w("/home/jonathan/NewVideo.webm"); + * openshot::FFmpegWriter w("/home/jonathan/NewVideo.webm"); * * // Set options - * w.SetAudioOptions(true, "libvorbis", 44100, 2, ChannelLayout::LAYOUT_STEREO, 128000); // Sample Rate: 44100, Channels: 2, Bitrate: 128000 - * w.SetVideoOptions(true, "libvpx", openshot::Fraction(24,1), 720, 480, openshot::Fraction(1,1), false, false, 300000); // FPS: 24, Size: 720x480, Pixel Ratio: 1/1, Bitrate: 300000 + * + * // Sample Rate: 44100, Channels: 2, Bitrate: 128000 + * w.SetAudioOptions(true, "libvorbis", 44100, 2, openshot::ChannelLayout::LAYOUT_STEREO, 128000); + * + * // FPS: 24, Size: 720x480, Pixel Ratio: 1/1, Bitrate: 300000 + * w.SetVideoOptions(true, "libvpx", openshot::Fraction(24,1), 720, 480, openshot::Fraction(1,1), false, false, 300000); * * // Open the writer * w.Open(); @@ -102,15 +106,19 @@ namespace openshot { * @code ADVANCED WRITER EXAMPLE * * // Create a reader for a video - * FFmpegReader r("MyAwesomeVideo.webm"); + * openshot::FFmpegReader r("MyAwesomeVideo.webm"); * r.Open(); // Open the reader * * // Create a writer (which will create a WebM video) - * FFmpegWriter w("/home/jonathan/NewVideo.webm"); + * openshot::FFmpegWriter w("/home/jonathan/NewVideo.webm"); * * // Set options - * w.SetAudioOptions(true, "libvorbis", 44100, 2, ChannelLayout::LAYOUT_STEREO, 128000); // Sample Rate: 44100, Channels: 2, Bitrate: 128000 - * w.SetVideoOptions(true, "libvpx", openshot::Fraction(24,1), 720, 480, openshot::Fraction(1,1), false, false, 300000); // FPS: 24, Size: 720x480, Pixel Ratio: 1/1, Bitrate: 300000 + * + * // Sample Rate: 44100, Channels: 2, Bitrate: 128000 + * w.SetAudioOptions(true, "libvorbis", 44100, 2, openshot::ChannelLayout::LAYOUT_STEREO, 128000); + * + * // FPS: 24, Size: 720x480, Pixel Ratio: 1/1, Bitrate: 300000 + * w.SetVideoOptions(true, "libvpx", openshot::Fraction(24,1), 720, 480, openshot::Fraction(1,1), false, false, 300000); * * // Prepare Streams (Optional method that must be called before any SetOption calls) * w.PrepareStreams(); From 85ca6c574482002371bef4dbfb37fc2b6ff522cb Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sun, 29 Dec 2019 11:05:08 -0500 Subject: [PATCH 37/47] CMake: Add features for docs, unit tests - A new CMake option, ENABLE_TESTS, is created and defaults ON (Legacy -DDISABLE_TESTS=1 on the command line will override) - Target info for docs and tests is shown in the FeatureSummary --- CMakeLists.txt | 46 +++++++++++++++++++++++++++----------------- tests/CMakeLists.txt | 9 ++++----- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b138b0c0..4c4ecba83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,9 +73,14 @@ include(FeatureSummary) # Optional build settings for libopenshot option(USE_SYSTEM_JSONCPP "Use system installed JsonCpp, if found" ON) option(DISABLE_BUNDLED_JSONCPP "Don't fall back to bundled JsonCpp" OFF) -option(DISABLE_TESTS "Don't build unit tests" OFF) option(ENABLE_IWYU "Enable 'Include What You Use' scanner (CMake 3.3+)" OFF) -option(ENABLE_COVERAGE "Enable coverage reporting" OFF) +option(ENABLE_TESTS "Build unit tests (requires UnitTest++)" ON) +option(ENABLE_DOCS "Build API documentation (requires Doxygen)" ON) + +# Legacy commandline override +if (DISABLE_TESTS) + set(ENABLE_TESTS OFF CACHE BOOL "Build unit tests (requires UnitTest++)" FORCE) +endif() ########## Configure Version.h header ############## configure_file(include/OpenShotVersion.h.in include/OpenShotVersion.h @ONLY) @@ -124,27 +129,32 @@ add_subdirectory(src) ################### DOCUMENTATION ################### # Find Doxygen (used for documentation) -include(cmake/Modules/UseDoxygen.cmake) - -# Doxygen was found -if (TARGET doc) - message(STATUS "Doxygen found, documentation target enabled") - message("\nTo compile documentation in doc/html, run: 'make doc'") - - # Install docs, if the user builds them with `make doc` - install(CODE "MESSAGE(\"Checking for documentation files to install...\")") - install(CODE "MESSAGE(\"(Compile with 'make doc' command, requires Doxygen)\")") - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/ - DESTINATION ${CMAKE_INSTALL_DOCDIR}/API - MESSAGE_NEVER # Don't spew about file copies - OPTIONAL ) # No error if the docs aren't found +set(DOCS_ENABLED FALSE) # Only set true if Doxygen is found and configured +if (ENABLE_DOCS) + include(cmake/Modules/UseDoxygen.cmake) + + # Doxygen was found + if (TARGET doc) + message(STATUS "Doxygen found, documentation target enabled") + set(DOCS_ENABLED TRUE) + + # Install docs, if the user builds them with `make doc` + install(CODE "MESSAGE(\"Checking for documentation files to install...\")") + install(CODE "MESSAGE(\"(Compile with 'make doc' command, requires Doxygen)\")") + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/ + DESTINATION ${CMAKE_INSTALL_DOCDIR}/API + MESSAGE_NEVER # Don't spew about file copies + OPTIONAL ) # No error if the docs aren't found + endif() endif() +add_feature_info("Documentation" DOCS_ENABLED "Build API documentation with 'make doc'") ############# PROCESS tests/ DIRECTORY ############## -if(NOT DISABLE_TESTS) +if(ENABLE_TESTS) add_subdirectory(tests) endif() +add_feature_info("Unit tests" ENABLE_TESTS "Compile unit tests for library functions") ############## COVERAGE REPORTING ################# if (ENABLE_COVERAGE) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4b2284f63..b7c042564 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -125,7 +125,6 @@ target_link_libraries(openshot-test openshot ${UNITTEST++_LIBRARY}) ##### RUNNING TESTS (make os_test / make test) ##### # Hook up the 'make os_test' target to the 'openshot-test' executable ADD_CUSTOM_TARGET(os_test COMMAND openshot-test) -list(APPEND OS_TEST_CMDS "'make os_test'") # Also hook up 'make test', if possible # This requires CMake 3.11+, where the CMP0037 policy @@ -137,8 +136,8 @@ endif() if (CMAKE_VERSION VERSION_GREATER 3.11) message(STATUS "Cmake 3.11+ detected, enabling 'test' target") add_custom_target(test COMMAND openshot-test) - list(APPEND OS_TEST_CMDS " or " "'make test'") + set(TEST_TARGET_NAME "test") +else() + set(TEST_TARGET_NAME "os_test") endif() - -string(CONCAT t ${OS_TEST_CMDS}) -message("\nTo run unit tests, use: ${t}") +add_feature_info("Testrunner" ENABLE_TESTS "Run unit tests with 'make ${TEST_TARGET_NAME}'") From 96b4ac47c3712d74b0c6aba6c64950a0a3291896 Mon Sep 17 00:00:00 2001 From: Frank Dana Date: Sun, 12 Jan 2020 12:33:58 -0500 Subject: [PATCH 38/47] Clean up ENABLE/DISABLE_TESTS logic and handling --- CMakeLists.txt | 16 +++++-- tests/CMakeLists.txt | 99 +++++++++++++++++++++++--------------------- 2 files changed, 65 insertions(+), 50 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c4ecba83..1f52f2a02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,16 @@ option(ENABLE_DOCS "Build API documentation (requires Doxygen)" ON) # Legacy commandline override if (DISABLE_TESTS) - set(ENABLE_TESTS OFF CACHE BOOL "Build unit tests (requires UnitTest++)" FORCE) + if(ENABLE_COVERAGE) + message(WARNING "ENABLE_COVERAGE requires tests, overriding DISABLE_TESTS") + set(ENABLE_TESTS ON) + else() + set(ENABLE_TESTS OFF) + endif() +endif() + +if(DEFINED ENABLE_TESTS) + set(ENABLE_TESTS ${ENABLE_TESTS} CACHE BOOL "Build unit tests (requires UnitTest++)" FORCE) endif() ########## Configure Version.h header ############## @@ -120,7 +129,7 @@ if (ENABLE_COVERAGE) message(STATUS "Coverage enabled, setting build type to Debug") endif() include(CodeCoverage) - APPEND_COVERAGE_COMPILER_FLAGS() + append_coverage_compiler_flags() endif() add_feature_info("Coverage" ENABLE_COVERAGE "analyze test coverage and generate report") @@ -152,9 +161,10 @@ add_feature_info("Documentation" DOCS_ENABLED "Build API documentation with 'mak ############# PROCESS tests/ DIRECTORY ############## if(ENABLE_TESTS) + set(TESTS_ENABLED TRUE) # May be overridden by tests/CMakeLists.txt add_subdirectory(tests) endif() -add_feature_info("Unit tests" ENABLE_TESTS "Compile unit tests for library functions") +add_feature_info("Unit tests" TESTS_ENABLED "Compile unit tests for library functions") ############## COVERAGE REPORTING ################# if (ENABLE_COVERAGE) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b7c042564..244e52504 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -24,107 +24,112 @@ # along with OpenShot Library. If not, see . ################################################################################ -SET(TEST_MEDIA_PATH "${PROJECT_SOURCE_DIR}/src/examples/") +# Test media path, used by unit tests for input data +file(TO_NATIVE_PATH "${PROJECT_SOURCE_DIR}/src/examples/" TEST_MEDIA_PATH) +add_definitions( -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" ) ################ WINDOWS ################## # Set some compiler options for Windows # required for libopenshot-audio headers -IF (WIN32) - STRING(REPLACE "/" "\\\\" TEST_MEDIA_PATH TEST_MEDIA_PATH) +if(WIN32) add_definitions( -DIGNORE_JUCE_HYPOT=1 ) - SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath") -ENDIF(WIN32) - -add_definitions( -DTEST_MEDIA_PATH="${TEST_MEDIA_PATH}" ) + set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -include cmath") +endif() ################### UNITTEST++ ##################### # Find UnitTest++ libraries (used for unit testing) -FIND_PACKAGE(UnitTest++ REQUIRED) +find_package(UnitTest++) + +if (NOT UnitTest++_FOUND) + set(TESTS_ENABLED OFF PARENT_SCOPE) + return() +endif() # Include UnitTest++ headers (needed for compile) include_directories(${UNITTEST++_INCLUDE_DIR}) ################ IMAGE MAGICK ################## # Set the Quantum Depth that ImageMagick was built with (default to 16 bits) -IF (MAGICKCORE_QUANTUM_DEPTH) +if(MAGICKCORE_QUANTUM_DEPTH) add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=${MAGICKCORE_QUANTUM_DEPTH} ) -ELSE (MAGICKCORE_QUANTUM_DEPTH) +else() add_definitions( -DMAGICKCORE_QUANTUM_DEPTH=16 ) -ENDIF (MAGICKCORE_QUANTUM_DEPTH) -IF (MAGICKCORE_HDRI_ENABLE) +endif() + +if(MAGICKCORE_HDRI_ENABLE) add_definitions( -DMAGICKCORE_HDRI_ENABLE=${MAGICKCORE_HDRI_ENABLE} ) -ELSE (MAGICKCORE_HDRI_ENABLE) +else() add_definitions( -DMAGICKCORE_HDRI_ENABLE=0 ) -ENDIF (MAGICKCORE_HDRI_ENABLE) -IF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY) +endif() + +if(OPENSHOT_IMAGEMAGICK_COMPATIBILITY) add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=${OPENSHOT_IMAGEMAGICK_COMPATIBILITY} ) -ELSE (OPENSHOT_IMAGEMAGICK_COMPATIBILITY) +else() add_definitions( -DOPENSHOT_IMAGEMAGICK_COMPATIBILITY=0 ) -ENDIF (OPENSHOT_IMAGEMAGICK_COMPATIBILITY) +endif() # Find the ImageMagick++ library -FIND_PACKAGE(ImageMagick COMPONENTS Magick++ MagickWand MagickCore) -IF (ImageMagick_FOUND) +find_package(ImageMagick COMPONENTS Magick++ MagickWand MagickCore) +if(ImageMagick_FOUND) # Include ImageMagick++ headers (needed for compile) include_directories(${ImageMagick_INCLUDE_DIRS}) # define a global var (used in the C++) add_definitions( -DUSE_IMAGEMAGICK=1 ) - SET(CMAKE_SWIG_FLAGS "-DUSE_IMAGEMAGICK=1") - -ENDIF (ImageMagick_FOUND) + set(CMAKE_SWIG_FLAGS "-DUSE_IMAGEMAGICK=1") +endif() ################# LIBOPENSHOT-AUDIO ################### # Find JUCE-based openshot Audio libraries -FIND_PACKAGE(OpenShotAudio 0.1.9 REQUIRED) +find_package(OpenShotAudio 0.1.9 REQUIRED) # Include Juce headers (needed for compile) include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS}) ################# BLACKMAGIC DECKLINK ################### -IF (ENABLE_BLACKMAGIC) +if(ENABLE_BLACKMAGIC) # Find BlackMagic DeckLinkAPI libraries - FIND_PACKAGE(BlackMagic) + find_package(BlackMagic) - IF (BLACKMAGIC_FOUND) + if(BLACKMAGIC_FOUND) # Include Blackmagic headers (needed for compile) include_directories(${BLACKMAGIC_INCLUDE_DIR}) - ENDIF (BLACKMAGIC_FOUND) -ENDIF (ENABLE_BLACKMAGIC) + endif() +endif() ############### SET TEST SOURCE FILES ################# -SET ( OPENSHOT_TEST_FILES - Cache_Tests.cpp - Clip_Tests.cpp - Color_Tests.cpp - Coordinate_Tests.cpp - ReaderBase_Tests.cpp - ImageWriter_Tests.cpp - FFmpegReader_Tests.cpp - FFmpegWriter_Tests.cpp - Fraction_Tests.cpp - Frame_Tests.cpp - FrameMapper_Tests.cpp - KeyFrame_Tests.cpp - Point_Tests.cpp - Settings_Tests.cpp - Timeline_Tests.cpp ) +set(OPENSHOT_TEST_FILES + Cache_Tests.cpp + Clip_Tests.cpp + Color_Tests.cpp + Coordinate_Tests.cpp + ReaderBase_Tests.cpp + ImageWriter_Tests.cpp + FFmpegReader_Tests.cpp + FFmpegWriter_Tests.cpp + Fraction_Tests.cpp + Frame_Tests.cpp + FrameMapper_Tests.cpp + KeyFrame_Tests.cpp + Point_Tests.cpp + Settings_Tests.cpp + Timeline_Tests.cpp ) ################ TESTER EXECUTABLE ################# # Create unit test executable (openshot-test) message (STATUS "Tests enabled, test executable will be built as tests/openshot-test") add_executable(openshot-test - tests.cpp - ${OPENSHOT_TEST_FILES} ) + tests.cpp + ${OPENSHOT_TEST_FILES} ) # Link libraries to the new executable target_link_libraries(openshot-test openshot ${UNITTEST++_LIBRARY}) ##### RUNNING TESTS (make os_test / make test) ##### # Hook up the 'make os_test' target to the 'openshot-test' executable -ADD_CUSTOM_TARGET(os_test COMMAND openshot-test) +add_custom_target(os_test COMMAND openshot-test) # Also hook up 'make test', if possible # This requires CMake 3.11+, where the CMP0037 policy From 7ab18fde9f9ece542d06f92dc490e5ae30bb1ee5 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 26 Feb 2020 05:21:18 -0500 Subject: [PATCH 39/47] Modernize FindUnitTest++.cmake, add pkg-config The same old variables will be respected for setting the path, but the PREFERRED method is defining `-DUnitTest++_ROOT=/path/to` on the CMake command line. _ROOT variables are handled with extra intelligence by CMake. The find module will also attempt to locate the pkg-config file UnitTest++.pc, and if found will import its data. --- cmake/Modules/FindUnitTest++.cmake | 101 ++++++++++++++++++----------- tests/CMakeLists.txt | 8 ++- 2 files changed, 70 insertions(+), 39 deletions(-) diff --git a/cmake/Modules/FindUnitTest++.cmake b/cmake/Modules/FindUnitTest++.cmake index 545f62a88..ce1bdc458 100644 --- a/cmake/Modules/FindUnitTest++.cmake +++ b/cmake/Modules/FindUnitTest++.cmake @@ -1,43 +1,59 @@ -# Locate UNITTEST +# Locate UnitTest++ # This module defines -# UNITTEST++_LIBRARY -# UNITTEST++_FOUND, if false, do not try to link to gdal -# UNITTEST++_INCLUDE_DIR, where to find the headers - -FIND_PATH(UNITTEST++_INCLUDE_DIR UnitTest++.h - ${UNITTEST_DIR}/include/unittest++ - $ENV{UNITTEST_DIR}/include/unittest++ - $ENV{UNITTEST_DIR}/src +# UnitTest++_FOUND, if successful +# UnitTest++_LIBRARIES, the library path +# UnitTest++_INCLUDE_DIRS, where to find the headers + +find_package(PkgConfig QUIET) +if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_UnitTest QUIET UnitTest++) + set(UnitTest++_VERSION ${PC_UnitTest_VERSION}) +endif() + + +FIND_PATH(UnitTest++_INCLUDE_DIRS UnitTest++.h + DOC + "Location of UnitTest++ header files" + PATH_SUFFIXES + unittest++ + UnitTest++ # Fedora, Arch + unittest-cpp # openSUSE + HINTS + ${PC_UnitTest++_INCLUDEDIR} + ${PC_UnitTest++_INCLUDE_DIRS} + PATHS + ${UnitTest++_ROOT} + ${UNITTEST_DIR} + $ENV{UNITTEST_DIR}/src $ENV{UNITTEST_DIR} ~/Library/Frameworks /Library/Frameworks - /usr/local/include - /usr/include - /usr/include/unittest++ - /usr/include/UnitTest++ # Fedora - /usr/include/unittest-cpp # openSUSE - /usr/local/include/UnitTest++/ # Arch - /sw/include # Fink - /opt/local/include # DarwinPorts - /opt/local/include/UnitTest++ - /opt/csw/include # Blastwave - /opt/include + /usr/local + /sw # Fink + /opt + /opt/local # DarwinPorts + /opt/csw # Blastwave [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment]/include - /usr/freeware/include + /usr/freeware ) -FIND_LIBRARY(UNITTEST++_LIBRARY - NAMES unittest++ UnitTest++ - PATHS - ${UNITTEST_DIR}/lib - $ENV{UNITTEST_DIR}/lib - $ENV{UNITTEST_DIR}/build +FIND_LIBRARY(UnitTest++_LIBRARIES + NAMES unittest++ UnitTest++ + DOC + "Location of UnitTest++ shared library" + HINTS + ${PC_UnitTest++_LIBDIR} + ${PC_UnitTest++_LIBRARY_DIRS} + PATHS + ${UnitTest++_ROOT} + ${UnitTest++_ROOT}/lib + ${UNITTEST_DIR} $ENV{UNITTEST_DIR} + $ENV{UNITTEST_DIR}/lib + $ENV{UNITTEST_DIR}/build ~/Library/Frameworks /Library/Frameworks /usr/local/lib - /usr/lib - /usr/lib64/ # Fedora /sw/lib /opt/local/lib /opt/csw/lib @@ -46,13 +62,24 @@ FIND_LIBRARY(UNITTEST++_LIBRARY /usr/freeware/lib64 ) -SET(UNITTEST++_FOUND "NO") -IF(UNITTEST++_LIBRARY AND UNITTEST++_INCLUDE_DIR) - SET(UNITTEST++_FOUND "YES") -ENDIF(UNITTEST++_LIBRARY AND UNITTEST++_INCLUDE_DIR) +if(UnitTest++_LIBRARIES AND UnitTest++_INCLUDE_DIRS) + set(UnitTest++_FOUND TRUE) +endif() include(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set UNITTEST++_FOUND to TRUE -# if all listed variables are TRUE -find_package_handle_standard_args(UNITTEST++ DEFAULT_MSG - UNITTEST++_LIBRARY UNITTEST++_INCLUDE_DIR) +find_package_handle_standard_args(UnitTest++ + REQUIRED_VARS + UnitTest++_LIBRARIES + UnitTest++_INCLUDE_DIRS + VERSION_VAR + UnitTest++_VERSION +) + +# Excessive backwards-compatibility paranoia +set(UnitTest++_LIBRARY "${UnitTest++_LIBRARIES}" PARENT_SCOPE) +set(UnitTest++_INCLUDE_DIR "${UnitTest++_INCLUDE_DIRS}" PARENT_SCOPE) +# Even more excessive backwards-compatibility paranoia +set(UNITTEST++_FOUND "${UnitTest++_FOUND}" PARENT_SCOPE) +set(UNITTEST++_LIBRARY "${UnitTest++_LIBRARIES}" PARENT_SCOPE) +set(UNITTEST++_INCLUDE_DIR "${UnitTest++_INCLUDE_DIRS}" PARENT_SCOPE) + diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 244e52504..250311274 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -46,7 +46,11 @@ if (NOT UnitTest++_FOUND) endif() # Include UnitTest++ headers (needed for compile) -include_directories(${UNITTEST++_INCLUDE_DIR}) +include_directories(${UnitTest++_INCLUDE_DIRS}) + +set_package_properties(UnitTest++ PROPERTIES + TYPE RECOMMENDED + PURPOSE "Unit testing framework") ################ IMAGE MAGICK ################## # Set the Quantum Depth that ImageMagick was built with (default to 16 bits) @@ -125,7 +129,7 @@ add_executable(openshot-test ${OPENSHOT_TEST_FILES} ) # Link libraries to the new executable -target_link_libraries(openshot-test openshot ${UNITTEST++_LIBRARY}) +target_link_libraries(openshot-test openshot ${UnitTest++_LIBRARIES}) ##### RUNNING TESTS (make os_test / make test) ##### # Hook up the 'make os_test' target to the 'openshot-test' executable From 09e77609d86842cdf389dacf4772e10ddfcd0f13 Mon Sep 17 00:00:00 2001 From: Frank Dana Date: Wed, 26 Feb 2020 06:06:32 -0500 Subject: [PATCH 40/47] Update CodeCoverage.cmake module (#450) --- cmake/Modules/CodeCoverage.cmake | 33 ++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/CodeCoverage.cmake b/cmake/Modules/CodeCoverage.cmake index 786a06b4a..fde7f535c 100644 --- a/cmake/Modules/CodeCoverage.cmake +++ b/cmake/Modules/CodeCoverage.cmake @@ -59,6 +59,13 @@ # 2019-12-19, FeRD (Frank Dana) # - Rename Lcov outputs, make filtered file canonical, fix cleanup for targets # +# 2020-01-19, Bob Apthorpe +# - Added gfortran support +# +# 2020-02-17, FeRD (Frank Dana) +# - Make all add_custom_target()s VERBATIM to auto-escape wildcard characters +# in EXCLUDEs, and remove manual escaping from gcovr targets +# # USAGE: # # 1. Copy this file into your cmake modules path. @@ -122,12 +129,22 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang") message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...") endif() elseif(NOT CMAKE_COMPILER_IS_GNUCXX) - message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...") + if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "[Ff]lang") + # Do nothing; exit conditional without error if true + elseif("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU") + # Do nothing; exit conditional without error if true + else() + message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...") + endif() endif() set(COVERAGE_COMPILER_FLAGS "-g -fprofile-arcs -ftest-coverage" CACHE INTERNAL "") +set(CMAKE_Fortran_FLAGS_COVERAGE + ${COVERAGE_COMPILER_FLAGS} + CACHE STRING "Flags used by the Fortran compiler during coverage builds." + FORCE ) set(CMAKE_CXX_FLAGS_COVERAGE ${COVERAGE_COMPILER_FLAGS} CACHE STRING "Flags used by the C++ compiler during coverage builds." @@ -145,6 +162,7 @@ set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE CACHE STRING "Flags used by the shared libraries linker during coverage builds." FORCE ) mark_as_advanced( + CMAKE_Fortran_FLAGS_COVERAGE CMAKE_CXX_FLAGS_COVERAGE CMAKE_C_FLAGS_COVERAGE CMAKE_EXE_LINKER_FLAGS_COVERAGE @@ -154,7 +172,7 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading") endif() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug" -if(CMAKE_C_COMPILER_ID STREQUAL "GNU") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") link_libraries(gcov) endif() @@ -242,6 +260,7 @@ function(setup_target_for_coverage_lcov) WORKING_DIRECTORY ${PROJECT_BINARY_DIR} DEPENDS ${Coverage_DEPENDENCIES} + VERBATIM # Protect arguments to commands COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report." ) @@ -304,9 +323,8 @@ function(setup_target_for_coverage_gcovr_xml) # Combine excludes to several -e arguments set(GCOVR_EXCLUDE_ARGS "") foreach(EXCLUDE ${GCOVR_EXCLUDES}) - string(REPLACE "*" "\\*" EXCLUDE_REPLACED ${EXCLUDE}) list(APPEND GCOVR_EXCLUDE_ARGS "-e") - list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE_REPLACED}") + list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE}") endforeach() add_custom_target(${Coverage_NAME} @@ -321,6 +339,7 @@ function(setup_target_for_coverage_gcovr_xml) BYPRODUCTS ${Coverage_NAME}.xml WORKING_DIRECTORY ${PROJECT_BINARY_DIR} DEPENDS ${Coverage_DEPENDENCIES} + VERBATIM # Protect arguments to commands COMMENT "Running gcovr to produce Cobertura code coverage report." ) @@ -376,9 +395,8 @@ function(setup_target_for_coverage_gcovr_html) # Combine excludes to several -e arguments set(GCOVR_EXCLUDE_ARGS "") foreach(EXCLUDE ${GCOVR_EXCLUDES}) - string(REPLACE "*" "\\*" EXCLUDE_REPLACED ${EXCLUDE}) list(APPEND GCOVR_EXCLUDE_ARGS "-e") - list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE_REPLACED}") + list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE}") endforeach() add_custom_target(${Coverage_NAME} @@ -393,9 +411,11 @@ function(setup_target_for_coverage_gcovr_html) -r ${BASEDIR} ${GCOVR_EXCLUDE_ARGS} --object-directory=${PROJECT_BINARY_DIR} -o ${Coverage_NAME}/index.html + BYPRODUCTS ${PROJECT_BINARY_DIR}/${Coverage_NAME} # report directory WORKING_DIRECTORY ${PROJECT_BINARY_DIR} DEPENDS ${Coverage_DEPENDENCIES} + VERBATIM # Protect arguments to commands COMMENT "Running gcovr to produce HTML code coverage report." ) @@ -410,5 +430,6 @@ endfunction() # setup_target_for_coverage_gcovr_html function(append_coverage_compiler_flags) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE) message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}") endfunction() # append_coverage_compiler_flags From 689f1e18445c77e6bdd1015c925eb309d8b2ef4b Mon Sep 17 00:00:00 2001 From: Frank Dana Date: Wed, 26 Feb 2020 17:24:56 -0500 Subject: [PATCH 41/47] CMake: Limit scope of AUTOMOC (#449) - Only set AUTOMOC property on library target - Only use the Qt headers in target_sources() - Make Qt headers PRIVATE sources, to avoid migration to other targets --- src/CMakeLists.txt | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 619d78ed6..cc574b4a2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,8 +27,6 @@ # Collect and display summary of options/dependencies include(FeatureSummary) -# Automatically process Qt classes with meta-object compiler -set(CMAKE_AUTOMOC True) ################ WINDOWS ################## # Set some compiler options for Windows @@ -190,9 +188,8 @@ set(QT_PLAYER_SOURCES Qt/VideoRenderer.cpp Qt/VideoRenderWidget.cpp) - -# Get list of headers -file(GLOB_RECURSE headers ${CMAKE_SOURCE_DIR}/include/*.h) +# Get list of MOC'able headers +file(GLOB_RECURSE OPENSHOT_QT_HEADERS ${CMAKE_SOURCE_DIR}/include/Qt/*.h) # Disable RPATH SET(CMAKE_MACOSX_RPATH 0) @@ -201,19 +198,20 @@ SET(CMAKE_MACOSX_RPATH 0) # Create shared openshot library add_library(openshot SHARED) -target_sources(openshot - PRIVATE - ${OPENSHOT_SOURCES} ${EFFECTS_SOURCES} ${QT_PLAYER_SOURCES} - PUBLIC - ${headers}) +target_sources(openshot PRIVATE + ${OPENSHOT_SOURCES} + ${EFFECTS_SOURCES} + ${QT_PLAYER_SOURCES} + ${OPENSHOT_QT_HEADERS} + ) # Set SONAME and other library properties -set_target_properties(openshot - PROPERTIES - VERSION ${PROJECT_VERSION} - SOVERSION ${PROJECT_SO_VERSION} - INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" - ) +set_target_properties(openshot PROPERTIES + AUTOMOC ON + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_SO_VERSION} + INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" + ) # Add optional ImageMagic-dependent sources if(ImageMagick_FOUND) From 2d471aea126b03735a2feb4132551de7d48b5349 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Fri, 28 Feb 2020 17:14:34 -0600 Subject: [PATCH 42/47] Bump version to 0.2.5-dev1 (SO 19) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b138b0c0..23e7dcb8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,8 @@ For more information, please visit . set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") ################ PROJECT VERSION #################### -set(PROJECT_VERSION_FULL "0.2.4-dev1") -set(PROJECT_SO_VERSION 18) +set(PROJECT_VERSION_FULL "0.2.5-dev1") +set(PROJECT_SO_VERSION 19) # Remove the dash and anything following, to get the #.#.# version for project() STRING(REGEX REPLACE "\-.*$" "" VERSION_NUM "${PROJECT_VERSION_FULL}") From 5da706dc237f2c681b7c692bd2f60d637ed91b2a Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Fri, 28 Feb 2020 17:16:48 -0600 Subject: [PATCH 43/47] Bump dependency to OpenShotAudio to 0.2.0 --- src/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ac3143af9..a544982e2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -77,7 +77,7 @@ ENDIF (ImageMagick_FOUND) ################# LIBOPENSHOT-AUDIO ################### # Find JUCE-based openshot Audio libraries -FIND_PACKAGE(OpenShotAudio 0.1.9 REQUIRED) +FIND_PACKAGE(OpenShotAudio 0.2.0 REQUIRED) # Include Juce headers (needed for compile) include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4b2284f63..e1ff1ecce 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -76,7 +76,7 @@ ENDIF (ImageMagick_FOUND) ################# LIBOPENSHOT-AUDIO ################### # Find JUCE-based openshot Audio libraries -FIND_PACKAGE(OpenShotAudio 0.1.9 REQUIRED) +FIND_PACKAGE(OpenShotAudio 0.2.0 REQUIRED) # Include Juce headers (needed for compile) include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS}) From 8d78242571665604b777088e62a8ff58afc39e57 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Sat, 29 Feb 2020 17:30:36 -0600 Subject: [PATCH 44/47] Release branch for 0.2.5 (SO 19) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 23e7dcb8a..a3d7ab8d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ For more information, please visit . set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules") ################ PROJECT VERSION #################### -set(PROJECT_VERSION_FULL "0.2.5-dev1") +set(PROJECT_VERSION_FULL "0.2.5") set(PROJECT_SO_VERSION 19) # Remove the dash and anything following, to get the #.#.# version for project() From c7fe363f2bd7667dd52825c07f47535c6b04a32b Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Sat, 29 Feb 2020 19:21:43 -0600 Subject: [PATCH 45/47] Fix ColorShift classname in EffectInfo::CreateEffect --- src/EffectInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EffectInfo.cpp b/src/EffectInfo.cpp index 5d786fe76..6829f4eb5 100644 --- a/src/EffectInfo.cpp +++ b/src/EffectInfo.cpp @@ -56,7 +56,7 @@ EffectBase* EffectInfo::CreateEffect(std::string effect_type) { else if (effect_type == "ChromaKey") return new ChromaKey(); - else if (effect_type == "Color Shift") + else if (effect_type == "ColorShift") return new ColorShift(); else if (effect_type == "Crop") From 325c73abd7675f54a87da25a8e66f44958ba51a3 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 2 Mar 2020 22:47:05 -0500 Subject: [PATCH 46/47] ColorShift: Use one-word name in EffectInfo --- src/EffectInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EffectInfo.cpp b/src/EffectInfo.cpp index 5d786fe76..6829f4eb5 100644 --- a/src/EffectInfo.cpp +++ b/src/EffectInfo.cpp @@ -56,7 +56,7 @@ EffectBase* EffectInfo::CreateEffect(std::string effect_type) { else if (effect_type == "ChromaKey") return new ChromaKey(); - else if (effect_type == "Color Shift") + else if (effect_type == "ColorShift") return new ColorShift(); else if (effect_type == "Crop") From 4d7b4072c3bb5e38285d764155582f831631948c Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Mon, 2 Mar 2020 23:50:10 -0600 Subject: [PATCH 47/47] Fixing abs -> fabs regression. Not sure how this worked before. --- src/Frame.cpp | 2 +- src/effects/ColorShift.cpp | 18 ++++++++---------- src/effects/Shift.cpp | 4 ++-- src/effects/Wave.cpp | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/Frame.cpp b/src/Frame.cpp index 7d4dc42ec..9577a7f9e 100644 --- a/src/Frame.cpp +++ b/src/Frame.cpp @@ -581,7 +581,7 @@ void Frame::Save(std::string path, float scale, std::string format, int quality) std::shared_ptr previewImage = GetImage(); // scale image if needed - if (abs(scale) > 1.001 || abs(scale) < 0.999) + if (fabs(scale) > 1.001 || fabs(scale) < 0.999) { int new_width = width; int new_height = height; diff --git a/src/effects/ColorShift.cpp b/src/effects/ColorShift.cpp index 2a7a26d72..7ec62e14c 100644 --- a/src/effects/ColorShift.cpp +++ b/src/effects/ColorShift.cpp @@ -75,25 +75,24 @@ std::shared_ptr ColorShift::GetFrame(std::shared_ptr frame, int64_ // Get the current shift amount, and clamp to range (-1 to 1 range) // Red Keyframes float red_x_shift = red_x.GetValue(frame_number); - int red_x_shift_limit = round(frame_image_width * fmod(abs(red_x_shift), 1.0)); + int red_x_shift_limit = round(frame_image_width * fmod(fabs(red_x_shift), 1.0)); float red_y_shift = red_y.GetValue(frame_number); - int red_y_shift_limit = round(frame_image_height * fmod(abs(red_y_shift), 1.0)); + int red_y_shift_limit = round(frame_image_height * fmod(fabs(red_y_shift), 1.0)); // Green Keyframes float green_x_shift = green_x.GetValue(frame_number); - int green_x_shift_limit = round(frame_image_width * fmod(abs(green_x_shift), 1.0)); + int green_x_shift_limit = round(frame_image_width * fmod(fabs(green_x_shift), 1.0)); float green_y_shift = green_y.GetValue(frame_number); - int green_y_shift_limit = round(frame_image_height * fmod(abs(green_y_shift), 1.0)); + int green_y_shift_limit = round(frame_image_height * fmod(fabs(green_y_shift), 1.0)); // Blue Keyframes float blue_x_shift = blue_x.GetValue(frame_number); - int blue_x_shift_limit = round(frame_image_width * fmod(abs(blue_x_shift), 1.0)); + int blue_x_shift_limit = round(frame_image_width * fmod(fabs(blue_x_shift), 1.0)); float blue_y_shift = blue_y.GetValue(frame_number); - int blue_y_shift_limit = round(frame_image_height * fmod(abs(blue_y_shift), 1.0)); + int blue_y_shift_limit = round(frame_image_height * fmod(fabs(blue_y_shift), 1.0)); // Alpha Keyframes float alpha_x_shift = alpha_x.GetValue(frame_number); - int alpha_x_shift_limit = round(frame_image_width * fmod(abs(alpha_x_shift), 1.0)); + int alpha_x_shift_limit = round(frame_image_width * fmod(fabs(alpha_x_shift), 1.0)); float alpha_y_shift = alpha_y.GetValue(frame_number); - int alpha_y_shift_limit = round(frame_image_height * fmod(abs(alpha_y_shift), 1.0)); - + int alpha_y_shift_limit = round(frame_image_height * fmod(fabs(alpha_y_shift), 1.0)); // Make temp copy of pixels unsigned char *temp_image = new unsigned char[frame_image_width * frame_image_height * 4](); @@ -130,7 +129,6 @@ std::shared_ptr ColorShift::GetFrame(std::shared_ptr frame, int64_ blue_starting_row_index = starting_row_index; alpha_starting_row_index = starting_row_index; - red_pixel_offset = 0; green_pixel_offset = 0; blue_pixel_offset = 0; diff --git a/src/effects/Shift.cpp b/src/effects/Shift.cpp index 0a58d152b..ee5815912 100644 --- a/src/effects/Shift.cpp +++ b/src/effects/Shift.cpp @@ -69,9 +69,9 @@ std::shared_ptr Shift::GetFrame(std::shared_ptr frame, int64_t fra // Get the current shift amount, and clamp to range (-1 to 1 range) double x_shift = x.GetValue(frame_number); - double x_shift_limit = fmod(abs(x_shift), 1.0); + double x_shift_limit = fmod(fabs(x_shift), 1.0); double y_shift = y.GetValue(frame_number); - double y_shift_limit = fmod(abs(y_shift), 1.0); + double y_shift_limit = fmod(fabs(y_shift), 1.0); // Declare temp arrays to hold pixels while we move things around unsigned char *temp_row = new unsigned char[frame_image->width() * 4](); diff --git a/src/effects/Wave.cpp b/src/effects/Wave.cpp index 0647dc7c9..499fc9588 100644 --- a/src/effects/Wave.cpp +++ b/src/effects/Wave.cpp @@ -74,7 +74,7 @@ std::shared_ptr Wave::GetFrame(std::shared_ptr frame, int64_t fram int pixel_count = frame_image->width() * frame_image->height(); // Get current keyframe values - double time = frame_number;//abs(((frame_number + 255) % 510) - 255); + double time = frame_number; double wavelength_value = wavelength.GetValue(frame_number); double amplitude_value = amplitude.GetValue(frame_number); double multiplier_value = multiplier.GetValue(frame_number);