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
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
FeRD (Frank Dana)
2f3615f706
Move Exceptions.h includes to .cpp files
2021-01-26 10:52:04 -05: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
2021-01-01 05:24:48 -05: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
Jonathan Thomas
f4d0d9d7bb
Fixing some cpp_test complaints
2020-10-16 18:04:10 -05:00
Jonathan Thomas
1dfbb0e771
Merge branch 'develop' into clip-refactor-keyframes
...
# Conflicts:
# src/CacheDisk.cpp
# src/Clip.cpp
# src/Frame.cpp
# src/QtHtmlReader.cpp
# src/QtImageReader.cpp
# src/QtTextReader.cpp
# src/effects/Bars.cpp
# src/effects/Crop.cpp
2020-10-16 15:32:43 -05:00
