Commit Graph

2166 Commits

Author SHA1 Message Date
Jonathan Thomas
a505f875d1 Refactoring timeline_frame_number out of apply_layer() and TimelineInfoStruct, we already have this data in scope (on the background frame instance) 2021-05-20 13:15:13 -05:00
Jonathan Thomas
441cb186f6 Refactor of global timeline effects, to address a regression with global/timeline Mask/Transitions no longer working correctly. This was caused by an optimization that broke the general behavior of the global transitions. 2021-05-18 14:25:36 -05: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
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
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
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
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
Frank Dana
fbc8a9b47b Normalize repo to LF (Unix) line-endings, enforce (#654)
- A top-level .gitattributes sets the attribute 'text=auto' for all
  files in the repo, enabling line-ending normalization
- A `git add --renormalize` run converted any existing CRLF files
  to the canonical LF format.
- 'text=auto' permits Git on Windows to convert files to CRLF
  automatically on checkout, for convenience. Any commits
  added will be converted back to the repo format for checkin.
2021-04-13 08:19:50 -04:00