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
Jonathan Thomas
8f6c64215e
Merge pull request #556 from ferdnyc/use-make-shared
...
Use std::make_shared to allocate shared ptrs, instead of std::shared_ptr constructors
2020-10-16 14:48:14 -05: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
Jonathan Thomas
8cf0483bd9
Merge pull request #455 from ferdnyc/remove-ancient-ffmpeg-encode
...
FFMpegWriter: Ease technical debt by dropping support for FFmpeg versions below 2.4
2020-10-16 03:14:26 -05:00
Jonathan Thomas
143b948ac2
Merge branch 'develop' into distinct-saturation
2020-10-16 02:47:40 -05:00
Jonathan Thomas
91945f03dc
Replacing audio fix implementation with ParentClip(), to access clip start and position (if any)
2020-10-13 17:08:27 -05:00
Jonathan Thomas
1b670a7dab
Merge pull request #578 from OpenShot/audio_fix
...
Implemented position remapper inside FrameMapper to fix audio noise when exporting to different fps
2020-10-13 16:41:33 -05:00
Jonathan Thomas
57b48f31a2
Initializing Clip info struct, and fixing clip cache settings
2020-10-13 14:55:25 -05:00
FeRD (Frank Dana)
a004bd23f3
Merge remote-tracking branch 'upstream/develop' into remove-ancient-ffmpeg-encode
2020-10-13 07:00:58 -04:00
Brenno
58cedb612c
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-10 17:01:24 -03:00
Jonathan Thomas
fb879a4e46
Merge branch 'develop' into clip-refactor-keyframes
...
# Conflicts:
# include/Clip.h
# include/ReaderBase.h
# include/Timeline.h
# src/Clip.cpp
# src/FFmpegReader.cpp
# src/QtImageReader.cpp
# src/ReaderBase.cpp
2020-10-05 23:14:44 -05:00
Jonathan Thomas
206578df3f
Fixing some regressions on image merging
2020-10-05 23:08:31 -05:00
Jonathan Thomas
f9a717ef4b
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-04 16:59:21 -05:00
FeRD (Frank Dana)
92d33a1ebd
VideoRenderWidget: missing includes
2020-09-13 16:38:23 -04:00
FeRD (Frank Dana)
0974637a3a
Pixelate: Fix missing includes
2020-09-13 16:35:35 -04:00
FeRD (Frank Dana)
1c8aea94d0
Frame: Put Qt includes where they're used
2020-09-13 16:28:31 -04:00
Frank Dana
22f89680bd
Merge pull request #555 from ferdnyc/fix-deprecated-endl
...
Use Qt::endl with QTextStream
2020-09-10 19:16:40 -04:00
Frank Dana
131e441d98
Merge pull request #563 from ferdnyc/timeline-lookup-api
...
Timeline: Add clip/effect lookup api, GetMaxFrame/GetMaxTime method (w/ unit tests)
2020-09-10 19:06:44 -04:00
Frank Dana
f33d5cb261
Timeline.h: Formatting
2020-09-10 18:40:32 -04:00
Jonathan Thomas
6cc00d6e47
Merge pull request #371 from SuslikV/lossless-color-format
...
Use non-subsampled color format for lossless encoding with the h264 encoder
2020-09-10 17:40:14 -05: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)
36dab0b1db
Clip: GetEffect implementation
2020-09-01 23:05:04 -04:00
FeRD (Frank Dana)
466f8713aa
Timeline.h: Add lots of openshot:: prefixes
2020-09-01 23:05:04 -04:00
FeRD (Frank Dana)
bd90b8d6c9
ReaderBase: Deprecate SetClip/GetClip names
...
- Replacement method names are SetParentClip/GetParentClip
- Old names are retained as deprecated alternates, for now
- libopenshot internal calls (very few) are updated
ReaderBase.cpp: Remove (Set,Get)Clip
2020-09-01 23:05:04 -04:00
