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

FrameMapper/KeyFrame/Point: std:: prefixes

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2019-08-04 22:54:06 -04:00
parent f927cc0c3c
commit 3879b09047
6 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/FrameMapper.h
View File

@@ -49,9 +49,6 @@
#include "OpenMPUtilities.h"
using namespace std;
namespace openshot
{
/**
@@ -166,8 +163,8 @@ namespace openshot
public:
// Init some containers
vector<Field> fields; // List of all fields
vector<MappedFrame> frames; // List of all frames
std::vector<Field> fields; // List of all fields
std::vector<MappedFrame> frames; // List of all frames
/// Default constructor for openshot::FrameMapper class
FrameMapper(ReaderBase *reader, Fraction target_fps, PulldownType target_pulldown, int target_sample_rate, int target_channels, ChannelLayout target_channel_layout);
@@ -199,11 +196,11 @@ namespace openshot
bool IsOpen();
/// Return the type name of the class
string Name() { return "FrameMapper"; };
std::string Name() { return "FrameMapper"; };
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
void SetJson(string value); ///< Load JSON string into this object
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

11
include/KeyFrame.h
View File

@@ -42,9 +42,6 @@
#include "Point.h"
#include "Json.h"
using namespace std;
using namespace openshot;
namespace openshot {
/**
@@ -92,8 +89,8 @@ namespace openshot {
double Bernstein(int64_t n, int64_t i, double t);
public:
vector<Point> Points; ///< Vector of all Points
vector<Coordinate> Values; ///< Vector of all Values (i.e. the processed coordinates from the curve)
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();
@@ -160,9 +157,9 @@ namespace openshot {
bool IsIncreasing(int index);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
std::string Json(); ///< Generate JSON string of this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJson(string value); ///< Load JSON string into this object
void SetJson(std::string value); ///< Load JSON string into this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
/**

6
include/Point.h
View File

@@ -35,8 +35,6 @@
#include "Exceptions.h"
#include "Json.h"
using namespace std;
namespace openshot
{
/**
@@ -121,9 +119,9 @@ namespace openshot
void Initialize_RightHandle(float x, float y);
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
std::string Json(); ///< Generate JSON string of this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
void SetJson(string value); ///< Load JSON string into this object
void SetJson(std::string value); ///< Load JSON string into this object
void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
};

8
src/FrameMapper.cpp
View File

@@ -675,7 +675,7 @@ void FrameMapper::Close()
// Generate JSON string of this object
string FrameMapper::Json() {
std::string FrameMapper::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -693,14 +693,14 @@ Json::Value FrameMapper::JsonValue() {
}
// Load JSON string into this object
void FrameMapper::SetJson(string value) {
void FrameMapper::SetJson(std::string value) {
// Parse JSON string into JSON objects
Json::Value root;
Json::CharReaderBuilder rbuilder;
Json::CharReader* reader(rbuilder.newCharReader());
string errors;
std::string errors;
bool success = reader->parse( value.c_str(),
value.c_str() + value.size(), &root, &errors );
delete reader;
@@ -820,7 +820,7 @@ void FrameMapper::ResampleMappedAudio(std::shared_ptr<Frame> frame, int64_t orig
if (error_code < 0)
{
ZmqLogger::Instance()->AppendDebugMethod("FrameMapper::ResampleMappedAudio ERROR [" + (string)av_err2str(error_code) + "]", "error_code", error_code);
ZmqLogger::Instance()->AppendDebugMethod("FrameMapper::ResampleMappedAudio ERROR [" + (std::string)av_err2str(error_code) + "]", "error_code", error_code);
throw ErrorEncodingVideo("Error while resampling audio in frame mapper", frame->number);
}

28
src/KeyFrame.cpp
View File

@@ -307,7 +307,7 @@ bool Keyframe::IsIncreasing(int index)
int64_t next_repeats = 0;
// Loop backwards and look for the next unique value
for (vector<Coordinate>::iterator backwards_it = Values.begin() + index; backwards_it != Values.begin(); backwards_it--) {
for (std::vector<Coordinate>::iterator backwards_it = Values.begin() + index; backwards_it != Values.begin(); backwards_it--) {
previous_value = long(round((*backwards_it).Y));
if (previous_value == current_value) {
// Found same value
@@ -319,7 +319,7 @@ bool Keyframe::IsIncreasing(int index)
}
// Loop forwards and look for the next unique value
for (vector<Coordinate>::iterator forwards_it = Values.begin() + (index + 1); forwards_it != Values.end(); forwards_it++) {
for (std::vector<Coordinate>::iterator forwards_it = Values.begin() + (index + 1); forwards_it != Values.end(); forwards_it++) {
next_value = long(round((*forwards_it).Y));
if (next_value == current_value) {
// Found same value
@@ -340,7 +340,7 @@ bool Keyframe::IsIncreasing(int index)
}
// Generate JSON string of this object
string Keyframe::Json() {
std::string Keyframe::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -365,14 +365,14 @@ Json::Value Keyframe::JsonValue() {
}
// Load JSON string into this object
void Keyframe::SetJson(string value) {
void Keyframe::SetJson(std::string value) {
// Parse JSON string into JSON objects
Json::Value root;
Json::CharReaderBuilder rbuilder;
Json::CharReader* reader(rbuilder.newCharReader());
string errors;
std::string errors;
bool success = reader->parse( value.c_str(),
value.c_str() + value.size(), &root, &errors );
delete reader;
@@ -436,7 +436,7 @@ Fraction Keyframe::GetRepeatFraction(int64_t index)
int64_t next_repeats = 0;
// Loop backwards and look for the next unique value
for (vector<Coordinate>::iterator backwards_it = Values.begin() + index; backwards_it != Values.begin(); backwards_it--) {
for (std::vector<Coordinate>::iterator backwards_it = Values.begin() + index; backwards_it != Values.begin(); backwards_it--) {
previous_value = long(round((*backwards_it).Y));
if (previous_value == current_value) {
// Found same value
@@ -448,7 +448,7 @@ Fraction Keyframe::GetRepeatFraction(int64_t index)
}
// Loop forwards and look for the next unique value
for (vector<Coordinate>::iterator forwards_it = Values.begin() + (index + 1); forwards_it != Values.end(); forwards_it++) {
for (std::vector<Coordinate>::iterator forwards_it = Values.begin() + (index + 1); forwards_it != Values.end(); forwards_it++) {
next_value = long(round((*forwards_it).Y));
if (next_value == current_value) {
// Found same value
@@ -483,7 +483,7 @@ double Keyframe::GetDelta(int64_t index)
int64_t next_repeats = 0;
// Loop backwards and look for the next unique value
for (vector<Coordinate>::iterator backwards_it = Values.begin() + index; backwards_it != Values.begin(); backwards_it--) {
for (std::vector<Coordinate>::iterator backwards_it = Values.begin() + index; backwards_it != Values.begin(); backwards_it--) {
previous_value = long(round((*backwards_it).Y));
if (previous_value == current_value) {
// Found same value
@@ -495,7 +495,7 @@ double Keyframe::GetDelta(int64_t index)
}
// Loop forwards and look for the next unique value
for (vector<Coordinate>::iterator forwards_it = Values.begin() + (index + 1); forwards_it != Values.end(); forwards_it++) {
for (std::vector<Coordinate>::iterator forwards_it = Values.begin() + (index + 1); forwards_it != Values.end(); forwards_it++) {
next_value = long(round((*forwards_it).Y));
if (next_value == current_value) {
// Found same value
@@ -605,7 +605,7 @@ void Keyframe::PrintPoints() {
Process();
cout << fixed << setprecision(4);
for (vector<Point>::iterator it = Points.begin(); it != Points.end(); it++) {
for (std::vector<Point>::iterator it = Points.begin(); it != Points.end(); it++) {
Point p = *it;
cout << p.co.X << "\t" << p.co.Y << endl;
}
@@ -619,7 +619,7 @@ void Keyframe::PrintValues() {
cout << fixed << setprecision(4);
cout << "Frame Number (X)\tValue (Y)\tIs Increasing\tRepeat Numerator\tRepeat Denominator\tDelta (Y Difference)" << endl;
for (vector<Coordinate>::iterator it = Values.begin() + 1; it != Values.end(); it++) {
for (std::vector<Coordinate>::iterator it = Values.begin() + 1; it != Values.end(); it++) {
Coordinate c = *it;
cout << long(round(c.X)) << "\t" << c.Y << "\t" << IsIncreasing(c.X) << "\t" << GetRepeatFraction(c.X).num << "\t" << GetRepeatFraction(c.X).den << "\t" << GetDelta(c.X) << endl;
}
@@ -722,13 +722,13 @@ void Keyframe::ProcessSegment(int Segment, Point p1, Point p2) {
double X_diff = p2.co.X - p1.co.X;
double Y_diff = p2.co.Y - p1.co.Y;
vector<Coordinate> segment_coordinates;
std::vector<Coordinate> segment_coordinates;
segment_coordinates.push_back(p1.co);
segment_coordinates.push_back(Coordinate(p1.co.X + (p1.handle_right.X * X_diff), p1.co.Y + (p1.handle_right.Y * Y_diff)));
segment_coordinates.push_back(Coordinate(p1.co.X + (p2.handle_left.X * X_diff), p1.co.Y + (p2.handle_left.Y * Y_diff)));
segment_coordinates.push_back(p2.co);
vector<Coordinate> raw_coordinates;
std::vector<Coordinate> raw_coordinates;
int64_t npts = segment_coordinates.size();
int64_t icount, jcount;
double step, t;
@@ -904,7 +904,7 @@ void Keyframe::ScalePoints(double scale)
void Keyframe::FlipPoints()
{
// Loop through each point
vector<Point> FlippedPoints;
std::vector<Point> FlippedPoints;
for (int64_t point_index = 0, reverse_index = Points.size() - 1; point_index < Points.size(); point_index++, reverse_index--) {
// Flip the points
Point p = Points[point_index];

6
src/Point.cpp
View File

@@ -108,7 +108,7 @@ void Point::Initialize_RightHandle(float x, float y) {
}
// Generate JSON string of this object
string Point::Json() {
std::string Point::Json() {
// Return formatted string
return JsonValue().toStyledString();
@@ -132,14 +132,14 @@ Json::Value Point::JsonValue() {
}
// Load JSON string into this object
void Point::SetJson(string value) {
void Point::SetJson(std::string value) {
// Parse JSON string into JSON objects
Json::Value root;
Json::CharReaderBuilder rbuilder;
Json::CharReader* reader(rbuilder.newCharReader());
string errors;
std::string errors;
bool success = reader->parse( value.c_str(),
value.c_str() + value.size(), &root, &errors );
delete reader;