Commit Graph

196 Commits

Author SHA1 Message Date
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
FeRD (Frank Dana)
a1e44edad4 Merge branch 'develop' into clip-refactor-keyframes 2020-10-19 16:28:49 -04:00
Jonathan Thomas
d2521bcbff Fixing some additional cpp_test complaints 2020-10-19 16:22:27 -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
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)
aa40ea29e0 Update include paths in all source/header files 2020-10-18 07:43:37 -04:00
Jonathan Thomas
ef80439b62 Merge pull request #530 from ferdnyc/omp-and-ffmpeg-classes
Move off deprecated OpenMP API, fix FFmpeg code paths
2020-10-16 14:45:20 -05:00
Frank Dana
20c75ff227 Const temporary variable 2020-09-10 18:39:24 -04:00
FeRD (Frank Dana)
41af336d11 Add GetMaxTime 2020-09-02 01:04:29 -04:00
FeRD (Frank Dana)
f49a795749 Timeline: Add id-lookup API and GetMaxFrame 2020-09-01 23:05:04 -04:00
FeRD (Frank Dana)
3f13ed87f0 Timeline: const-ref path arg in constructor, docs 2020-06-08 16:07:55 -04:00
FeRD (Frank Dana)
96d84311c6 OpenMP: Move off deprecated allow_nested boolean
- Replacement openmp_set_max_active_levels() takes an int argument
  - In OpenMP 5.0 it can be set to openmp_get_supported_active_levels()
  - Below 5.0, we just set it to our processor count
- Move configuration of OpenMP from ad-hoc locations to constructors
  for FFmpegWriter/Reader and Timeline
2020-06-08 16:07:04 -04:00
Jonathan Thomas
10ed4baae3 Merge pull request #496 from OpenShot/emojis
Transform Improvements (Keyframe origin point)
2020-05-25 17:41:55 -05:00
Frank Dana
6336f30ee3 Various: Remove unused variables (#467)
Several data members and local variables were flagged by static
analysis tools as never being used anywhere in the code.
2020-04-22 02:02:55 -04:00
Jonathan Thomas
2bea436f3e Adding keyframable origin point (for shear and rotation) 2020-04-13 16:55:29 -05:00
Jonathan Thomas
4ea362380a Adding support for proper absolute/canonical path detection and replacement 2020-03-10 17:35:21 -05:00
Jonathan Thomas
8b3167a99a Adding ability for a Clip to auto-detect and instantiate a Timeline Reader from the *.osp file type. Added new Timeline constructor, to auto load UTF-8 JSON file, and regex convert all paths to absolute. Fixed a dead lock issue when a Timeline loads another Timeline. 2020-03-09 16:49:06 -05:00
Frank Dana
8ea7449363 Merge branch 'develop' into json-parsing 2020-01-20 15:25:40 -05:00
Jonathan Thomas
482aef4769 Merge pull request #395 from SuslikV/patch-4
Skip painter transform for the Clip when video disabled
2020-01-03 14:51:02 -06:00
SuslikV
1cefa65794 Skip painter transform by using shortcut
Fixes issue for clip being rendered as black rectangle even if the
has_video at the frame is set to zero.

Co-authored-by: Frank Dana <ferdnyc@users.noreply.github.com>
2020-01-03 23:45:28 +02:00