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)
|
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
|
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
|
04960cb2c2
|
Merge branch 'develop' into opencv
|
2020-09-23 14:44:53 -05:00 |
|
FeRD (Frank Dana)
|
0bcf1e4924
|
Frame: Reduce code duplication
|
2020-09-13 19:56:40 -04:00 |
|
FeRD (Frank Dana)
|
9c83429ab1
|
Frame: Use delegating constructors
|
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
|
e500cae9f5
|
Replace sleep()/usleep() with std::chrono calls (#473)
|
2020-09-02 02:07:54 -04:00 |
|
FeRD (Frank Dana)
|
c14922d57e
|
Frame.cpp/h: Fix a bunch of wrong comments
Best reason not to narrate the code in the comments: The code gets
changed, but the documentation doesn't.
|
2020-08-20 20:40:55 -04:00 |
|
FeRD (Frank Dana)
|
3c2532b4de
|
Use std::make_shared to allocate shared ptrs
std::make_shared does in a single allocation what the constructors
for std::shared_ptr usually take at least 2 allocations to do.
May give us an infinitesimal performance/memory improvement.
https://www.modernescpp.com/index.php/memory-and-performance-overhead-of-smart-pointer
|
2020-08-20 16:50:12 -04:00 |
|
Jonathan Thomas
|
266bdc0cf6
|
Merge pull request #550 from BrennoCaldato/opencv_integration
Opencv integration
|
2020-08-11 16:58:26 -05:00 |
|
FeRD (Frank Dana)
|
9f4cdd46fb
|
Frame: juce::String supports std::basic_ostream
|
2020-08-07 02:01:48 -04:00 |
|
Brenno
|
3b2acab284
|
Fixed crashing problem and added cut compatibility with opencv effects
|
2020-07-21 21:42:09 -03:00 |
|
Brenno
|
df328efd87
|
Bug fixes for the function Frame::SetImageCV
|
2020-07-20 20:06:00 -03:00 |
|
Brenno
|
d6e0a69c1f
|
improved the stabilize effect integration
|
2020-07-15 10:29:08 -03:00 |
|
Brenno
|
791961c057
|
modified cmake to include OpenCV and Protobuf as optional dependencies
|
2020-07-04 19:20:54 -03:00 |
|
Brenno
|
a85e45bfda
|
Implemented CVStabilization, removed cv namespace
|
2020-07-02 19:09:04 -03:00 |
|
Brenno
|
4364e187ce
|
integrated Qimage to Mat conversion into Frame
|
2020-06-26 21:28:30 -03:00 |
|
Jonathan Thomas
|
7831cfe912
|
Adding some new functionality and documentation to DummyReader. Adding the ability to add test frames, with fake image and audio data. This will can be used in unittests, and will soon be used to verify some new audio improvements (coming soon).
|
2020-06-06 01:55:52 -05:00 |
|
FeRD (Frank Dana)
|
affd4b2488
|
Add some missing juce:: prefixing
|
2020-05-19 06:33:30 -04:00 |
|