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
1,913 Commits 9 Branches 27 Tags
a9274df96bc78b60e670ab91e4139d38d6d98bed
Commit Graph

1304 Commits

Author SHA1 Message Date
Brenno
a9274df96b Resolving conflicts 2020-10-20 01:04:59 -03: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
8e0c1b89fa Replacing ARGB32_Premultiplied with Format_RGBA8888_Premultiplied, which still seems to benefit from performance, but keeps the byte order the same as before. win win 2020-10-19 16:22:27 -04:00
Jonathan Thomas
096c2c409d Converting RGB8888 to ARGB32_Premultiplied (for performance reasons) 2020-10-19 16:17:20 -04:00
Jonathan Thomas
ab4916247b Replacing audio fix implementation with ParentClip(), to access clip start and position (if any) 2020-10-19 16:05:01 -04:00
Brenno
a4109419ac Implemented position remapper inside FrameMapper to fix audio noise when exporting to different fps 
The FrameMapper class now receives the updated clip position and returns the correct amount of samples for a given frame number
 2020-10-19 16:05:01 -04:00
Jonathan Thomas
b936ea837c Initializing Clip info struct, and fixing clip cache settings 2020-10-19 16:05:01 -04:00
Jonathan Thomas
8d36b12754 Initialize parent clip variable 2020-10-19 16:05:01 -04:00
Jonathan Thomas
b3ad76ddf7 Fixing some regressions on image merging 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)
9050cc72b2 Merge branch 'develop' into new-header-move2 2020-10-19 15:12:28 -04:00
FeRD (Frank Dana)
d910949189 CMake: Code and Find module tweaks 
- FindOpenShotAudio takes over -DDEBUG, -DHAVE_ISFINITE logic
  (now set on OpenShot::Audio target when appropriate)
- Tweaks to BlackMagic dependency discovery
- Reverse the test-disabling logic, `DISABLE_TESTS FALSE` cache
  variable changed to `ENABLE_TESTS TRUE`
 2020-10-18 11:04:28 -04:00
FeRD (Frank Dana)
1ae52808c7 CMake: Add target for ImageMagick dependency 
- Parameters assigned to ImageMagick::Magick++ will now follow
  the 'openshot' shared-library target wherever it's linked, even in
  build subdirectories that aren't children or siblings of the
  location where the target was created.
- Removed the redundant code duplicating `find_package(ImageMagick)`
  checks. Multiple dependency scans have only been necessary as a
  workaround to overcome CMake variables' restricted scope.
  Targets do not share that limitation.
 2020-10-18 10:55:59 -04:00
FeRD (Frank Dana)
4bd3af0c71 Rename FindResvg, target is now Resvg::Resvg 2020-10-18 10:41:53 -04:00
FeRD (Frank Dana)
630e7ac4df Use new OpenShot::Audio target in CMakeLists.txt 
FindOpenShotAudio.cmake: Enhance with targets

- Also, migrate as much config as possible from CMakeLists.txt files
  to properties of IMPORTED OpenShot::Audio target (including platform-
  specific configs)
 2020-10-18 07:47:36 -04:00
FeRD (Frank Dana)
990155ad93 Update src/CMakeLists.txt for source tree reorg 2020-10-18 07:46:11 -04:00