Commit Graph

215 Commits

Author SHA1 Message Date
Brenno
65e33a5b77 Renamed "Parent Object ID" to "Parent" 2021-03-26 21:50:41 -03: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
0e30ecccfd Removing caching from Clip object. Causes too many issues and does not add any performance (in my tests) 2021-02-18 16:14:14 -06:00
Jonathan Thomas
66eb3d5ed6 Disabling Clip caching and fixing a bug with waveform() 2021-02-17 20:40:32 -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
Brenno
67895f7c23 Added support to set an effect's properties by it's parent effect 2021-02-04 16:11:27 -03:00
Brenno
d24c2e451c Added support to insert the image of a clip inside a Tracked Object 2021-02-04 15:45:33 -03:00
Brenno
9df3b51082 Removed unused class KeyframeBase
Moved the functions IsPointBeforeX(), InterpolateLinearCurve() , InterpolateBezierCurve() and InterpolateBetween() from KeyFrameBase files to KeyFrame files
2021-02-01 15:17:58 -03: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
Brenno
fd88a60bb1 Updated variable names
Updated "attached_id" to "parentObjectId", "attachedObject" to "parentTrackedObject", and "attachedClip" to "parentClipObject"
2021-01-27 17:54:49 -03:00
Brenno
3f11361f09 Added support to attach a clip to another clip 2021-01-27 17:41:39 -03:00
FeRD (Frank Dana)
2f3615f706 Move Exceptions.h includes to .cpp files 2021-01-26 10:52:04 -05:00
Brenno
17463313fc Clip.cpp: Removed hard-coded Tracker effect check in AddEffect function
Added "has_tracked_object" property on EffectBase so that the AddEffect function checks for this property instead of the Tracker effect name - this way it's possible to support other effects that have tracked objects but different names.
2021-01-22 19:00:44 -03:00
Brenno
a7d2b6adab Fixed clip transform handler when attached to object 2021-01-19 16:03:51 -03:00
Brenno
cb61f914f7 Tracker effect and export video fixes
Fixed bug that made Openshot crash if two or more Tracker effects were added to the same video.
Fixed bug that made the clips to be incorrectly attached to tracked objects in the exported video.
2021-01-18 15:30:11 -03:00
Brenno
f05ded9a2f Attaching clip to tracked object fixes
Fixed bug that caused the clip to not attach correctly if the tracked object's parent clip wasn't in the position 0 of the timeline.
Fixed bug that caused the wrong scale adjustment when an emoji or picture was attached to a tracked object.
2021-01-18 15:12:45 -03:00
Brenno
a5feadce1e Changed KeyframeBBox to TrackedObjectBBox and added TrackedObjectBase
Added new base class TrackedObjectBase, changed class KeyframeBBox to TrackedObjectBBox and changes it's inheritance from KeyframeBase to TrackedObjectBase.
2021-01-18 14:52:01 -03:00
Brenno
b2cd0a500a Update Clip.cpp apply_keyframes funcion
The Clip's Keyframes are no longer modified when it's attached to an object, and the bounding-box properties are requested by the Timeline's frame, not the Clip's frame.
2021-01-14 16:03:22 -03:00
Brenno
7cce93eb55 Removed IKeyFrame.h and applied minor fixes to Clip.cpp 2021-01-14 15:53:12 -03:00
Brenno
3d5d907c5d Updated Clip.cpp to support GUI to select attached object
Modified Clip.cpp PropertiesJSON function and applied minor fixes to Keyframe_Tests
2021-01-14 15:45:28 -03:00
Brenno
61accdfe95 Merge branch 'opencv' into keyframe-refactor 2021-01-14 15:00:04 -03:00
FeRD (Frank Dana)
0cb9286da3 Merge branch 'fix-swig-flags' into opencv_build_config 2021-01-13 09:20:35 -05:00
Frank Dana
6009a26e4c Eliminate TooManySeeks exception (#611)
Since commit bfa050409c (2015-08-24),
there is no code in libopenshot which ever throws TooManySeeks.

- Removed catch() statements for TooManySeeks from multiple functions
- Removed the exception from Exceptions.h
- in Qt/AudioPlaybackThread.h:
  - Removed the "SafeTimeSliceThread" class definition, as it only
    existed to catch TooManySeeks.
  - Replaced SafeTimeSliceThread with a standard juce::TimeSliceThread
2021-01-01 05:24:48 -05:00