Skip to content

Commit

Permalink
Refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
darbyjohnston committed Aug 19, 2024
1 parent 83997e6 commit 0daca5e
Show file tree
Hide file tree
Showing 10 changed files with 438 additions and 15 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ Color space conversion:

![Color Space](images/ColorSpace.png)

Multiple effects on clips, tracks, and stacks:

![Track Effects](images/MultipleEffects.png)

![Multiple Effects Graph](images/MultipleEffectsGraph.svg)

Building
========

Expand Down
158 changes: 157 additions & 1 deletion data/Generator.otio
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,82 @@
},
"name": "Fill"
},
{
"OTIO_SCHEMA": "Clip.1",
"media_reference": {
"OTIO_SCHEMA": "GeneratorReference.1",
"available_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 1
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"generator_kind": "Fill",
"parameters": {
"size": [ 1280, 720 ],
"color": [ 0.0, 1.0, 0.0, 1.0 ]
}
},
"source_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 1
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"name": "Fill"
},
{
"OTIO_SCHEMA": "Clip.1",
"media_reference": {
"OTIO_SCHEMA": "GeneratorReference.1",
"available_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 1
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"generator_kind": "Fill",
"parameters": {
"size": [ 1280, 720 ],
"color": [ 0.0, 0.0, 1.0, 1.0 ]
}
},
"source_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 1
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"name": "Fill"
},
{
"OTIO_SCHEMA": "Clip.1",
"media_reference": {
Expand Down Expand Up @@ -103,6 +179,86 @@
"value": 0
}
},
"generator_kind": "Checkers",
"parameters": {
"size": [ 1280, 720 ],
"checkerSize": [ 200, 200 ],
"color1": [ 1.0, 1.0, 1.0, 1.0 ],
"color2": [ 0.0, 0.0, 0.0, 1.0 ]
}
},
"source_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 1
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"name": "Checkers"
},
{
"OTIO_SCHEMA": "Clip.1",
"media_reference": {
"OTIO_SCHEMA": "GeneratorReference.1",
"available_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 1
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"generator_kind": "Checkers",
"parameters": {
"size": [ 1280, 720 ],
"checkerSize": [ 300, 300 ],
"color1": [ 1.0, 1.0, 1.0, 1.0 ],
"color2": [ 0.0, 0.0, 0.0, 1.0 ]
}
},
"source_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 1
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"name": "Checkers"
},
{
"OTIO_SCHEMA": "Clip.1",
"media_reference": {
"OTIO_SCHEMA": "GeneratorReference.1",
"available_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 3
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"generator_kind": "Noise",
"parameters": {
"size": [ 1280, 720 ],
Expand All @@ -118,7 +274,7 @@
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 1
"value": 3
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
Expand Down
122 changes: 122 additions & 0 deletions data/MultipleEffects.otio
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"OTIO_SCHEMA": "Timeline.1",
"metadata": {},
"name": "MultipleEffects",
"tracks": {
"OTIO_SCHEMA": "Stack.1",
"effects": [
{
"OTIO_SCHEMA": "PowEffect.1",
"effect_name": "",
"value": 2
}
],
"children": [
{
"OTIO_SCHEMA": "Track.1",
"effects": [
{
"OTIO_SCHEMA": "InvertEffect.1",
"effect_name": "",
"value": 0.0
}
],
"children": [
{
"OTIO_SCHEMA": "Clip.1",
"media_reference": {
"OTIO_SCHEMA": "ExternalReference.1",
"available_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 5
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"target_url": "Charlie.jpg"
},
"effects": [
{
"OTIO_SCHEMA": "FlipEffect.1",
"effect_name": ""
},
{
"OTIO_SCHEMA": "BlurEffect.1",
"effect_name": "",
"radius": 30
}
],
"source_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 5
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"name": "Charlie"
},
{
"OTIO_SCHEMA": "Clip.1",
"media_reference": {
"OTIO_SCHEMA": "ExternalReference.1",
"available_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 5
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"target_url": "Charlie.jpg"
},
"effects": [
{
"OTIO_SCHEMA": "FlopEffect.1",
"effect_name": ""
},
{
"OTIO_SCHEMA": "ColorMapEffect.1",
"effect_name": "",
"map_name": "plasma"
}
],
"source_range": {
"OTIO_SCHEMA": "TimeRange.1",
"duration": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 5
},
"start_time": {
"OTIO_SCHEMA": "RationalTime.1",
"rate": 24,
"value": 0
}
},
"name": "Charlie"
}
],
"kind": "Video",
"name": "Video"
}
],
"name": "Stack"
}
}
Binary file modified images/Generator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/MultipleEffects.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions images/MultipleEffectsGraph.dot
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
digraph MultipleEffects {
node [shape=box, fontsize=12, margin=0.05, width=0, height=0];
Pow_2560849241088 [label="Pow"]
Comp_2560849246288 -> Pow_2560849241088
Comp_2560849246288 [label="Comp"]
Invert_2560932117488 -> Comp_2560849246288
Invert_2560932117488 [label="Invert"]
Blur_2560849246080 -> Invert_2560932117488
Blur_2560849246080 [label="Blur"]
Flip_2560932119216 -> Blur_2560849246080
Flip_2560932119216 [label="Flip"]
Read_2560840968656 -> Flip_2560932119216
Read_2560840968656 [label="Read: Charlie.jpg"]
Fill_2560840970288 -> Comp_2560849246288
Fill_2560840970288 [label="Fill: 0, 0, 0, 1"]
}
Loading

0 comments on commit 0daca5e

Please sign in to comment.