oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,074 Commits 1 Branch 0 Tags
0d9727b6d2cb91ca396b4b0de2cc75faa0a3b291
Commit Graph
3785 Commits
Author SHA1 Message Date
Thomas Wilshaw 7f4b676318 Move OTIO macro to define.h 
Move the OTIO macro to define.h to avoid having to add it to all
required files.

Also add some cleanup.
 2020-11-12 13:44:50 +00:00
itsmattkc 8776bb9c4a finished upgrade to ocio v2 2020-11-12 15:36:29 +11:00
itsmattkc 2d2d6d2a2b Merge branch 'master' of https://github.com/olive-editor/olive 2020-11-12 09:38:54 +11:00
itsmattkc 04e27e8e7f otio: use item rather than first of array 2020-11-12 09:38:49 +11:00
Thomas Wilshaw a1d967efe6 OTIO: Use macro OTIO for opentimelineio::v1_0 
Exapnd the use of the OTIO macro and add the version number macro.
 2020-11-11 22:13:14 +00:00
Thomas Wilshaw cea436b703 saveoitio: Add fix for to_json_file 
The function to_json_file can delete it's SerializableObject if it
doesn't have a Retainer associated with it. This fix adds said
Retainer. Retainers clean them selves up when possibly_delete is
called on their associated object.
 2020-11-11 21:57:45 +00:00
Thomas Wilshaw 2172cf784c Rational: conversion to opentime take framerate 
Add a frame rate option to the conversion to opentime rationals as
otio generaly expects rationals to be in the form value/framerate.

Also add a check to make sure the rational is not in the form 0/0
as this can cause errors with OTIO.
 2020-11-11 21:53:44 +00:00
itsmattkc ddbca1ba51 Merge branch 'master' of https://github.com/olive-editor/olive into render-singleton 2020-11-12 00:57:12 +11:00
itsmattkc 3c1ac3eeba upgraded to ocio v2 2020-11-11 21:53:24 +11:00
itsmattkc 0429e70fe0 merged all drawing functions into a single shader processing function 2020-11-10 15:50:13 +11:00
itsmattkc 1d61f89920 large scale renderer rework 
- Abstracts all OpenGL functionality including UI objects
- Cleans up several rendering codepaths
- Improves threading functionality
- Removes old code and problematic functions
 2020-11-10 11:24:51 +11:00
itsmattkc 52b98f3fa3 lightened SampleFormat struct 2020-11-10 11:24:20 +11:00
itsmattkc 94c0914e50 codec system rework 
Codecs are now much cleaner and thread safe by design.
 2020-11-10 11:23:25 +11:00
Thomas Wilshaw 3f0768a1cc Add support for transitions when loading OTIO files 
OTIO transitions are now added to the timeline as cross dissolves with
the appropriate in/out points,

Also added a safety check when dealing with media references.
 2020-11-08 12:23:37 +00:00
itsmattkc 6ecdb02fd0 okay maybe not 2020-11-08 00:47:59 +11:00
itsmattkc 83cefbd7c7 uhh yeah this might be fubar 2020-11-07 22:44:27 +11:00
Pablo Gil 7b05e1b59e [UI] update "new" icon with a right bottom triangle because the button really opens a menu 2020-11-07 12:31:31 +01:00
itsmattkc 13dd31d5be began rewrite of renderer inner workings 2020-11-06 20:18:10 +11:00
Simran de48eba713 Make dialog for saving a project actually a save dialog 
AcceptMode defaults to QFileDialog::AcceptOpen
 2020-11-02 12:10:20 +01:00
itsmattkc 60eb71cb4c derive threadpool from cancelableobject 2020-10-30 22:48:25 +11:00
itsmattkc 26e351d363 moved frame cache saving to our custom thread pool so we can control the priority 2020-10-29 03:12:04 +11:00
itsmattkc 84a1ec0ca3 began graphics backend enum 2020-10-29 02:59:18 +11:00
itsmattkc a3a57181a6 re-copy list when waiting since it may have changed 2020-10-29 02:59:10 +11:00
itsmattkc 34cb7c96de further enclosed C locale setting 2020-10-29 02:20:59 +11:00
itsmattkc 00fef29cac fixed issues where hashes wouldn't set correctly 2020-10-29 02:18:58 +11:00
itsmattkc 07dc7104c5 made timerangelist a encapsulation rather than a derivation 
Locks off functionality that really shouldn't be used.
 2020-10-29 02:18:41 +11:00
itsmattkc 59241f9023 generate OCIO extraction directory BEFORE setting C locale for OCIO 2020-10-29 01:39:22 +11:00
itsmattkc b582843d27 moved things around and started rewriting render backend 2020-10-29 01:36:26 +11:00
itsmattkc 94321c0a86 align frames to 32 bytes instead of 16 2020-10-28 15:50:56 +11:00
itsmattkc 43873e79e9 clear decoders when viewer is disconnected 2020-10-28 15:50:20 +11:00
itsmattkc 5343ec4b86 use default playback cache if there's no project 2020-10-28 15:49:53 +11:00
itsmattkc 1e6208517f decoder: fixed regression in image handling in OIIO decoder 
Fixes #1277
 2020-10-27 12:36:55 +11:00
itsmattkc 5f5d6e82ab audioplaybackcache: fixed bug in one of the shift operations 2020-10-24 14:18:59 +11:00
itsmattkc 921608e1df audioplaybackcache: fixed various audio issues 
Fixes #1276
 2020-10-24 13:59:12 +11:00
itsmattkc 7e637a7372 calculate audio bytes as a 64-bit number 2020-10-24 13:55:07 +11:00
itsmattkc cf07e52b76 fixed another shadowed variable 2020-10-24 12:05:52 +11:00
itsmattkc 67987bd758 fixed shadowed variable 2020-10-24 11:28:37 +11:00
itsmattkc 17efd0bd9b default to cache during playback 2020-10-24 10:13:16 +11:00
itsmattkc 253dd86da8 updated OTIO functions for renamed functions 2020-10-24 10:13:06 +11:00
itsmattkc 4082f6d938 Merge branch 'master' of https://github.com/olive-editor/olive 2020-10-23 01:26:49 +11:00
itsmattkc bc60c74562 finalized very, very basic OTIO support 
Ironed out various project and footage loading issues, and a single
cache invalidation issue.
 2020-10-23 01:26:17 +11:00
itsmattkc 9613730ee8 Merge branch 'otio' of https://github.com/olive-editor/olive into otio 2020-10-22 22:13:37 +11:00
itsmattkc 917738d1de Merge branch 'master' into otio 2020-10-22 20:26:16 +11:00
itsmattkc 33a0c2d728 Merge pull request #1275 from ThomasWilshaw/stream 
MediaInput: Rename streams access methods.
 2020-10-20 23:32:00 +11:00
itsmattkc d0858f3f05 Merge pull request #1272 from ThomasWilshaw/Fix#1271_node_duplicate 
Fix #1271 Duplicate Keyframed Node
 2020-10-20 23:31:38 +11:00
itsmattkc c37607bf66 Merge pull request #1269 from ThomasWilshaw/otio_cmake_fix 
Fix building without OTIO support
 2020-10-20 23:31:19 +11:00
itsmattkc 0ec262125c otio: added ability to export a whole project rather than a single sequence 2020-10-20 18:15:39 +11:00
Thomas Wilshaw 4ddc659335 MediaInput: Rename streams access methods. 
Change MediaInput::footage() to MediaInput::stream() and
MediaInput::SetFootage() to MediaInput::SetStream() as they access
streams not footage.

Also update all instances of access methods to reflect this change.
 2020-10-19 15:50:36 +01:00
itsmattkc db8d321fa7 project: improved loading and footage importing 2020-10-19 14:41:01 +11:00
Thomas Wilshaw 7281806c38 Fix #1271 Duplicate Keyframed Node 
When nodes with keyframes were copied their parent NodeInput was not
set properly leading to a segfult when key->GetParent was called in
KeyframeViewItem::UpdatePos().

This fix properly sets parent_ when keys are copied.
 2020-10-16 22:30:54 +01:00