26 Commits

Author SHA1 Message Date
FeRD (Frank Dana)
59108504e3 Code changes for compatibility with JUCE 6.x
- Replace all juce::CriticalSection with std::recursive_mutex
- Replace all juce::AudioSampleBuffer with juce::AudioBuffer<float>
- Eliminate implicit reliance on 'using namespace juce;'
- Replace OpenShotAudio.h includes with targeted juce modules
2021-11-09 06:22:25 -05:00
FeRD (Frank Dana)
7ac54f05cc Fold libopenshot_protobuf into libopenshot
- Move .proto files to src/ dir (not src/protobuf_messages)
- Generate protobuf files in src/CMakeLists.txt and include in
  'openshot' library target
- Don't install generated *.pb.h headers, which are now private
2021-10-17 23:31:02 -04:00
Frank Dana
59138ea3e4 Adopt license management via Reuse project/tool (#711)
* reuse-managed license/copyright headers

reuse is a tool for compliance with the REUSE recommendations. See
<https://reuse.software/> for more information, and
<https://reuse.readthedocs.io/> for the online documentation.

* Set jsoncpp license
* Add MIT license for Decklink sources
* Explicitly license examples/
  - Add headers to source files
  - Change blanket licensing in .reuse/dep5 to only cover binary media
  - Import CC-BY-3.0 license and assign to sintel_trailer
2021-10-16 01:26:26 -04:00
Brenno A. C. Caldato
461a0307a8 Merge pull request #674 from OpenShot/fix-saving
Changed JSON communication for detected objects
2021-05-19 11:56:20 -03:00
Brenno
e2b51da442 Fixed missing detection in the first frame 2021-05-19 11:45:09 -03: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
Brenno
f491d585fc Added author and added licence in ClipProcessingJobs 2021-04-20 23:07:23 -03:00
Brenno
77aa418353 Fixed FPS ToInt() conversion and changed initial frame number to 1 2021-04-15 21:52:02 -03:00
FeRD (Frank Dana)
c8c92b5c5d Merge branch 'develop' into effect-parenting 2021-04-10 19:26:22 -04:00
Jonathan Thomas
a972995308 Removing some debug logging related to opencv effects 2021-04-08 22:36:28 -05:00
Brenno
32a217eda7 Added support to attach clip to detected object (ObjectDetection) effect
This feature let's the user attach a clip to an object detected by the Object Detection effect, in the same way it is done with the Tracker Effect.
2021-01-22 19:28:16 -03:00
Brenno
d481e5a75b Fixed codacy review warnings 2021-01-19 16:32:50 -03:00
Brenno
f8198d668f Fixed codacy review warnings 2021-01-19 15:28:33 -03:00
Brenno
f6de53350f Minor fixes
- Moved TimeUtil from header to src
- Fixed issue with Qimage -> Mat conversion
2021-01-13 20:22:17 -03:00
FeRD (Frank Dana)
da02180c79 Rename protobuf packages to pb_foo 2021-01-13 13:36:15 -05:00
FeRD (Frank Dana)
d71631a6c7 OpenCV: Move 'using ns std', scrub whitespace 2021-01-13 12:08:39 -05:00
Brenno
2bd6bd4456 Improved error handling for effect pre-processing 2020-11-05 11:17:03 -03:00
Brenno
3f63b2c638 Added error message handling for ClipProcessingJob 2020-11-01 20:02:46 -03:00
Brenno
b48025cd1f Apply suggestions from code review
Applying suggestions from @jonoomph
2020-10-29 00:21:28 -03:00
Brenno
a9274df96b Resolving conflicts 2020-10-20 01:04:59 -03:00
Brenno
6ca35bbf9b Fixed Stabilizer and created Object Detector tests 2020-07-30 21:39:20 -03:00
Brenno
58d2e8fe07 Improved SORT algorithm and fixed bug when cutting clips 2020-07-29 19:56:44 -03:00
Brenno
a8d877cb3b Changed bounding box draw in Object Detector effect 2020-07-29 18:50:11 -03:00
Brenno
483f2883c9 Added normalized bboxes for tracker and object detector
Also added tests for ObjectDetection and several bug fixes
2020-07-28 21:01:57 -03:00