oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,984 Commits 1 Branch 0 Tags
e82011b0ee172bb2d2ce4590964fb9a4d7ef925c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ThomasWilshaw bfc0d31918 Merge pull request #2302 from Ramen2X/fix-compile-link 
readme: fix broken compile link
 2024-01-15 16:57:11 +00:00
ThomasWilshaw 55eedbfce9 chromakey: fix copy paste error 2023-09-24 12:40:23 +01:00
Thomas Wilshaw 8ce00fd975 chromakey.frag: Fix color distance equation 
The equation for calculating the distance from the key color to a
pixels color was missing the red channel component.
 2023-09-19 15:24:52 +01:00
Thomas Wilshaw e9432b766e colorbutton: Ensure only one color dialog can open 
Fixes #2161

Previously it was possible to open multiple color dialoges for one
color button.
 2023-02-11 13:15:18 +00:00
Thomas Wilshaw c3bf928751 config.ocio: Add both Rec.601 spaces 2022-11-13 17:53:50 +00:00
Thomas Wilshaw 96c0efd0b7 Remove unused lut file 2022-11-13 17:53:49 +00:00
Thomas Wilshaw bdd42a7ed9 Add Alexa35 input transform to the config 2022-11-13 17:53:48 +00:00
Thomas Wilshaw ddeab29da3 ffmepgdecoder: simplify code and improve vairable name 2022-10-26 21:02:59 +01:00
Thomas Wilshaw 9bc10e8301 ffmpegdecoder: add comment 2022-10-25 17:39:45 +01:00
Thomas Wilshaw d011229864 ffmpegdecoder: Catch bad stream duration estimates 
For some formats, particularly mxf, FFmpeg calculates the duration
of the stream incorrectly. Here we try to catch that and force Olive
to use it's much slower, but correct fallback method.
 2022-10-25 17:24:40 +01:00
Thomas Wilshaw f189df91e1 diptoblack: Stop the second half of the transition effecting the first 2022-10-24 18:29:42 +01:00
Thomas Wilshaw 3d90dc4ecd diptoblack: fix support for arbitary color 2022-10-24 13:16:12 +01:00
Thomas Wilshaw 36a3c663b2 diptoblack: fix mix operations I missed 2022-10-24 12:45:24 +01:00
Thomas Wilshaw 02ac71fb8c diptoblack: add curve controls to shader 2022-10-24 12:38:18 +01:00
Thomas Wilshaw 896ba1f6f0 diptoblack shader: Fix mix operation 
The mix function in GLSL is slightly counter intuitively x(1-a)+y(a)
Here we re-arrange the inputs slightly to get the correct result.
 2022-10-24 12:22:11 +01:00
Thomas Wilshaw c43d4b7a12 otioload: Improve error reporting 2022-10-21 17:48:47 +01:00
Thomas Wilshaw cae71f011d Chromakey: Fix alpha channel bug 
Fixes bug where elements that are smaller than the main texture were
croping layers below them when keyed.
 2022-10-09 16:19:49 +01:00
Thomas Wilshaw fb34a4b799 Reset transfer tag 2022-07-27 14:17:06 +01:00
Thomas Wilshaw 9fa1ce00e5 Add basic nclc tag support 
Sets nclc tags based on the selected output color space.

Also adds a Rec.709 OETF to the config
 2022-07-26 20:19:23 +01:00
Thomas Wilshaw f697530574 Sanitizers: Fix logic setting up memory sanitizer 2022-05-23 14:35:44 +01:00
Thomas Wilshaw 2491bb0749 Merge branch 'ocio_node' of https://github.com/ThomasWilshaw/olive into ocio_node 2022-05-08 00:13:40 +01:00
Thomas Wilshaw 0f824d180c Chromakey: ensure upper tolerence is always greater than lower tolerence 2022-05-08 00:13:17 +01:00
Thomas Wilshaw 31eeddeb08 Merge branch 'ocio_node' of https://github.com/ThomasWilshaw/olive into ocio_node 2022-05-07 23:40:57 +01:00
Thomas Wilshaw 471064df04 Ensure white clamp is always greater than black clamp 2022-05-07 23:40:25 +01:00
Thomas Wilshaw 2ef4f9440b Set contrast to OCIO specified minimum 2022-05-07 22:30:15 +01:00
Thomas Wilshaw 053f70a69e Merge branch 'ocio_node' of https://github.com/ThomasWilshaw/olive into ocio_node 2022-05-07 21:57:38 +01:00
Thomas Wilshaw 6d84df8288 Add tooltip property to node parameters. 2022-05-07 21:47:52 +01:00
Thomas Wilshaw f46f8e50dc Swap clamp disables for enables 2022-05-07 21:26:34 +01:00
Thomas Wilshaw e4b7d33af1 Add new nodes to Video Effects list 2022-05-07 19:37:12 +01:00
Thomas Wilshaw d08c46aaab Add disable options for black and white clamp 
Also sets sensible pivot default and add a config check around
GenerateProcessor
app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.cpp
app/node/color/ociogradingtransformlinear/ociogradingtransformlinear.h
 2022-05-07 19:33:47 +01:00
Thomas Wilshaw 7c23ad0b51 Set default input for the ociobase node 2022-05-06 18:51:35 +01:00
Thomas Wilshaw 2827758fae Cleanup 2022-05-04 20:04:43 +01:00
Thomas Wilshaw a508bd8cad Add mask controls to the chroma key node 2022-05-03 22:50:59 +01:00
Thomas Wilshaw 5d0e90e6e4 Set default connection 2022-05-03 22:15:00 +01:00
Thomas Wilshaw e07240cc30 Merge branch 'master' into ocio_node 2022-05-03 18:54:02 +01:00
Thomas Wilshaw abc669fa8e Attempt to fix build issue 2022-05-02 22:04:59 +01:00
Thomas Wilshaw 4c8407a882 Add keying tolerance controls 2022-05-02 22:02:31 +01:00
Thomas Wilshaw 2c31fdfc0e Fix PR comments and generate mask 2022-05-02 20:47:18 +01:00
Thomas Wilshaw f9f8622682 Add ability to set custom OCIO function names 2022-04-27 22:48:41 +01:00
Thomas Wilshaw 831fe77275 Cleanup and rename OCIO Linear Grading node 2022-04-24 21:03:00 +01:00
Thomas Wilshaw 4d2f8f775c Add ability to add custom shaders to ColorProcessorJobs 2022-04-24 18:50:06 +01:00
ThomasWilshaw 95aa3249d0 Add Blackmagic Film Wide Gamut Gen 5 (#1871) 
- Adds a Blackmagic Film Wide Gamut Gen 5 input transform to the config
- Adds a CIE-XYZ D65 space to the config
app/render/ocioconf/luts/Blackmagic_FilmWideGamut_Gen5_to_linear.spi1d
 2022-04-12 13:25:14 -07:00
Thomas Wilshaw 6464bdfd68 Add an OCIO Grading Transform Node 2022-03-13 23:00:00 +00:00
Thomas Wilshaw 1e3e620269 timeline-tests: Setup config before running 2022-03-09 14:05:27 +00:00
Thomas Wilshaw d64f153e0b filefunctions: change permissions to allow deleting 2022-03-09 13:41:13 +00:00
Thomas Wilshaw 6ccebcd988 colormanager: Remove hard coded color space 
The hard coded color space was causing custom configs to crash if they
didn't contain that specific color space.

Also sets the default role in the config to sRGB EOTF to keep
consistency with previous behaviour
 2022-03-09 12:50:34 +00:00
ThomasWilshaw 5b565e5fa5 Merge branch 'master' into ocio_node 2022-03-08 16:39:14 +00:00
Thomas Wilshaw 5c2f6a8e86 Mostly complete the display transform node 2022-03-08 16:32:14 +00:00
Thomas Wilshaw 979095d2e0 Get OCIO node groundwork working 2022-03-08 14:40:03 +00:00
ThomasWilshawanditsmattkc f5b4729a19 Corner pin (#1851) 
* Start adding a corner pin node

* Start gizmo support

* Correctly setup QVector2d inputs

* Missing breaks were causing incorect data to be set

* Add ability to override vertex coords

* Get perspective pin working

* Cleanup

* Add none perspective corner pin

* Small optimisation

* Improve comments, clean up and fix bug in job optimisation

* [skip ci] cornerpin: Improve description

* Move GL extension from shader to standard preamble.

* Use #version 130 for mobile GPU compatibility

* Cache half resolution

* Use built in NodeInputDragger::GetStartValue

* Pass cnst references to avoid deep copies

Co-authored-by: itsmattkc <itsmattkc@gmail.com>
 2022-03-02 19:38:12 -08:00
Thomas Wilshaw 4d5ca96b68 cleanup 2022-02-01 20:45:59 +00:00
Thomas Wilshaw ac070dbc1a Actually init GL renderer 2022-02-01 18:44:08 +00:00
Thomas Wilshaw ff2eac55a5 First attempt at adding OCIO to nodes 2022-02-01 16:12:08 +00:00
Thomas Wilshaw fed62246e6 Move marker load/save code to Serializer and fix build issues. Copy/paste not working 2022-01-30 13:36:11 +00:00
ThomasWilshaw 02b9a38737 Merge branch 'master' into marker 2022-01-28 22:30:29 +00:00
ThomasWilshawanditsmattkc 953adf856b Add Flip/Flop node (#1850) 
* Add Flip/Flop node

* Rename node Flip

* Missed files

Co-authored-by: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
 2022-01-25 15:14:54 -08:00
ThomasWilshaw 314167be40 Noise node (#1848) 
* Add a noise generator node

* Cleanup

* Correctly name CMakeLists.txt

* Typo
 2022-01-25 15:13:32 -08:00
Thomas Wilshaw da00d94b60 Fix string creation 2022-01-07 01:24:29 +00:00
Thomas Wilshaw 764c7bb088 Add tr to string and fix variable name 2022-01-07 01:20:38 +00:00
Thomas Wilshaw 5624b03e65 Merge branch 'OTIO_load' of https://github.com/ThomasWilshaw/olive into OTIO_load 2022-01-07 00:03:34 +00:00
Thomas Wilshaw 836903cbe9 Fix PR comments 2022-01-07 00:02:46 +00:00
ThomasWilshaw b865bfa963 Merge branch 'master' into OTIO_load 2022-01-06 13:56:08 +00:00
Thomas Wilshaw f784695133 Fix PR comments 2022-01-05 16:27:41 +00:00
Thomas Wilshaw 232a796409 colorvalueswidget: set reference space rather then input space 2022-01-01 21:57:27 +00:00
Thomas Wilshaw b6e6b89461 saveotio: Make sure all tracks are the same length 2021-12-19 16:38:29 +00:00
Thomas Wilshaw b2b28344f4 saveotio: Use correct frame rates 
available_range is the total length of the source clip and is stored
using the same frame rate as the source clip.

source_range is the length of the clip in the timeline and so is
stored using the sequence frame rate.
 2021-12-10 22:25:42 +00:00
Thomas Wilshaw dcaf34c69d saveotio: Use qIsNan rather than comparison 2021-12-10 17:34:51 +00:00
Thomas Wilshaw 516c5cb3b1 saveotio: Use built in function and check for NaN 2021-12-10 16:46:21 +00:00
Thomas Wilshaw cb0ebb24a4 saveotio: Fix external reference available media 2021-11-25 13:18:01 +00:00
Thomas Wilshaw 90a0077c02 Fix uninitialized memory build error 
Join Sequences and timelines together in a QMap for simpler code.
 2021-11-15 15:10:26 +00:00
ThomasWilshaw 010dd3a336 Merge pull request #1792 from ThomasWilshaw/screen_on 
viewer: force screen to stay awake during playback
 2021-11-10 23:34:05 +00:00
Thomas Wilshaw 2f5afb63b7 viewer: force screen to stay awake during playback 2021-11-10 15:59:01 +00:00
Thomas Wilshaw ee801e7bbb core: add OTIO guards 2021-11-09 14:57:15 +00:00
Thomas Wilshaw dc11358b85 loadotio: Update loading bar 2021-11-09 14:50:34 +00:00
Thomas Wilshaw 04a0b6024e otioload: Add simple dialog to change settings 
Adds a table of sequences in the OTIO file and allows the settings to
be changed. The dialog takes a list of sequences and relies on each
OTIO timeline having a unique name.

The dialog has to be called from the main thread so there is a wrapper
function in Core.
 2021-11-09 14:44:51 +00:00
Thomas Wilshaw e606c156c5 Cleanup for review 2021-11-09 11:59:29 +00:00
Thomas Wilshaw 7b14b7f232 Add background color to marker label 2021-11-08 22:32:42 +00:00
Thomas Wilshaw bb1aa136b3 Code cleanup 2021-11-08 21:33:19 +00:00
Thomas Wilshaw 3a5f0134af Enable marker snapping 2021-11-08 20:51:38 +00:00
Thomas Wilshaw b4bfee1193 Add warning for malformed XML data 2021-11-08 20:20:44 +00:00
Thomas Wilshaw ef2b5a7bf8 traverser: catch jobs with no texture 
If a job has no texture (e.g. a Solid), force the channel count to at
least VideoParams::kRGBChannelCount.
 2021-11-02 21:49:14 +00:00
Thomas Wilshaw 8e40e033b9 Clicking on a clip marker moves the play head to that timesatmp 2021-10-26 18:12:59 +01:00
Thomas Wilshaw 631e5d8ac8 Ensure only drag on left click 2021-10-26 13:16:42 +01:00
Thomas Wilshaw 0ccd1eca48 Replace hacky code 2021-10-26 00:39:56 +01:00
Thomas Wilshaw 9eef02b446 make sure clip markers in timeline refresh as soon as marker is edited 2021-10-26 00:37:53 +01:00
Thomas Wilshaw 82df680c52 Only draw clip marker names if there is space 2021-10-25 21:33:58 +01:00
Thomas Wilshaw fe07c40ce9 Fix shadow variable 2021-10-23 22:26:07 +01:00
Thomas Wilshaw a331104d4c Draw clip markers on timeline 2021-10-23 19:45:17 +01:00
Thomas Wilshaw c8552ad184 Make moving a marker undoable 2021-10-22 22:15:56 +01:00
Thomas Wilshaw d04d165451 Add safety checks to DeslectAllMarkers() 2021-10-22 22:15:56 +01:00
Thomas Wilshaw 87b66e0cbb Make renaming markers undoable 2021-10-22 22:15:56 +01:00
Thomas Wilshaw 5c7073eab6 Make changing marker color undoable 2021-10-22 22:15:55 +01:00
Thomas Wilshaw 7af6f85a7c Move marker undo code to seperate file 2021-10-22 22:15:55 +01:00
Thomas Wilshaw 2840f957bd Fix shadow vairable 2021-10-22 22:15:55 +01:00
Thomas Wilshaw ba5a984f14 Remove hard coded values. Tweak dragging logic 2021-10-22 22:15:55 +01:00
Thomas Wilshaw 6309502993 Make sure scroll bars markers use correct color 2021-10-22 22:15:54 +01:00
Thomas Wilshaw 2d35bcb1db cleanup 2021-10-22 22:15:54 +01:00
Thomas Wilshaw 1a7f821d82 Make markers movable 2021-10-22 22:15:54 +01:00
Thomas Wilshaw 8432b10c84 Improve right click and renaming 2021-10-22 22:15:54 +01:00
Thomas Wilshaw f3e025c729 Improve marker selecting 2021-10-22 22:15:54 +01:00