Commit Graph

592 Commits

Author SHA1 Message Date
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
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
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
Jonathan Thomas
453d55f41a 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-08-26 22:47:31 -05:00
Jonathan Thomas
5a9d47a03d 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-08-26 17:05:50 -05:00
Jonathan Thomas
5700b0ab7d - 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-08-26 13:12:42 -05:00
FeRD (Frank Dana)
92293d39ab Add QtUtilities.h header 2020-08-20 15:26:53 -04:00
FeRD (Frank Dana)
0e2f1eaba6 Include Qt header for Qt::endl 2020-08-20 14:53:16 -04:00
FeRD (Frank Dana)
6b94dbb9dd Replace C compatibility headers with C++ 2020-08-07 02:02:05 -04:00
FeRD (Frank Dana)
cdd2efd32b Replace math.h header with cmath 2020-08-06 21:31:21 -04:00
Frank Dana
6638f4184c Merge pull request #475 from ferdnyc/ffmpeg-writer
Memory-safety fixes to FFmpegWriter, FrameMapper, DummyReader
2020-07-11 23:39:52 -04:00
Frank Dana
2520996d85 Merge pull request #510 from ferdnyc/store-qt-version
Add version/feature #defines to OpenShotVersion.h
2020-07-08 17:28:18 -04:00