Commit Graph

2580 Commits

Author SHA1 Message Date
Jonathan Thomas
d2c7e856bb Fixing invalid "end frame" calculation for clips (we were accidentally adding +1) to the last frame of every clip, causing a repeat of the clip's last frame.
For example, if a video had only 10 frames (video_length), timeline would calculate the start_frame as 1, and end_frame as 11, which is incorrect. It should use start_frame as 1, end_frame as 10.
2022-06-25 17:39:48 -05:00
Jonathan Thomas
d243db8aaa Adding new GetFrames method to CacheBase, to return an ordered vector of Frame objects. Useful when needing to iterate through the current cached frames. 2022-06-25 17:32:36 -05:00
Jonathan Thomas
5776efd71c Merge pull request #834 from OpenShot/fix-object-detector-class-name
Fix regression caused by Object Detector renamed to Object Detection
2022-06-22 14:27:01 -05:00
Jonathan Thomas
7355ac3c55 Fix regression caused by https://github.com/OpenShot/libopenshot/pull/827, where we changed the class_name of Object Detector 2022-06-21 11:30:30 -05:00
Frank Dana
7c6fcb0c51 Merge pull request #828 from ferdnyc/catch-upgrade
Make unit tests work with Catch2v3 (for macOS CI)
2022-06-18 05:53:35 -04:00
dependabot[bot]
54c9650599 Bump actions/cache from 2 to 3.0.1 (#821)
Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.0.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2...v3.0.1)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-18 05:28:07 -04:00
FeRD (Frank Dana)
6c5ffe1c1d HACK: 'using namespace Catch' in v3 header 2022-06-18 04:45:50 -04:00
FeRD (Frank Dana)
190bd915be Catch2v3: Use catch_all header 2022-06-18 04:21:58 -04:00
FeRD (Frank Dana)
677ed5f591 Tests: Switch test files to openshot_catch.h 2022-06-17 15:37:51 -04:00
FeRD (Frank Dana)
159d4fc629 tests/CMakeLists: Handle Catch2 v2 vs. v3 2022-06-17 15:37:51 -04:00
FeRD (Frank Dana)
6db5f14139 Update catch_main.cpp (only for Catch2v2) 2022-06-17 15:37:47 -04:00
FeRD (Frank Dana)
5ae7112494 Catch2: Header templates for tests
Since Catch2 v3.0+ uses a vasty different organization for headers
and targets, we have two templates for what the unit test code
will include. One or the other is configure by CMake as the file
openshot_catch.h in the build directory, and all of the unit test
sources can include that instead.
2022-06-17 15:37:15 -04:00
Frank Dana
957d4f6a06 Fix class_name for Tracker and ObjectDetection (#827)
Effect class name is used when introspecting the available effects
for a given build of libopenshot, for example when extracting
translation strings for OpenShot. The EffectInfo::class_name member
needs to match the name of the class it describes, which two of ours
did not.

- ObjectDetection had its class name set to "Object Detector", which
  obviously isn't the class name.
- Tracker, worse, was allowing class_name to be **SET** from the
  JSON parameters passed to its SetJSON() method, making the class
  name mutable at the whim of the class's callers.
2022-06-17 15:30:08 -04:00
Jonathan Thomas
664c5db821 Merge pull request #825 from OpenShot/fix-boosting-tracker
Fix CVTracker to use INT values for the Rect2d bounding box
2022-05-13 16:08:15 -05:00
Jonathan Thomas
eced60545a Update CVTracker unit test, since we've rounded bounding coordinates, we need to update the expected value in our unit test. Seems close enough to be a rounding error onw. 2022-05-13 14:55:58 -05:00
Jonathan Thomas
8ffcc36cfc Ensure CVTracker bbox uses INT values for it's Rect2d bounding box, and not float. The floats are killing the BOOSTING detector. 2022-05-12 23:55:32 -05:00
JacksonRG
50a9a648c5 Merge pull request #819 from OpenShot/time-keyframes-mk2
Apply time keyframes to the correct clip frame number
2022-05-02 13:33:37 -05:00
jackson
7ebe9a9b75 Adding comment for clarity. 2022-04-29 12:55:50 -05:00
jackson
5ac659a16f Correct the frame number after mapping frame 2022-04-29 12:55:50 -05:00
jackson
7b6df2093d Apply keyframes based on the frame of the clip, rather than frame of the file. 2022-04-29 12:55:50 -05:00
dependabot[bot]
a956c1a98b Bump codecov/codecov-action from 2.1.0 to 3.1.0 (#823)
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 2.1.0 to 3.1.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v2.1.0...v3.1.0)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-27 13:18:39 -04:00
Frank Dana
d909eccdf6 python/openshot.i: Convert to 4-space indents (#820) 2022-04-03 00:45:08 -04:00
JacksonRG
04db6ce801 Merge pull request #817 from OpenShot/revert-815-fix-time-keyframes
Revert "Only map key numbers to time once"
2022-03-21 22:43:05 -05:00
JacksonRG
0bf991601d Revert "Only map key numbers to time once" 2022-03-21 19:23:35 -05:00
JacksonRG
a505443283 Merge pull request #815 from OpenShot/fix-time-keyframes
Only map key numbers to time once
2022-03-21 17:58:29 -05:00