openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity
2,032 Commits 9 Branches 27 Tags
b2cd0a500aace5e89d7cc653eec4c5a9f7d50ca8
Commit Graph

196 Commits

Author SHA1 Message Date
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
Brenno
b579ea6499 Added functionality to link a clip to a tracked object (Animations) 
- Added KeyframeBase class
- Adjusted the inheritance of KeyframeBase to KeyframeBBox and Keyframe
- Added feature to attach clip to bounding box
- Added support to select tracked object with a dropdown list and removed keyframebbox downcasting
 2020-12-22 21:32:36 -03:00
Brenno
01c9397b03 Merge remote-tracking branch 'origin/develop' into opencv 2020-10-27 21:30:24 -03:00
Jonathan Thomas
e556d0fded Added 2 new unit tests for Clip's with a Timeline associated with them, and FFmpegReaders with a Clip/Timeline associated with them. 2020-10-23 01:35:46 -05:00
Jonathan Thomas
e5d5d82050 - Simplifying the FrameMapper Clip::AdjustFrameNumber method 
- Removing transformed == true boolean (Qt should be smart enough to optimize for blank transforms)
- Fixing regression from TimelineBase import
 2020-10-20 13:03:10 -05:00
Jonathan Thomas
18911bebb7 Apply suggestions from code review 
Applying some awesome improvements from @ferdnyc, thx!

Co-authored-by: Frank Dana <ferdnyc@gmail.com>
 2020-10-20 12:42:00 -05:00
Brenno
1626e1eeba Merge branch 'clip-refactor-keyframes' into opencv 2020-10-19 22:29:48 -03:00
FeRD (Frank Dana)
cf89891bf0 Finish conflict resolution 2020-10-19 17:42:12 -04:00
FeRD (Frank Dana)
a1e44edad4 Merge branch 'develop' into clip-refactor-keyframes 2020-10-19 16:28:49 -04:00
FeRD (Frank Dana)
f4ae897240 Merge branch 'clip-refactor-keyframes' of https://github.com/OpenShot/libopenshot into clip-refactor-keyframes 2020-10-19 16:26:09 -04:00
Jonathan Thomas
d2521bcbff Fixing some additional cpp_test complaints 2020-10-19 16:22:27 -04:00
Jonathan Thomas
2f4aba450c Fixing some cpp_test complaints 2020-10-19 16:22:27 -04:00
Jonathan Thomas
d3d604cc08 Fix alpha and mask effects, so they correctly multiply the alpha to all colors (since we have switched to a premulitplied alpha format) 2020-10-19 16:22:27 -04:00
Jonathan Thomas
b936ea837c Initializing Clip info struct, and fixing clip cache settings 2020-10-19 16:05:01 -04:00
Jonathan Thomas
8387b124ad Large refactor of Timeline, TimelineBase, ClipBase, and Clip, to allow a Clip access to the parent timeline instance (if available), and thus, certain properties (preview size, timeline FPS, etc...). This allows for a simpler rendering of Clip keyframes (during the Clip::GetFrame method), and a simpler Timeline class, that can change the preview window size dynamically and no longer requires a Singleton Settings class. 
- Also removed "crop" from Clip class, as it was never implmeneted correctly, and we have a fully functional "crop" effect when needed
 - Added caching to Clip class, to optimize previewing of cached frames (much faster than previous)
 2020-10-19 16:05:01 -04:00
Jonathan Thomas
6da4e8fded Fixed a bug with cropping logic on Clip (disabled it temporarily). I need to replace the Crop functionality with a more robust cropping tool. Also, updated Timeline to use the MaxWidth/MaxHeight settings when calling the clip (since those are set when the screen is resized). 2020-10-19 15:46:43 -04:00
Jonathan Thomas
eb328f1190 Refactored the Settings::Instance()->MAX_WIDTH and Settings::Instance()->MAX_HEIGHT out of the Cilp class. GetFrame() now has an overload which specifies the width, height, and samples needed. Otherwise, it returns the Clip image based on the source reader (width, height, num samples). 2020-10-19 15:46:42 -04:00
Jonathan Thomas
000c9d6d4c - Refactoring all Timeline drawing code into the Clip class 
- Making Clip a proper Reader (so it can be used directly, instead of a Timeline)
 2020-10-19 15:45:37 -04:00
FeRD (Frank Dana)
aa40ea29e0 Update include paths in all source/header files 2020-10-18 07:43:37 -04:00
Jonathan Thomas
29107bc427 Fixing some additional cpp_test complaints 2020-10-16 18:22:42 -05:00