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
Frank Dana
b5c3d0b598
Merge pull request #618 from ferdnyc/deprecate-TooManySeeks
...
Deprecate TooManySeeks, instead of removing
2021-01-26 22:59:06 -05:00
Jonathan Thomas
ec3123477c
Merge pull request #390 from PhysSong/albumartfixes
...
Fix crashes and failures on decoding some types of album art images
2021-01-26 21:44:49 -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
Jonathan Thomas
75c4dbbaaa
Fixing alpha videos, by handling the conversion to premultiplied RGBA separately
2020-12-31 17:35:49 -06:00
Hyunjin Song
c0db2609e8
Add a comment explaining FFmpegReader::HasAlbumArt()'s behavior
2020-10-20 11:01:42 +09:00
Brenno
1626e1eeba
Merge branch 'clip-refactor-keyframes' into opencv
2020-10-19 22:29:48 -03:00
FeRD (Frank Dana)
04bcab42da
Merge branch 'develop' into albumartfixes
2020-10-19 16:40:47 -04:00
FeRD (Frank Dana)
a1e44edad4
Merge branch 'develop' into clip-refactor-keyframes
2020-10-19 16:28:49 -04:00
FeRD (Frank Dana)
aa40ea29e0
Update include paths in all source/header files
2020-10-18 07:43:37 -04: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
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
6bd7fb7235
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-14 03:06:30 -05:00
Jonathan Thomas
94059828d5
Converting RGB8888 to ARGB32_Premultiplied (for performance reasons)
2020-10-13 18:18:10 -05: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
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
Jonathan Thomas
04960cb2c2
Merge branch 'develop' into opencv
2020-09-23 14:44:53 -05:00
Jonathan Thomas
9c35e554a9
Merge pull request #565 from OpenShot/fix-pts-offset-logic
...
Fix the PTS offset logic error when first reading a file with FFmpegReader
2020-09-12 17:18:52 -05:00
Jonathan Thomas
7dc9eb6927
Adding TODO for future improvements
2020-09-12 17:05:33 -05:00
Jonathan Thomas
650adf639d
Fix the PTS offset logic error when first reading a file on FFmpegReader. Use the calculated 0 - PTS, unless it is too large (more than 1 second off from zero)
2020-09-11 00:55:50 -05: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
e500cae9f5
Replace sleep()/usleep() with std::chrono calls ( #473 )
2020-09-02 02:07:54 -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
