forked from freebsd/freebsd-ports
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add the openshot updates I somehow missed.
PR: 253643, 253645
- Loading branch information
1 parent
5c7b2bd
commit 6ec4389
Showing
9 changed files
with
113 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1599883200 | ||
| SHA256 (OpenShot-libopenshot-audio-v0.2.0-14-g12ddb3d_GH0.tar.gz) = 59a9afaca1eb52bb9a89fb3825b9cb45e833b4ecaed785b4e61f2621920bc632 | ||
| SIZE (OpenShot-libopenshot-audio-v0.2.0-14-g12ddb3d_GH0.tar.gz) = 1720267 | ||
| TIMESTAMP = 1613703600 | ||
| SHA256 (OpenShot-libopenshot-audio-v0.2.0-29-gcdfe5a1_GH0.tar.gz) = ac50e8f79440b365121e9c59644e33f25c174e4d2c5418b7e8fa9b011b7b5723 | ||
| SIZE (OpenShot-libopenshot-audio-v0.2.0-29-gcdfe5a1_GH0.tar.gz) = 1720976 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1599886800 | ||
| SHA256 (OpenShot-libopenshot-v0.2.5-172-gac8966a_GH0.tar.gz) = d90d146d167108eab98dbf1aadce564267c2f6741e2836501e25f3037f4b3b9c | ||
| SIZE (OpenShot-libopenshot-v0.2.5-172-gac8966a_GH0.tar.gz) = 10305575 | ||
| TIMESTAMP = 1613703600 | ||
| SHA256 (OpenShot-libopenshot-v0.2.5-517-gdd2735e_GH0.tar.gz) = 9802d9cf3fbd32d899828a1c0175053953f513300fdc426606a8d10fe510a42c | ||
| SIZE (OpenShot-libopenshot-v0.2.5-517-gdd2735e_GH0.tar.gz) = 22454598 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,15 @@ | ||
| --- src/CMakeLists.txt.orig 2020-09-11 02:37:02 UTC | ||
| --- src/CMakeLists.txt.orig 2021-02-18 07:59:16 UTC | ||
| +++ src/CMakeLists.txt | ||
| @@ -384,7 +384,13 @@ if (TARGET RESVG::resvg) | ||
|
|
||
| @@ -415,6 +415,12 @@ if(ENABLE_OPENCV) | ||
| endif() | ||
| add_feature_info("OpenCV algorithms" ENABLE_OPENCV "Use OpenCV algorithms") | ||
|
|
||
| +find_library(EXECINFO_LIBRARY NAMES execinfo) | ||
| +if(NOT EXECINFO_LIBRARY) | ||
| + message(FATAL_ERROR "${EXECINFO_LIBRARY}") | ||
| +endif(NOT EXECINFO_LIBRARY) | ||
| ############### LINK LIBRARY ################# | ||
| +target_link_libraries(openshot PUBLIC ${EXECINFO_LIBRARY}) | ||
| + | ||
| ############### LINK LIBRARY ################# | ||
| # Link remaining dependency libraries | ||
| target_link_libraries(openshot PUBLIC | ||
| ${LIBOPENSHOT_AUDIO_LIBRARIES} | ||
| if(DEFINED PROFILER) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| --- src/CVTracker.cpp.orig 2021-02-18 07:59:16 UTC | ||
| +++ src/CVTracker.cpp | ||
| @@ -46,20 +46,20 @@ CVTracker::CVTracker(std::string processInfoJson, Proc | ||
|
|
||
| // Set desirable tracker method | ||
| cv::Ptr<cv::Tracker> CVTracker::selectTracker(std::string trackerType){ | ||
| - cv::Ptr<cv::Tracker> t; | ||
| + cv::Ptr<cv::Tracker> t = nullptr; | ||
|
|
||
| - if (trackerType == "BOOSTING") | ||
| - t = cv::TrackerBoosting::create(); | ||
| +// if (trackerType == "BOOSTING") | ||
| +// t = cv::TrackerBoosting::create(); | ||
| if (trackerType == "MIL") | ||
| t = cv::TrackerMIL::create(); | ||
| if (trackerType == "KCF") | ||
| t = cv::TrackerKCF::create(); | ||
| - if (trackerType == "TLD") | ||
| - t = cv::TrackerTLD::create(); | ||
| - if (trackerType == "MEDIANFLOW") | ||
| - t = cv::TrackerMedianFlow::create(); | ||
| - if (trackerType == "MOSSE") | ||
| - t = cv::TrackerMOSSE::create(); | ||
| +// if (trackerType == "TLD") | ||
| +// t = cv::TrackerTLD::create(); | ||
| +// if (trackerType == "MEDIANFLOW") | ||
| +// t = cv::TrackerMedianFlow::create(); | ||
| +// if (trackerType == "MOSSE") | ||
| +// t = cv::TrackerMOSSE::create(); | ||
| if (trackerType == "CSRT") | ||
| t = cv::TrackerCSRT::create(); | ||
|
|
||
| @@ -163,12 +163,14 @@ bool CVTracker::initTracker(cv::Mat &frame, size_t fra | ||
| // Update the object tracker according to frame | ||
| bool CVTracker::trackFrame(cv::Mat &frame, size_t frameId){ | ||
| // Update the tracking result | ||
| - bool ok = tracker->update(frame, bbox); | ||
| + cv::Rect bboxi = bbox; | ||
| + bool ok = tracker->update(frame, bboxi); | ||
|
|
||
| // Add frame number and box coords if tracker finds the object | ||
| // Otherwise add only frame number | ||
| if (ok) | ||
| { | ||
| + bbox = bboxi; | ||
| float fw = frame.size().width; | ||
| float fh = frame.size().height; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters