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

Added thread runner with pre-processing effects

Browse Source 
Also integrated a basic the tracker Effect with the UI, changed the effect creation to use Json messages, and added the ProcessingController class to handle thread communication
This commit is contained in:
Brenno
2020-07-16 21:10:02 -03:00
parent d6e0a69c1f
commit d0ce70fdc0
18 changed files with 688 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
src/examples/Example_opencv.cpp
View File

@@ -42,38 +42,38 @@
using namespace openshot;
// using namespace cv;
void displayTrackedData(openshot::Clip &r9){
// Opencv display window
cv::namedWindow("Display Image", cv::WINDOW_NORMAL );
// void displayTrackedData(openshot::Clip &r9){
// // Opencv display window
// cv::namedWindow("Display Image", cv::WINDOW_NORMAL );
// Create Tracker
CVTracker kcfTracker;
// Load saved data
if(!kcfTracker.LoadTrackedData("kcf_tracker.data")){
std::cout<<"Was not possible to load the tracked data\n";
return;
}
// // Create Tracker
// CVTracker kcfTracker;
// // Load saved data
// if(!kcfTracker.LoadTrackedData("kcf_tracker.data")){
// std::cout<<"Was not possible to load the tracked data\n";
// return;
// }
for (long int frame = 1200; frame <= 1600; frame++)
{
int frame_number = frame;
std::shared_ptr<openshot::Frame> f = r9.GetFrame(frame_number);
// for (long int frame = 1200; frame <= 1600; frame++)
// {
// int frame_number = frame;
// std::shared_ptr<openshot::Frame> f = r9.GetFrame(frame_number);
// Grab Mat image
cv::Mat cvimage = f->GetImageCV();
// // Grab Mat image
// cv::Mat cvimage = f->GetImageCV();
FrameData fd = kcfTracker.GetTrackedData(frame_number);
cv::Rect2d box(fd.x1, fd.y1, fd.x2-fd.x1, fd.y2-fd.y1);
cv::rectangle(cvimage, box, cv::Scalar( 255, 0, 0 ), 2, 1 );
// FrameData fd = kcfTracker.GetTrackedData(frame_number);
// cv::Rect2d box(fd.x1, fd.y1, fd.x2-fd.x1, fd.y2-fd.y1);
// cv::rectangle(cvimage, box, cv::Scalar( 255, 0, 0 ), 2, 1 );
cv::imshow("Display Image", cvimage);
// Press ESC on keyboard to exit
char c=(char)cv::waitKey(25);
if(c==27)
break;
}
// cv::imshow("Display Image", cvimage);
// // Press ESC on keyboard to exit
// char c=(char)cv::waitKey(25);
// if(c==27)
// break;
// }
}
// }
void displayClip(openshot::Clip &r9){
@@ -99,32 +99,85 @@ void displayClip(openshot::Clip &r9){
int main(int argc, char* argv[]) {
bool TRACK_DATA = false;
bool LOAD_TRACKED_DATA = false;
bool SMOOTH_VIDEO = true;
bool LOAD_SMOOTH_DATA = false;
// bool TRACK_DATA = true;
// bool LOAD_TRACKED_DATA = false;
// bool SMOOTH_VIDEO = false;
// bool LOAD_SMOOTH_DATA = false;
// bool OBJECT_DETECTION_DATA = false;
// bool LOAD_OBJECT_DETECTION = false;
// std::string input_filepath = TEST_MEDIA_PATH;
// input_filepath = "../../src/examples/test.avi";
std::string input_filepath = TEST_MEDIA_PATH;
input_filepath = "../../src/examples/test.avi";
// openshot::Clip r9(input_filepath);
// r9.Open();
openshot::Clip r9(input_filepath);
r9.Open();
// if(TRACK_DATA)
// // ClipProcessingJobs clipProcessing("Track", r9);
// if(LOAD_TRACKED_DATA){
// /***/
// }
// if(SMOOTH_VIDEO)
// // ClipProcessingJobs clipProcessing("Stabilize", r9);
// if(LOAD_SMOOTH_DATA){
// /***/
// }
// if(OBJECT_DETECTION_DATA){
// // CVObjectDetection objectDetection("GPU");
// // objectDetection.ProcessClip(r9);
// }
// displayClip(r9);
if(TRACK_DATA)
ClipProcessingJobs clipProcessing("Track", r9);
if(LOAD_TRACKED_DATA){
/***/
}
if(SMOOTH_VIDEO)
ClipProcessingJobs clipProcessing("Stabilize", r9);
if(LOAD_SMOOTH_DATA){
/***/
}
displayClip(r9);
// // Close timeline
// r9.Close();
// // Create a video clip
// std::stringstream path;
// path << TEST_MEDIA_PATH << "test.avi";
// // Open clip
// openshot::Clip c1(path.str());
// c1.Open();
// // Create first tracker
// CVStabilization stabilizer("{\"protobuf_data_path\": \"\", \"tracker_type\": \"KCF\", \"bbox\": {\"x\": 294, \"y\": 102, \"w\": 180, \"h\": 166}}");
// // Track clip for frames 0-20
// stabilizer.stabilizeClip(c1, 0, 20+1, true);
// // Create empty rotation matrix
// for(long int frame_number=0; frame_number<=20; frame_number++){
// cv::Mat frame_image = c1.GetFrame(frame_number)->GetImageCV();
// cv::Mat T(2,3,CV_64F);
// // Get tracked data
// TransformParam tp = stabilizer.GetTransformParamData(frame_number);
// CamTrajectory ct = stabilizer.GetCamTrajectoryTrackedData(frame_number);
// // Set rotation matrix values
// T.at<double>(0,0) = cos(tp.da);
// T.at<double>(0,1) = -sin(tp.da);
// T.at<double>(1,0) = sin(tp.da);
// T.at<double>(1,1) = cos(tp.da);
// T.at<double>(0,2) = tp.dx;
// T.at<double>(1,2) = tp.dy;
// // Apply rotation matrix to image
// cv::Mat frame_stabilized;
// cv::warpAffine(frame_image, frame_stabilized, T, frame_image.size());
// // Scale up the image to remove black borders
// cv::Mat T_scale = cv::getRotationMatrix2D(cv::Point2f(frame_stabilized.cols/2, frame_stabilized.rows/2), 0, 1.04);
// cv::warpAffine(frame_stabilized, frame_stabilized, T_scale, frame_stabilized.size());
// std::cout<<tp.dx<<" "<<tp.dy<<" "<<tp.da<<" "<<ct.x<<" "<<ct.y<<" "<<ct.a<<std::endl;
// cv::imshow("teste", frame_stabilized);
// cv::waitKey(25);
// }
// cv::destroyAllWindows();
// Close timeline
r9.Close();
std::cout << "Completed successfully!" << std::endl;