24 Commits

Author SHA1 Message Date
Brenno
d9e4f0450e Disabling Examples_opencv because it needs a deep refactor 2021-05-17 12:03:18 -03:00
Brenno
4d9d6ece9a Merge remote-tracking branch 'origin/develop' into effect-parenting 2021-04-21 13:34:49 -03: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
FeRD (Frank Dana)
d73da93fb5 Don't use OpenShot.h in OpenCV example 2021-04-18 00:32:03 -04:00
FeRD (Frank Dana)
c6aae47d50 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.
2021-04-17 21:28:43 -04:00
Brenno
99b5d1e7ab Fixed variable names and comments
thanks to Frank Dana
2021-04-12 21:18:21 -03:00
FeRD (Frank Dana)
c8c92b5c5d Merge branch 'develop' into effect-parenting 2021-04-10 19:26:22 -04:00
FeRD (Frank Dana)
8227a91502 Timeline: Add constructor accepting ReaderInfo 2021-03-31 20:20:16 -04:00
Brenno
8b861f0ff3 Merge remote-tracking branch 'origin/develop' into effect-parenting 2021-03-02 20:35:25 -03:00
Jonathan Thomas
8280e20aa5 Implementing Codacy improvements, removing some unused or pointless code 2021-02-18 18:07:07 -06:00
Jonathan Thomas
3daa5bdb7b Large refactor of OpenMP integration (or rather the removal of OpenMP on the Timeline and FFmpeg-related classes). The logic behind this decision, was based on profiling libopenshot and the amount of wasted CPU idle time on all the various threads. The slow code is still synchronous, and all the threads must wait on each other, adding additional overhead. So, removing lots of unneeded threads, and simplifying the underlying Timeline->Clip->FFmpegReader flow. Also, removed 2 calls to QPainter::drawImage, by improving the flexibility of Clip->GetFrame. 2021-02-17 19:44:44 -06:00
Jonathan Thomas
0c4e1bcce4 Improving performance after working with google-prof, to profile CPU. Calling OMP_MP_NUM_PROCESSORS less often, since it's quite expensive according to profiling. Adjusting Timeline final_cache to match the video caching thread max_frames, so one doesn't clobber the other. Also, fixing an issue with openshot-player, where a video file with no audio skips horribly. 2021-02-04 17:28:07 -06:00
Brenno
c0c2a82336 Merge branch 'develop' into keyframe-refactor 2021-02-01 14:22:41 -03:00
Jonathan Thomas
47afa205c7 Merge pull request #585 from OpenShot/opencv
3 New OpenCV Effects (Tracker, Stabilization, and Object Detection)
2021-01-28 17:28:15 -06:00
Jonathan Thomas
ea9e774f1e Fixing a big issue where SVG files are not correctly scaled to larger resolutions, for cases where the default size is smaller than the Timeline size (or preview size). Now SVG files are rescaled/re-rasterized larger when needed, and otherwise cached. 2021-01-28 15:46:39 -06:00
Brenno
a9d783c106 Updated include path on opencv examples 2020-11-28 18:01:58 -03:00
Brenno
1933d887e9 Fixed opencv example compilation on cmake 2020-11-28 18:00:38 -03:00
Brenno
01c9397b03 Merge remote-tracking branch 'origin/develop' into opencv 2020-10-27 21:30:24 -03:00
Jonathan Thomas
9495d1d729 Removing invalid ICC sRGB color profile from these PNG used in unit tests (which throw warnings) 2020-10-23 00:02:04 -05:00
Brenno
a9274df96b Resolving conflicts 2020-10-20 01:04:59 -03:00
FeRD (Frank Dana)
b0e406be49 Fix Ruby example script bug
Ruby: Relax SWIG version for compatibility check

- Turns out the Ruby-2.7.0-compatibility commit made it into SWIG 4.0.2

Ruby bindings: Fix all kinds of brokenness

- Turns out int64_t function args require stdint.i for auto-conversion.
- The imported module name is (still) 'Openshot' — lowercase 's'.
- #TIL that accidentally dropping the OUTPUT_NAME config leads to
  a non-loadable shared library, due to the filename being wrong.
2020-10-18 07:49:24 -04:00
FeRD (Frank Dana)
0fe29540b2 Examples: Add new CMakeLists.txt for directory 2020-10-18 07:49:24 -04:00
FeRD (Frank Dana)
68ed2602b2 Examples: Update include paths 2020-10-18 07:47:36 -04:00
FeRD (Frank Dana)
a6441d822d Reorganize source tree (headers in src/)
- src/bindings/ moves to /bindings/
- src/examples/ moves to /examples/
- Contents of include/ merged into src/ with same hierarchy
- src/Qt/demo/ moves to examples/qt-demo/
2020-10-18 05:05:29 -04:00