Merge pull request #374 from musteresel/new-keyframe-implementation

New Keyframe implementation

Author: jonoomph

include/KeyFrame.h

@@ -63,37 +63,12 @@ namespace openshot {
 	 */
 	class Keyframe {
 	private:
-		bool needs_update;
-		double FactorialLookup[4];
-
-		/*
-		 * Because points can be added in any order, we need to reorder them
-		 * in ascending order based on the point.co.X value.  This simplifies
-		 * processing the curve, due to all the points going from left to right.
-		 */
-		void ReorderPoints();
-
-		// Process an individual segment
-		void ProcessSegment(int Segment, Point p1, Point p2);
-
-		// create lookup table for fast factorial calculation
-		void CreateFactorialTable();
-
-		// Get a factorial for a coordinate
-		double Factorial(int64_t n);
-
-		// Calculate the factorial function for Bernstein basis
-		double Ni(int64_t n, int64_t i);
-
-		// Calculate Bernstein Basis
-		double Bernstein(int64_t n, int64_t i, double t);
+		std::vector<Point> Points;			///< Vector of all Points
 
 	public:
-		std::vector<Point> Points;			///< Vector of all Points
-		std::vector<Coordinate> Values;		///< Vector of all Values (i.e. the processed coordinates from the curve)
 
 		/// Default constructor for the Keyframe class
-		Keyframe();
+		Keyframe() = default;
 
 		/// Constructor which sets the default point & coordinate at X=1
 		Keyframe(double value);
@@ -108,68 +83,60 @@ namespace openshot {
 		void AddPoint(double x, double y, InterpolationType interpolate);
 
 		/// Does this keyframe contain a specific point
-		bool Contains(Point p);
+		bool Contains(Point p) const;
 
 		/// Flip all the points in this openshot::Keyframe (useful for reversing an effect or transition, etc...)
 		void FlipPoints();
 
 		/// Get the index of a point by matching a coordinate
-		int64_t FindIndex(Point p);
+		int64_t FindIndex(Point p) const;
 
 		/// Get the value at a specific index
-		double GetValue(int64_t index);
+		double GetValue(int64_t index) const;
 
 		/// Get the rounded INT value at a specific index
-		int GetInt(int64_t index);
+		int GetInt(int64_t index) const;
 
 		/// Get the rounded LONG value at a specific index
-		int64_t GetLong(int64_t index);
+		int64_t GetLong(int64_t index) const;
 
 		/// Get the fraction that represents how many times this value is repeated in the curve
-		Fraction GetRepeatFraction(int64_t index);
+		Fraction GetRepeatFraction(int64_t index) const;
 
 		/// Get the change in Y value (from the previous Y value)
-		double GetDelta(int64_t index);
+		double GetDelta(int64_t index) const;
 
 		/// Get a point at a specific index
-		Point& GetPoint(int64_t index);
+		Point const & GetPoint(int64_t index) const;
 
 		/// Get current point (or closest point to the right) from the X coordinate (i.e. the frame number)
-		Point GetClosestPoint(Point p);
+		Point GetClosestPoint(Point p) const;
 
 		/// Get current point (or closest point) from the X coordinate (i.e. the frame number)
 		/// Either use the closest left point, or right point
-		Point GetClosestPoint(Point p, bool useLeft);
+		Point GetClosestPoint(Point p, bool useLeft) const;
 
 		/// Get previous point (
-		Point GetPreviousPoint(Point p);
+		Point GetPreviousPoint(Point p) const;
 
 		/// Get max point (by Y coordinate)
-		Point GetMaxPoint();
+		Point GetMaxPoint() const;
 
 		// Get the number of values (i.e. coordinates on the X axis)
-		int64_t GetLength();
+		int64_t GetLength() const;
 
 		/// Get the number of points (i.e. # of points)
-		int64_t GetCount();
+		int64_t GetCount() const;
 
 		/// Get the direction of the curve at a specific index (increasing or decreasing)
-		bool IsIncreasing(int index);
+		bool IsIncreasing(int index) const;
 
 		/// Get and Set JSON methods
-		std::string Json(); ///< Generate JSON string of this object
-		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
+		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
 
-		/**
-		 * @brief Calculate all of the values for this keyframe.
-		 *
-		 * This clears any existing data in the "values" vector.  This method is automatically called
-		 * by AddPoint(), so you don't typically need to call this method.
-		 */
-		void Process();
-
 		/// Remove a point by matching a coordinate
 		void RemovePoint(Point p);
 
@@ -184,10 +151,10 @@ namespace openshot {
 		void UpdatePoint(int64_t index, Point p);
 
 		/// Print a list of points
-		void PrintPoints();
+		void PrintPoints() const;
 
 		/// Print just the Y value of the point's primary coordinate
-		void PrintValues();
+		void PrintValues() const;
 
 	};
 

src/Clip.cpp

@@ -109,10 +109,10 @@ void Clip::init_settings()
 // Init reader's rotation (if any)
 void Clip::init_reader_rotation() {
 	// Only init rotation from reader when needed
-	if (rotation.Points.size() > 1)
+	if (rotation.GetCount() > 1)
 		// Do nothing if more than 1 rotation Point
 		return;
-	else if (rotation.Points.size() == 1 && rotation.GetValue(1) != 0.0)
+	else if (rotation.GetCount() == 1 && rotation.GetValue(1) != 0.0)
 		// Do nothing if 1 Point, and it's not the default value
 		return;
 
@@ -273,7 +273,7 @@ void Clip::Close()
 float Clip::End()
 {
 	// if a time curve is present, use its length
-	if (time.Points.size() > 1)
+	if (time.GetCount() > 1)
 	{
 		// Determine the FPS fo this clip
 		float fps = 24.0;
@@ -314,8 +314,8 @@ std::shared_ptr<Frame> Clip::GetFrame(int64_t requested_frame)
 		// Is a time map detected
 		int64_t new_frame_number = requested_frame;
 		int64_t time_mapped_number = adjust_frame_number_minimum(time.GetLong(requested_frame));
-		if (time.Values.size() > 1)
-            new_frame_number = time_mapped_number;
+		if (time.GetLength() > 1)
+			new_frame_number = time_mapped_number;
 
 		// Now that we have re-mapped what frame number is needed, go and get the frame pointer
 		std::shared_ptr<Frame> original_frame;
@@ -397,7 +397,7 @@ void Clip::get_time_mapped_frame(std::shared_ptr<Frame> frame, int64_t frame_num
 		throw ReaderClosed("No Reader has been initialized for this Clip.  Call Reader(*reader) before calling this method.");
 
 	// Check for a valid time map curve
-	if (time.Values.size() > 1)
+	if (time.GetLength() > 1)
 	{
 		const GenericScopedLock<juce::CriticalSection> lock(getFrameCriticalSection);