openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity
1,898 Commits 9 Branches 27 Tags
d54871afd283188e57a2cecd05e84c7c4e16d608
Commit Graph

1898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FeRD (Frank Dana)
d54871afd2 FrameMapper_tests: Add more coverage 2020-11-03 14:22:02 -05:00
Frank Dana
98d6eb4f8c FrameMapper_Tests: Correct for reader duration 2020-11-03 13:46:21 -05:00
FeRD (Frank Dana)
68f54bdb9a FrameMapper_Tests: Use SUITE, create no-op test 2020-11-03 08:10:44 -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
Jonathan Thomas
8a331f6921 Merge pull request #584 from OpenShot/fix-stale 
Fix string formatting on yml stale message
 2020-10-27 17:54:51 -05:00
Jonathan Thomas
f00fc4699c Fix stale yml string to be a literal string (instead of folded) 2020-10-27 17:43:47 -05: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
8b4d5683f5 Merge pull request #571 from OpenShot/clip-refactor-keyframes 
WIP: Clip Refactor (move Timeline Drawing code to Clip)
 2020-10-27 02:04:49 -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
bba126019b Added 2 FrameMapper unit tests which verify resampled audio data has no gaps/pops, and offset FrameMapper clips don't use the wrong # of audio samples 2020-10-23 00:02:52 -05:00
Jonathan Thomas
9495d1d729 Removing invalid ICC sRGB color profile from these PNG used in unit tests (which throw warnings) 2020-10-23 00:02:04 -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
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
FeRD (Frank Dana)
a1e44edad4 Merge branch 'develop' into clip-refactor-keyframes 2020-10-19 16:28:49 -04:00
FeRD (Frank Dana)
f4ae897240 Merge branch 'clip-refactor-keyframes' of https://github.com/OpenShot/libopenshot into clip-refactor-keyframes 2020-10-19 16:26:09 -04:00
Jonathan Thomas
d2521bcbff Fixing some additional cpp_test complaints 2020-10-19 16:22:27 -04:00