Commit Graph

2252 Commits

Author SHA1 Message Date
Brenno
2e8ff3b982 Added TrackedObjectBBox to python bindings 2021-05-17 11:38:45 -03:00
Brenno
4362c5fd15 Included AVresample outside if statement
Small reversion on @ferdync changes because the if statement is not working on my setup
2021-05-17 11:38:24 -03:00
Brenno
466755e526 Merge remote-tracking branch 'origin/develop' into effect-parenting 2021-05-11 12:44:38 -03:00
Brenno
40124b18c4 Merge remote-tracking branch 'origin/effect-parenting' into effect-parenting 2021-05-08 20:41:16 -03:00
Frank Dana
6a004ed919 Fix counting of points for color effects (#666) 2021-05-06 14:27:52 -04:00
Frank Dana
56a6921354 CI,bionic: Work around broken libzmq5 dep (#671) 2021-05-06 14:26:12 -04:00
Frank Dana
d54e1aa673 Merge branch 'develop' into effect-parenting 2021-05-04 07:58:43 -04:00
Frank Dana
813c5175ca OpenCV: Adapt to API changes in OpenCV 4.5.2+ (#639)
* CVTracker: Handle API changes in OpenCV
The former cv::Tracker API we've been using is now cv::legacy::Tracker,
starting in OpenCV 4.5.1.

* CVTracker: Move some includes, add std:: prefixes

* Move ClipProcessingJobs into openshot NS

* OpenCV 4.5.1 message and auto-disabling

* Add fstream includes, explicit std:: namespace
Work around a MacOS bug where bare fstream resolves to the wrong class.

Co-authored-by: Brenno <brenno.caldato@gmail.com>
Co-authored-by: Brenno A. C. Caldato <BrennoCaldato@users.noreply.github.com>
2021-05-04 07:33:47 -04:00
Frank Dana
aa57219eb9 Merge pull request #668 from ferdnyc/deps-reduction
Reduce dependencies by eliminating unnecessary components
2021-04-28 20:10:41 -07:00
FeRD (Frank Dana)
1f05c5f102 CMake: Build bundled jsoncpp as an OBJECT library
Avoids having to recompile it for every target.
2021-04-28 22:58:41 -04:00
FeRD (Frank Dana)
ed4edc4c8b Don't link with ImageMagick MagickWand (not used) 2021-04-28 22:39:25 -04:00
FeRD (Frank Dana)
718604885b FFmpeg: Reduce overlinking
- We don't make use of any part of avdevice, avfilter, or postproc, so
  remove all of those from the package COMPONENTS list.
- In addition, the deprecated avresample will only be linked/used if
  swresample is not present on the system.
2021-04-28 22:38:50 -04:00
Frank Dana
3d804c40cf Rename version_info files to NAME.env (#665) 2021-04-28 16:44:43 -04:00
Brenno
7a9d196d8c Fixed missing parent clip in TrackedObjectBoundingbox 2021-04-26 11:49:21 -03:00
Frank Dana
a00bbb7698 Merge pull request #664 from ferdnyc/defense-against-the-dark-opencv451
Downgrade OpenCV 4.5.1 msg to WARNING
2021-04-24 11:51:54 -07:00
FeRD (Frank Dana)
3a4f2aec24 Downgrade OpenCV 4.5.1 msg to WARNING 2021-04-24 14:14:18 -04:00
Frank Dana
5f617d09dd Merge pull request #663 from ferdnyc/defense-against-the-dark-opencv451
Defense Against the Dark OpenCV 4.5.1
2021-04-23 20:28:41 -07:00
FeRD (Frank Dana)
acda566166 Add OPENCV_VERSION_STR to library symbols 2021-04-23 23:07:09 -04:00
FeRD (Frank Dana)
eef960a269 CMake: Reject OpenCV 4.5.1, prepare for 4.5.2+ 2021-04-23 23:04:05 -04:00
FeRD (Frank Dana)
52f2b33294 Remove mistakenly-added file 2021-04-21 20:39:54 -04:00
Brenno
f412cae5c6 small fix 2021-04-21 13:46:10 -03:00
Brenno
4d9d6ece9a Merge remote-tracking branch 'origin/develop' into effect-parenting 2021-04-21 13:34:49 -03:00
Brenno
0b8481f335 Fixed aspect ratio and off-center displacement when attaching a clip to a tracked object 2021-04-20 23:09:07 -03:00
Brenno
f491d585fc Added author and added licence in ClipProcessingJobs 2021-04-20 23:07:23 -03:00
Frank Dana
0e1b8d6664 Merge pull request #660 from ferdnyc/individual-class-tests
CMake: Add separate unit test targets
2021-04-19 18:13:02 -04:00