Brenno
a4f4561d0a
Merge branch 'opencv' into keyframe-refactor
2020-11-09 21:48:53 -03:00
Brenno
111883e23e
Applied code review suggestions
2020-11-05 12:27:11 -03:00
Brenno
2bd6bd4456
Improved error handling for effect pre-processing
2020-11-05 11:17:03 -03:00
Brenno
3f63b2c638
Added error message handling for ClipProcessingJob
2020-11-01 20:02:46 -03:00
Jonathan Thomas
df154c3844
Fixing color format for opencv conversion
2020-10-30 18:23:45 -05:00
Jonathan Thomas
b74b3ea841
Merge branch 'develop' into opencv
2020-10-29 17:59:32 -05:00
Jonathan Thomas
896b307381
Merge pull request #422 from ferdnyc/debug-to-stderr
...
ZmqLogger: Add optional dumping to stderr
2020-10-29 17:49:49 -05:00
Jonathan Thomas
09df9e60bb
Merge pull request #583 from OpenShot/caption-effect
...
New "Caption" Effect (Supports VTT and Subrip formats)
2020-10-29 02:56:15 -05:00
Brenno
5db1c0f453
Initial design of new keyframes specialized classes
...
The keyframe collections would better integrate with effects that uses bounding boxes, skeletons and facial points.
2020-10-29 00:34:31 -03:00
Brenno
b48025cd1f
Apply suggestions from code review
...
Applying suggestions from @jonoomph
2020-10-29 00:21:28 -03:00
Brenno
01c9397b03
Merge remote-tracking branch 'origin/develop' into opencv
2020-10-27 21:30:24 -03:00
Jonathan Thomas
a3c20c8f44
Fixed a few codacy issues
2020-10-27 02:50:02 -05:00
Jonathan Thomas
def8d9dd7b
Updating method docs
2020-10-27 02:13:57 -05:00
Jonathan Thomas
172348417c
Improvement to video caching thread, to recover from the separation of cache vs display frame #. Also found a mutex that was needed, to prevent crashing when the video thread calls timeline::GetFrame at certain times... colliding with another thread (and independent of OpenMP).
2020-10-23 17:52:20 -05:00
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
Jonathan Thomas
54a070438a
- Added default caption value, for demonstration purposes (to help users see a valid example)
...
- Append some newlines onto the end of any caption text... needed by the regex for some reason
- Updated font name and caption text to be a new type (font and caption), and we have corresponding UI changes for those on openshot-qt
2020-10-22 01:32:33 -05:00
Jonathan Thomas
07a10e3bf6
- Added word-wrap (using adjustable left, top, and right side keyframes)
...
- Added background color and alpha
- Added font color alpha
- Added fade in / out logic
- Added background padding & rounded corners
- Added adjustable font name
2020-10-21 01:27:49 -05:00
Jonathan Thomas
eb2e787537
Merge branch 'clip-refactor-keyframes' into caption-effect
...
# Conflicts:
# src/effects/Caption.h
2020-10-20 13:18:12 -05:00
Jonathan Thomas
e5d5d82050
- Simplifying the FrameMapper Clip::AdjustFrameNumber method
...
- Removing transformed == true boolean (Qt should be smart enough to optimize for blank transforms)
- Fixing regression from TimelineBase import
2020-10-20 13:03:10 -05:00
Jonathan Thomas
18911bebb7
Apply suggestions from code review
...
Applying some awesome improvements from @ferdnyc, thx!
Co-authored-by: Frank Dana <ferdnyc@gmail.com >
2020-10-20 12:42:00 -05:00
Jonathan Thomas
7711113be1
Apply suggestions from code review
...
Adding suggestions from @ferdnyc
Co-authored-by: Frank Dana <ferdnyc@gmail.com >
2020-10-20 12:39:17 -05:00
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)
f55c563ba5
Merge branch 'develop' into debug-to-stderr
2020-10-19 16:38:54 -04:00
