Commit eaa0281
Adsk Contrib - Add Support for SMPTE ST 2036-1 compliant CLF files (#2265)
* Adding reading and writing support for SMPTE ST 2036-1 compliant CLF files.
- Added "Id" element support per the spec.
- Extended the CTFVersion class to handle non-numeric formats per the spec (which uses xmlns as the version)
- CLF xml parser now strips the namespaces from the elements by default. This makes it possible to parse files with simple name spaces but complex name-spaced clf files may still fail. There is an internal switch to turn on/off the name space stripping. This way elements which need to retain the name spaces (such as the Info element) can still get the un-stripped names.
- Extended the Input and Output Descriptor collection to hold multiple entries (similar to Description field)
- CLF writer now writes the SMPTE xmlns version as well as the CompCLFVersion attribute. The resulting files can be read both by the Academy CLF parsers and SMPTE CLF parsers.
- Generated cache hash IDs are now in the 8-4-4-4-12 UUID format to help complying with SMPTE id requirements
- ociomakeclf tool now takes "--generateid" switch to for inserting newly added "Id element" into the target clf file.
TODO:
- Description and Descriptor elements need to collect the language attribute.
- non-default namespace attributes (e.g. xmlns:foo) needs to be collected as root level attributes.
- Those two TODO items need some re-factoring in the data collection code.
Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com>
* - Per the code review, exposing the newly added constant METADATA_ID_ELEMENT in python too.
Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com>
* - re-worked some part of the CLF parser and the CTFReaderTransform class to be able to collect richer metadata.
- Now collecting the language attribute of the Description, input and output descriptor elements.
- Also collecting the non-default xmlns attributes at the root level.
- Updated the tests accordingly.
- Replaced clf/pre-smpte_only/matrix_example.clf with clf/matrix_example_utf8.clf in some for some Reference tests.
- Added format information to the ociomakeclf tool's help text.
Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com>
* - nmake the compilers happy.
Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com>
* - make the compilers happy pt2
Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com>
* - make the compilers happy pt3
(we need to make Windows compiler settings as picky as other platforms)
Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com>
---------
Signed-off-by: cuneyt.ozdas <cuneyt.ozdas@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>1 parent a1ab61e commit eaa0281
121 files changed
Lines changed: 37775 additions & 798 deletions
File tree
- include/OpenColorIO
- src
- OpenColorIO
- fileformats
- cdl
- ctf
- xmlutils
- ops
- cdl
- gradingprimary
- transforms
- apps/ociomakeclf
- bindings/python
- tests
- cpu
- apphelpers
- fileformats
- ctf
- ops/reference
- transforms
- data/files
- clf
- illegal
- pre-smpte_only
- illegal
- smpte_only
- illegal
- python
- testutils
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
977 | 977 | | |
978 | 978 | | |
979 | 979 | | |
| 980 | + | |
| 981 | + | |
| 982 | + | |
| 983 | + | |
| 984 | + | |
| 985 | + | |
| 986 | + | |
980 | 987 | | |
981 | 988 | | |
982 | 989 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
28 | 52 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
17 | 21 | | |
18 | 22 | | |
19 | 23 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
330 | 330 | | |
331 | 331 | | |
332 | 332 | | |
333 | | - | |
334 | | - | |
335 | | - | |
336 | | - | |
337 | | - | |
338 | | - | |
339 | | - | |
340 | | - | |
341 | | - | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
342 | 336 | | |
343 | 337 | | |
344 | 338 | | |
| |||
0 commit comments