Commit Graph

335 Commits

Author SHA1 Message Date
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
Brenno
4d9d6ece9a Merge remote-tracking branch 'origin/develop' into effect-parenting 2021-04-21 13:34:49 -03:00
Brenno
f491d585fc Added author and added licence in ClipProcessingJobs 2021-04-20 23:07:23 -03:00
FeRD (Frank Dana)
317c0be0c0 Tests: Switch to standard BUILD_TESTING variable 2021-04-19 17:56:19 -04:00
FeRD (Frank Dana)
89b1643e9f Tests: Shorten some crazy long test names 2021-04-19 17:25:06 -04:00
FeRD (Frank Dana)
00caff07fb CMake: Add separate unit test targets
Each unit test file ClassName.cpp, which results in the creation
of a test target openshot-ClassName-test, will now also be labeled
with the CTest label ClassName, and a target ClassName_coverage
will be generated that runs only the tests in that file.

This is especially useful when developing tests for a class, as
the tests in the class being worked on can be re-run without
having to wait a minute or more while the other tests run.
2021-04-19 17:02:19 -04:00
Frank Dana
4e4a95c648 Gitlab-CI: Update Windows builder configs, OpenShotAudio linking; enable Windows unit tests (#657)
* Remove no-longer-used cmake Modules

* Don't use OpenShot.h in ExampleHtml.cpp

When `#include`-ing the whole mess, building the file was leading
to what looked like out-of-memory errors. Replacing the monolithic
header with just the necessary ones cleared it up.

* .gitlab-ci.yml: Update for new Windows setup

* Make unit tests work under Windows

- Copying the built and depended (libopenshot-audio) DLLs into
  the unit test dir before building the tests ensures that when
  the test executables are run by the Catch.cmake module to
  discover their contents, the executables will find the DLLs
  they need in order to run.

* Gitlab-ci: Run unit tests on Windows

* Rename openshot-html-example

(The former name, openshot-html-test, was too close to the new
name format for all of our unit test executables, making things
unnecessarily confusing.)

* Rename JuceHeader.h to OpenShotAudio.h

* Github Actions: Install ALSA libs

With the switch to an EXPORTED CMake configuration for
libopenshot-audio, its dependencies become our dependencies.
Which means that CMake now correctly requires that the ALSA
libs be installed.
2021-04-19 15:59:52 -04:00
Frank Dana
51dde6602b tests: Make ImageWriter tests optional (#659)
Just like the OpenCV tests require OpenCV, the ImageWriter tests
require that ImageMagick be enabled in the build. If it isn't,
skip those tests.
2021-04-19 15:26:10 -04:00
Frank Dana
7a6ff7c055 CMake: Properly enable unit tests (#658) 2021-04-19 13:57:13 -04:00
Frank Dana
3457ffcc7e Properly handle unavailable Catch2 (#656) 2021-04-16 11:16:55 -04:00
Brenno
2c9d2f2a32 OpenCV is again an optional dependency 2021-04-15 22:05:35 -03:00
Brenno
77aa418353 Fixed FPS ToInt() conversion and changed initial frame number to 1 2021-04-15 21:52:02 -03:00
Brenno
2cf2c55f9b Changed None to empty string, corrected dynamic pointers 2021-04-12 21:32:27 -03:00
Brenno
a7cefa4bd2 Removed namespaces, iostream library and added TrackedObject test 2021-04-12 21:22:58 -03:00
Brenno
99b5d1e7ab Fixed variable names and comments
thanks to Frank Dana
2021-04-12 21:18:21 -03:00
FeRD (Frank Dana)
d1d9293870 tests/KeyFrame: Split a CHECK(), for readability 2021-04-11 23:52:35 -04:00
Frank Dana
cd22b0681b tests/KeyFrame.cpp: Typo 2021-04-10 23:54:29 +00:00
Frank Dana
93306a42a8 tests/KeyFrame.cpp: Typo 2021-04-10 23:54:11 +00:00
FeRD (Frank Dana)
c8c92b5c5d Merge branch 'develop' into effect-parenting 2021-04-10 19:26:22 -04:00
FeRD (Frank Dana)
2255852483 Merge branch 'develop' into catch-tests 2021-04-09 06:30:38 -04:00
Frank Dana
982558ecfd Merge pull request #652 from ferdnyc/timeline-readerinfo-constructor
Timeline: Add a new constructor that takes a ReaderInfo struct and copies parameters
2021-04-09 06:28:05 -04:00
FeRD (Frank Dana)
0d69fa189c tests/CV*: Fix opening comment 2021-04-09 06:22:20 -04:00
FeRD (Frank Dana)
a07fca58c3 tests/CacheDisk: Use separate path for each test 2021-04-09 05:56:18 -04:00
FeRD (Frank Dana)
3c4ed5da6f tests/FrameMapper: Variables fixes
- Don't use ALLCAPS for actual variables
- Make constant values `const`
2021-04-09 05:27:45 -04:00