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

Rename protobuf packages to pb_foo

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2021-01-13 13:36:15 -05:00
parent 1fa4e878ca
commit da02180c79
12 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/CVObjectDetection.cpp
View File

@@ -304,7 +304,7 @@ CVDetectionData CVObjectDetection::GetDetectionData(size_t frameId){
bool CVObjectDetection::SaveObjDetectedData(){
// Create tracker message
libopenshotobjdetect::ObjDetect objMessage;
pb_objdetect::ObjDetect objMessage;
//Save class names in protobuf message
for(int i = 0; i<classNames.size(); i++){
@@ -315,7 +315,7 @@ bool CVObjectDetection::SaveObjDetectedData(){
// Iterate over all frames data and save in protobuf message
for(std::map<size_t,CVDetectionData>::iterator it=detectionsData.begin(); it!=detectionsData.end(); ++it){
CVDetectionData dData = it->second;
libopenshotobjdetect::Frame* pbFrameData;
pb_objdetect::Frame* pbFrameData;
AddFrameDataToProto(objMessage.add_frame(), dData);
}
@@ -339,13 +339,13 @@ bool CVObjectDetection::SaveObjDetectedData(){
}
// Add frame object detection into protobuf message.
void CVObjectDetection::AddFrameDataToProto(libopenshotobjdetect::Frame* pbFrameData, CVDetectionData& dData) {
void CVObjectDetection::AddFrameDataToProto(pb_objdetect::Frame* pbFrameData, CVDetectionData& dData) {
// Save frame number and rotation
pbFrameData->set_id(dData.frameId);
for(size_t i = 0; i < dData.boxes.size(); i++){
libopenshotobjdetect::Frame_Box* box = pbFrameData->add_bounding_box();
pb_objdetect::Frame_Box* box = pbFrameData->add_bounding_box();
// Save bounding box data
box->set_x(dData.boxes.at(i).x);
@@ -425,7 +425,7 @@ void CVObjectDetection::SetJsonValue(const Json::Value root) {
// Load protobuf data file
bool CVObjectDetection::_LoadObjDetectdData(){
// Create tracker message
libopenshotobjdetect::ObjDetect objMessage;
pb_objdetect::ObjDetect objMessage;
{
// Read the existing tracker message.
@@ -447,13 +447,13 @@ bool CVObjectDetection::_LoadObjDetectdData(){
// Iterate over all frames of the saved message
for (size_t i = 0; i < objMessage.frame_size(); i++) {
// Create protobuf message reader
const libopenshotobjdetect::Frame& pbFrameData = objMessage.frame(i);
const pb_objdetect::Frame& pbFrameData = objMessage.frame(i);
// Get frame Id
size_t id = pbFrameData.id();
// Load bounding box data
const google::protobuf::RepeatedPtrField<libopenshotobjdetect::Frame_Box > &pBox = pbFrameData.bounding_box();
const google::protobuf::RepeatedPtrField<pb_objdetect::Frame_Box > &pBox = pbFrameData.bounding_box();
// Construct data vectors related to detections in the current frame
std::vector<int> classIds; std::vector<float> confidences; std::vector<cv::Rect_<float>> boxes;

2
src/CVObjectDetection.h
View File

@@ -124,7 +124,7 @@ namespace openshot
// Save protobuf file
bool SaveObjDetectedData();
// Add frame object detection data into protobuf message.
void AddFrameDataToProto(libopenshotobjdetect::Frame* pbFrameData, CVDetectionData& dData);
void AddFrameDataToProto(pb_objdetect::Frame* pbFrameData, CVDetectionData& dData);
/// Get and Set JSON methods
void SetJson(const std::string value); ///< Load JSON string into this object

8
src/CVStabilization.cpp
View File

@@ -280,7 +280,7 @@ std::map<size_t,TransformParam> CVStabilization::GenNewCamPosition(std::map <siz
// Save stabilization data to protobuf file
bool CVStabilization::SaveStabilizedData(){
// Create stabilization message
libopenshotstabilize::Stabilization stabilizationMessage;
pb_stabilize::Stabilization stabilizationMessage;
std::map<size_t,CamTrajectory>::iterator trajData = trajectoryData.begin();
std::map<size_t,TransformParam>::iterator transData = transformationData.begin();
@@ -306,7 +306,7 @@ bool CVStabilization::SaveStabilizedData(){
}
// Add frame stabilization data into protobuf message
void CVStabilization::AddFrameDataToProto(libopenshotstabilize::Frame* pbFrameData, CamTrajectory& trajData, TransformParam& transData, size_t frame_number){
void CVStabilization::AddFrameDataToProto(pb_stabilize::Frame* pbFrameData, CamTrajectory& trajData, TransformParam& transData, size_t frame_number){
// Save frame number
pbFrameData->set_id(frame_number);
@@ -384,7 +384,7 @@ void CVStabilization::SetJsonValue(const Json::Value root) {
// Load protobuf data file
bool CVStabilization::_LoadStabilizedData(){
// Create stabilization message
libopenshotstabilize::Stabilization stabilizationMessage;
pb_stabilize::Stabilization stabilizationMessage;
// Read the existing tracker message.
fstream input(protobuf_data_path, ios::in | ios::binary);
if (!stabilizationMessage.ParseFromIstream(&input)) {
@@ -398,7 +398,7 @@ bool CVStabilization::_LoadStabilizedData(){
// Iterate over all frames of the saved message and assign to the data maps
for (size_t i = 0; i < stabilizationMessage.frame_size(); i++) {
const libopenshotstabilize::Frame& pbFrameData = stabilizationMessage.frame(i);
const pb_stabilize::Frame& pbFrameData = stabilizationMessage.frame(i);
// Load frame number
size_t id = pbFrameData.id();

2
src/CVStabilization.h
View File

@@ -129,7 +129,7 @@ class CVStabilization {
// Save stabilization data to protobuf file
bool SaveStabilizedData();
// Add frame stabilization data into protobuf message
void AddFrameDataToProto(libopenshotstabilize::Frame* pbFrameData, CamTrajectory& trajData, TransformParam& transData, size_t frame_number);
void AddFrameDataToProto(pb_stabilize::Frame* pbFrameData, CamTrajectory& trajData, TransformParam& transData, size_t frame_number);
// Return requested struct info for a given frame
TransformParam GetTransformParamData(size_t frameId);

14
src/CVTracker.cpp
View File

@@ -194,12 +194,12 @@ bool CVTracker::trackFrame(cv::Mat &frame, size_t frameId){
bool CVTracker::SaveTrackedData(){
// Create tracker message
libopenshottracker::Tracker trackerMessage;
pb_tracker::Tracker trackerMessage;
// Iterate over all frames data and save in protobuf message
for(std::map<size_t,FrameData>::iterator it=trackedDataById.begin(); it!=trackedDataById.end(); ++it){
FrameData fData = it->second;
libopenshottracker::Frame* pbFrameData;
pb_tracker::Frame* pbFrameData;
AddFrameDataToProto(trackerMessage.add_frame(), fData);
}
@@ -223,13 +223,13 @@ bool CVTracker::SaveTrackedData(){
}
// Add frame tracked data into protobuf message.
void CVTracker::AddFrameDataToProto(libopenshottracker::Frame* pbFrameData, FrameData& fData) {
void CVTracker::AddFrameDataToProto(pb_tracker::Frame* pbFrameData, FrameData& fData) {
// Save frame number and rotation
pbFrameData->set_id(fData.frame_id);
pbFrameData->set_rotation(0);
libopenshottracker::Frame::Box* box = pbFrameData->mutable_bounding_box();
pb_tracker::Frame::Box* box = pbFrameData->mutable_bounding_box();
// Save bounding box data
box->set_x1(fData.x1);
box->set_y1(fData.y1);
@@ -311,7 +311,7 @@ void CVTracker::SetJsonValue(const Json::Value root) {
// Load protobuf data file
bool CVTracker::_LoadTrackedData(){
// Create tracker message
libopenshottracker::Tracker trackerMessage;
pb_tracker::Tracker trackerMessage;
{
// Read the existing tracker message.
@@ -327,14 +327,14 @@ bool CVTracker::_LoadTrackedData(){
// Iterate over all frames of the saved message
for (size_t i = 0; i < trackerMessage.frame_size(); i++) {
const libopenshottracker::Frame& pbFrameData = trackerMessage.frame(i);
const pb_tracker::Frame& pbFrameData = trackerMessage.frame(i);
// Load frame and rotation data
size_t id = pbFrameData.id();
float rotation = pbFrameData.rotation();
// Load bounding box data
const libopenshottracker::Frame::Box& box = pbFrameData.bounding_box();
const pb_tracker::Frame::Box& box = pbFrameData.bounding_box();
float x1 = box.x1();
float y1 = box.y1();
float x2 = box.x2();

2
src/CVTracker.h
View File

@@ -134,7 +134,7 @@ namespace openshot
// Save protobuf file
bool SaveTrackedData();
// Add frame tracked data into protobuf message.
void AddFrameDataToProto(libopenshottracker::Frame* pbFrameData, FrameData& fData);
void AddFrameDataToProto(pb_tracker::Frame* pbFrameData, FrameData& fData);
/// Get and Set JSON methods
void SetJson(const std::string value); ///< Load JSON string into this object

6
src/effects/ObjectDetection.cpp
View File

@@ -131,7 +131,7 @@ void ObjectDetection::drawPred(int classId, float conf, cv::Rect2d box, cv::Mat&
// Load protobuf data file
bool ObjectDetection::LoadObjDetectdData(std::string inputFilePath){
// Create tracker message
libopenshotobjdetect::ObjDetect objMessage;
pb_objdetect::ObjDetect objMessage;
{
// Read the existing tracker message.
@@ -157,13 +157,13 @@ bool ObjectDetection::LoadObjDetectdData(std::string inputFilePath){
// Iterate over all frames of the saved message
for (size_t i = 0; i < objMessage.frame_size(); i++) {
// Create protobuf message reader
const libopenshotobjdetect::Frame& pbFrameData = objMessage.frame(i);
const pb_objdetect::Frame& pbFrameData = objMessage.frame(i);
// Get frame Id
size_t id = pbFrameData.id();
// Load bounding box data
const google::protobuf::RepeatedPtrField<libopenshotobjdetect::Frame_Box > &pBox = pbFrameData.bounding_box();
const google::protobuf::RepeatedPtrField<pb_objdetect::Frame_Box > &pBox = pbFrameData.bounding_box();
// Construct data vectors related to detections in the current frame
std::vector<int> classIds;

4
src/effects/Stabilizer.cpp
View File

@@ -114,7 +114,7 @@ std::shared_ptr<Frame> Stabilizer::GetFrame(std::shared_ptr<Frame> frame, int64_
bool Stabilizer::LoadStabilizedData(std::string inputFilePath){
// Create stabilization message
libopenshotstabilize::Stabilization stabilizationMessage;
pb_stabilize::Stabilization stabilizationMessage;
// Read the existing tracker message.
fstream input(inputFilePath, ios::in | ios::binary);
@@ -131,7 +131,7 @@ bool Stabilizer::LoadStabilizedData(std::string inputFilePath){
for (size_t i = 0; i < stabilizationMessage.frame_size(); i++) {
// Create stabilization message
const libopenshotstabilize::Frame& pbFrameData = stabilizationMessage.frame(i);
const pb_stabilize::Frame& pbFrameData = stabilizationMessage.frame(i);
// Load frame number
size_t id = pbFrameData.id();

6
src/effects/Tracker.cpp
View File

@@ -102,7 +102,7 @@ std::shared_ptr<Frame> Tracker::GetFrame(std::shared_ptr<Frame> frame, int64_t f
// Load protobuf data file
bool Tracker::LoadTrackedData(std::string inputFilePath){
// Create tracker message
libopenshottracker::Tracker trackerMessage;
pb_tracker::Tracker trackerMessage;
{
// Read the existing tracker message.
@@ -118,14 +118,14 @@ bool Tracker::LoadTrackedData(std::string inputFilePath){
// Iterate over all frames of the saved message
for (size_t i = 0; i < trackerMessage.frame_size(); i++) {
const libopenshottracker::Frame& pbFrameData = trackerMessage.frame(i);
const pb_tracker::Frame& pbFrameData = trackerMessage.frame(i);
// Load frame and rotation data
size_t id = pbFrameData.id();
float rotation = pbFrameData.rotation();
// Load bounding box data
const libopenshottracker::Frame::Box& box = pbFrameData.bounding_box();
const pb_tracker::Frame::Box& box = pbFrameData.bounding_box();
float x1 = box.x1();
float y1 = box.y1();
float x2 = box.x2();

8
src/protobuf_messages/objdetectdata.proto
View File

@@ -1,7 +1,7 @@
// [START declaration]
syntax = "proto3";
package libopenshotobjdetect;
package pb_objdetect;
import "google/protobuf/timestamp.proto";
// [END declaration]
@@ -9,7 +9,7 @@ import "google/protobuf/timestamp.proto";
// [START messages]
message Frame {
int32 id = 1; // Frame ID.
message Box{
float x = 1;
float y = 2;
@@ -24,9 +24,9 @@ message Frame {
message ObjDetect {
repeated Frame frame = 1;
google.protobuf.Timestamp last_updated = 2;
repeated string classNames = 3;
}
// [END messages]
// [END messages]

8
src/protobuf_messages/stabilizedata.proto
View File

@@ -1,7 +1,7 @@
// [START declaration]
syntax = "proto3";
package libopenshotstabilize;
package pb_stabilize;
import "google/protobuf/timestamp.proto";
// [END declaration]
@@ -9,8 +9,8 @@ import "google/protobuf/timestamp.proto";
// [START messages]
message Frame {
int32 id = 1; // Frame ID.
// TransformParam: frame smothed transformation
// TransformParam: frame smothed transformation
float dx = 2;
float dy = 3;
float da = 4;
@@ -25,7 +25,7 @@ message Frame {
message Stabilization {
repeated Frame frame = 1;
google.protobuf.Timestamp last_updated = 2;
}
// [END messages]

4
src/protobuf_messages/trackerdata.proto
View File

@@ -1,7 +1,7 @@
// [START declaration]
syntax = "proto3";
package libopenshottracker;
package pb_tracker;
import "google/protobuf/timestamp.proto";
// [END declaration]
@@ -23,7 +23,7 @@ message Frame {
message Tracker {
repeated Frame frame = 1;
google.protobuf.Timestamp last_updated = 2;
}
// [END messages]