Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3 New OpenCV Effects (Tracker, Stabilization, and Object Detection) #585

Merged
merged 82 commits into from
Jan 28, 2021
Merged

3 New OpenCV Effects (Tracker, Stabilization, and Object Detection) #585

merged 82 commits into from
Jan 28, 2021

Commits on Jun 26, 2020

  1. implemented KCF fracker class and included opencv in cmake

    @BrennoCaldato
    BrennoCaldato committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    ae48651 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2020

  1. integrated Qimage to Mat conversion into Frame

    @BrennoCaldato
    BrennoCaldato committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    4364e18 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'OS-4-include-opencv-in-cmake' into develop

    @BrennoCaldato
    BrennoCaldato committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    622c6a8 View commit details
    Browse the repository at this point in the history

  3. Added protobuf dependency to load and save CVtracker data

    @BrennoCaldato
    BrennoCaldato committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    aba2765 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'OS-4-include-opencv-in-cmake' into develop

    @BrennoCaldato
    BrennoCaldato committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    fed81da View commit details
    Browse the repository at this point in the history

  5. finished adding protobuf message to CVTracker class

    @BrennoCaldato
    BrennoCaldato committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    1ebad2c View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2020

  1. Included unit tests for Frame and CVTracker

    @BrennoCaldato
    BrennoCaldato committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    4f42a62 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. Implemented CVStabilization, removed cv namespace

    @BrennoCaldato
    BrennoCaldato committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    a85e45b View commit details
    Browse the repository at this point in the history

  2. bug fixes

    @BrennoCaldato
    BrennoCaldato committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    b7e5fb7 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2020

  1. modified cmake to include OpenCV and Protobuf as optional dependencies

    @BrennoCaldato
    BrennoCaldato committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    791961c View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2020

  1. included CVStabilization into Clip

    @BrennoCaldato
    BrennoCaldato committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    fc8d4d1 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. Included Tracker as an effect

    @BrennoCaldato
    BrennoCaldato committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    0ef77af View commit details
    Browse the repository at this point in the history

  2. created protobuf message for Stabilization Effect

    @BrennoCaldato
    BrennoCaldato committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    a85ab29 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. Added Stabilize Effect

    @BrennoCaldato
    BrennoCaldato committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    c60236a View commit details
    Browse the repository at this point in the history

  2. Added code comments and minor changes 

    Added map instead of vector in the Stabilizer, removed unnecessary code and improved documentation
    @BrennoCaldato
    BrennoCaldato committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    6d54765 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2020

  1. improved the stabilize effect integration

    @BrennoCaldato
    BrennoCaldato committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    d6e0a69 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2020

  1. Added thread runner with pre-processing effects 

    Also integrated a basic the tracker Effect with the UI, changed the effect creation to use Json messages, and added the ProcessingController class to handle thread communication
    @BrennoCaldato
    BrennoCaldato committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    d0ce70f View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2020

  1. minor fix

    @BrennoCaldato
    BrennoCaldato committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    d3c8fb1 View commit details
    Browse the repository at this point in the history

  2. Bug fixes for the function Frame::SetImageCV

    @BrennoCaldato
    BrennoCaldato committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    df328ef View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2020

  1. Protobuf messages now compile with Cmake

    @BrennoCaldato
    BrennoCaldato committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    b2721c0 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2020

  1. Fixed crashing problem and added cut compatibility with opencv effects

    @BrennoCaldato
    BrennoCaldato committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    3b2acab View commit details
    Browse the repository at this point in the history

  2. Tracker Effect minor fixes

    @BrennoCaldato
    BrennoCaldato committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    6d6c156 View commit details
    Browse the repository at this point in the history

  3. Added zoom to Stabilizer Effect

    @BrennoCaldato
    BrennoCaldato committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    e69f7b8 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2020

  1. Added interval to apply OpenCV effects

    @BrennoCaldato
    BrennoCaldato committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    d87a126 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2020

  1. Added CVObjectDetection and ObjectDetection effect 

    Also included kalman filter functions and code for tracking the output boxes from DNN model
    @BrennoCaldato
    BrennoCaldato committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    1a598b1 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2020

  1. Updated protobuf bash script

    @BrennoCaldato
    BrennoCaldato committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    88a0c37 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2020

  1. Added normalized bboxes for tracker and object detector 

    Also added tests for ObjectDetection and several bug fixes
    @BrennoCaldato
    BrennoCaldato committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    483f288 View commit details
    Browse the repository at this point in the history

  2. Changed bounding box draw in Object Detector effect

    @BrennoCaldato
    BrennoCaldato committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    a8d877c View commit details
    Browse the repository at this point in the history

  3. Improved SORT algorithm and fixed bug when cutting clips

    @BrennoCaldato
    BrennoCaldato committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    58d2e8f View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2020

  1. Fixed Stabilizer and created Object Detector tests

    @BrennoCaldato
    BrennoCaldato committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    6ca35bb View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2020

  1. Opencv is an optional dependency

    @BrennoCaldato
    BrennoCaldato committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    b92eadb View commit details
    Browse the repository at this point in the history

  2. minor fixes

    @BrennoCaldato
    BrennoCaldato committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    d247140 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2020

  1. CVStabilization Test small fix

    @BrennoCaldato
    BrennoCaldato committed Aug 8, 2020
    Configuration menu
    Copy the full SHA
    e8b9733 View commit details
    Browse the repository at this point in the history

  2. Improved documentation

    @BrennoCaldato
    BrennoCaldato committed Aug 8, 2020
    Configuration menu
    Copy the full SHA
    eb58385 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2020

  1. Merge pull request #550 from BrennoCaldato/opencv_integration 

    Opencv integration
    @jonoomph
    jonoomph committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    266bdc0 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. Correction of bounding box negative proportions

    @BrennoCaldato
    BrennoCaldato committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    1e10455 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2020

  1. opencv path added for windows 64 build

    @BrennoCaldato
    BrennoCaldato committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    d8fd516 View commit details
    Browse the repository at this point in the history

  2. minor fix

    @BrennoCaldato
    BrennoCaldato committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    482cc89 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. opencv path added for windows 32 build

    @BrennoCaldato
    BrennoCaldato committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    eb5510f View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2020

  1. opencv path added for windows 32 build

    @BrennoCaldato
    BrennoCaldato committed Aug 19, 2020
    Configuration menu
    Copy the full SHA
    5555bd8 View commit details
    Browse the repository at this point in the history

  2. Revert "opencv path added for windows 32 build" 

    This reverts commit 5555bd8.
    @BrennoCaldato
    BrennoCaldato committed Aug 19, 2020
    Configuration menu
    Copy the full SHA
    50092c3 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2020

  1. Merge branch 'develop' into opencv

    @jonoomph
    jonoomph committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    04960cb View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. Merge branch 'clip-refactor-keyframes' into opencv

    @BrennoCaldato
    BrennoCaldato committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    1626e1e View commit details
    Browse the repository at this point in the history

  2. Resolving conflicts

    @BrennoCaldato
    BrennoCaldato committed Oct 20, 2020
    Configuration menu
    Copy the full SHA
    a9274df View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. Fixed binding issues for opencv effects

    @BrennoCaldato
    BrennoCaldato committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    4c6f9ff View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into opencv

    @BrennoCaldato
    BrennoCaldato committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    01c9397 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2020

  1. Apply suggestions from code review 

    Applying suggestions from @jonoomph
    @BrennoCaldato
    BrennoCaldato committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    b48025c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into opencv

    @jonoomph
    jonoomph committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    b74b3ea View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2020

  1. Fixing color format for opencv conversion

    @jonoomph
    jonoomph committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    df154c3 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2020

  1. Added error message handling for ClipProcessingJob

    @BrennoCaldato
    BrennoCaldato committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    3f63b2c View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2020

  1. Fixed CVTracker test

    @BrennoCaldato
    BrennoCaldato committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    0bdc648 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2020

  1. Improved error handling for effect pre-processing

    @BrennoCaldato
    BrennoCaldato committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    2bd6bd4 View commit details
    Browse the repository at this point in the history

  2. Applied code review suggestions

    @BrennoCaldato
    BrennoCaldato committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    111883e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'opencv-code-review' into opencv

    @BrennoCaldato
    BrennoCaldato committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    3ef94f4 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2020

  1. Applied code review suggestions

    @BrennoCaldato
    BrennoCaldato committed Nov 6, 2020
    Configuration menu
    Copy the full SHA
    2d18143 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2020

  1. Update .gitlab-ci.yml 

    Fixing path for Qt and Python on opencv branch
    @jonoomph
    jonoomph committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    fabe580 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2020

  1. Improved protobuf message compiling

    @BrennoCaldato
    BrennoCaldato committed Dec 12, 2020
    Configuration menu
    Copy the full SHA
    29b28f9 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2020

  1. Fixed protobuf message compiling on Mac

    @BrennoCaldato
    BrennoCaldato committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    6342d43 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into opencv

    @BrennoCaldato
    BrennoCaldato committed Dec 18, 2020
    Configuration menu
    Copy the full SHA
    5b5763e View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2020

  1. CMake: Add ENABLE_OPENCV option, use targets

    @ferdnyc
    ferdnyc committed Dec 24, 2020
    Configuration menu
    Copy the full SHA
    5cfe52b View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2020

  1. Unit tests: Don't use OpenShot.h header 

    - To prevent slow compiles of unit tests, replace all of the
  '#include "OpenShot.h"' invocations with includes of the
  individual headers actually needed by each test file.

Revert "Unit tests: Don't use OpenShot.h header"

This reverts commit e5cc4f8bf91fc60697996023a86dc618637f6161.

Unit tests: Don't use OpenShot.h header

- To prevent slow compiles of unit tests, replace all of the
  '#include "OpenShot.h"' invocations with includes of the
  individual headers actually needed by each test file.
    @ferdnyc
    ferdnyc committed Dec 26, 2020
    Configuration menu
    Copy the full SHA
    ed77db8 View commit details
    Browse the repository at this point in the history

  2. Remove OpenShot.h from OpenCV unit tests

    @ferdnyc
    ferdnyc committed Dec 26, 2020
    Configuration menu
    Copy the full SHA
    f21cf35 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2021

  1. Changing name of ProtoBufMessage to openshot_protobuf for clarity, al… 

    …so installing it in PREFIX/lib
    @jonoomph
    jonoomph committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    da83d57 View commit details
    Browse the repository at this point in the history

  2. Updating link to renamed protobuf library

    @jonoomph
    jonoomph committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    ad73d23 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #614 from OpenShot/jonoomph-updating-protobuf-library 

    Fixing INSTALL issue related to ProtoBufMessage.dylib
    @jonoomph
    jonoomph committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    49097ce View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2021

  1. Apply suggestions from code review 

    Co-authored-by: Frank Dana <ferdnyc@gmail.com>
    @BrennoCaldato @ferdnyc
    BrennoCaldato and ferdnyc committed Jan 12, 2021
    Configuration menu
    Copy the full SHA
    e19c931 View commit details
    Browse the repository at this point in the history

  2. Update src/effects/Stabilizer.h 

    Co-authored-by: Frank Dana <ferdnyc@gmail.com>
    @BrennoCaldato @ferdnyc
    BrennoCaldato and ferdnyc committed Jan 12, 2021
    Configuration menu
    Copy the full SHA
    b6975ae View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2021

  1. Propagate library defs to swig

    @ferdnyc
    ferdnyc committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    b445d6d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix-swig-flags' into opencv

    @ferdnyc
    ferdnyc committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    94ba109 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix-swig-flags' into opencv_build_config

    @ferdnyc
    ferdnyc committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    0cb9286 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'opencv' into opencv_build_config

    @ferdnyc
    ferdnyc committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    d089652 View commit details
    Browse the repository at this point in the history

  5. Property fixes for bindings

    @ferdnyc
    ferdnyc committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    3a0d88a View commit details
    Browse the repository at this point in the history

  6. Fix FindResvg for older CMake

    @ferdnyc
    ferdnyc committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    8dfaf74 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'fix-swig-flags' into opencv_build_config

    @ferdnyc
    ferdnyc committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    d1019f2 View commit details
    Browse the repository at this point in the history

  8. OpenCV/Protobuf: Install library and headers

    @ferdnyc
    ferdnyc committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    0fcb84b View commit details
    Browse the repository at this point in the history

  9. OpenCV: Move 'using ns std', scrub whitespace

    @ferdnyc
    ferdnyc committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    d71631a View commit details
    Browse the repository at this point in the history

  10. Merge pull request #604 from ferdnyc/opencv_build_config 

    CMake: Adjustments to build config with OpenCV/Protobuf/Boost
    @BrennoCaldato
    BrennoCaldato committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    1fa4e87 View commit details
    Browse the repository at this point in the history

  11. Rename protobuf packages to pb_foo

    @ferdnyc
    ferdnyc committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    da02180 View commit details
    Browse the repository at this point in the history

  12. Apply suggestions from code review 

    Co-authored-by: Frank Dana <ferdnyc@gmail.com>
    @BrennoCaldato @ferdnyc
    BrennoCaldato and ferdnyc committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    73bf739 View commit details
    Browse the repository at this point in the history

  13. Rename protobuf packages to pb_foo

    @BrennoCaldato
    BrennoCaldato committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    7fbb8a2 View commit details
    Browse the repository at this point in the history

  14. Minor fixes 

    - Moved TimeUtil from header to src
- Fixed issue with Qimage -> Mat conversion
    @BrennoCaldato
    BrennoCaldato committed Jan 13, 2021
    Configuration menu
    Copy the full SHA
    f6de533 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2021

  1. Fixed codacy review warnings

    @BrennoCaldato
    BrennoCaldato committed Jan 19, 2021
    Configuration menu
    Copy the full SHA
    d481e5a View commit details
    Browse the repository at this point in the history