Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AAF adapter #230

Merged
merged 35 commits into from
Feb 13, 2018
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
efc6cf4
Starting from scratch.
jminor Sep 7, 2017
a0f00fe
Getting most of the structure and clip names...
jminor Sep 8, 2017
3f7df05
Getting more AAF properties.
jminor Sep 11, 2017
89a4e1e
Transition support (#2)
mikemahony Nov 17, 2017
6dade46
Switched otio.schema.Sequence to otio.schema.Track.
jminor Nov 17, 2017
015c790
Added a simple test case for the new AAF adapter.
jminor Dec 6, 2017
c2f99dd
Lint.
jminor Dec 6, 2017
7777771
Introduced OTIO_AAF_PYTHON_LIB for locating PyAAF.
jminor Dec 6, 2017
03320e5
Lint.
jminor Dec 6, 2017
b64b1da
Testing simplify vs non-simplify to get the right balance.
jminor Dec 6, 2017
dd0a82e
Simplify is working now.
jminor Dec 6, 2017
f2658cd
Lint.
jminor Dec 6, 2017
9a6f87f
Starting to get the timing of transitions... but not quite right yet.
jminor Dec 8, 2017
9230a92
Pull metadata from MasterMobs into each SourceClip's media_reference.
jminor Dec 15, 2017
6bf7283
Added a unit test for getting AAF UserComments.
jminor Dec 15, 2017
b836d18
Test for more custom column metadata.
jminor Dec 16, 2017
58eaeec
When simplifying an AAF composition, don't remove Gaps from Sequences…
jminor Dec 18, 2017
ab70ae2
Added a test to verify that the AAF adapter handles trims and gaps co…
jminor Dec 18, 2017
735cbea
Fixed AAF Transition parsing to conform to the OTIO model for source_…
jminor Dec 18, 2017
8931fd9
Lint.
jminor Dec 18, 2017
6188f90
Prep work for pulling Markers from AAF.
jminor Dec 19, 2017
6ad0028
Give anonymous AAF objects unique names to avoid issues with the OTIO…
jminor Dec 20, 2017
c044d9d
Avoid an extra level of nesting at the top of a multitrack AAF.
jminor Dec 20, 2017
2f9192a
Updated test based on new unique naming.
jminor Dec 20, 2017
28415f5
Lint.
jminor Dec 22, 2017
e959fb6
Don't worry about unicode in Python 3+
jminor Jan 4, 2018
62dd139
Lint.
jminor Jan 4, 2018
2837024
Trying to get both Python 2 & 3 to work properly.
jminor Jan 5, 2018
aa8b94c
Verify that a multitrack AAF flattens down to a single track that is …
jminor Jan 5, 2018
0ddb7ff
Cleaner way of dealing with Python 2 vs 3 unicode support.
jminor Jan 5, 2018
628b2a3
Fixed media_reference
jminor Jan 12, 2018
cbe68c4
Add PyAAF to Travis CI (#229)
jminor Feb 9, 2018
7dfeb86
Defend against adjacent transitions and clips with no source_range.
jminor Jan 23, 2018
c355958
Look for OTIO_AAF_PYTHON_LIB when running tests (still optional).
jminor Feb 9, 2018
b05c617
Addressed some code review notes.
jminor Feb 12, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,25 @@ python:
- "2.7"
- "3.5"

env:
global:
- PYAAF27=PyAAF-1.0.0-cp27-cp27mu-manylinux1_x86_64.whl
- PYAAF35=PyAAF-1.0.0-cp35-cp35m-manylinux1_x86_64.whl

before_install:
# Note that pyaaf is only needed for the AAF adapter
# We need to get a wheel that matches our Python version
- if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then export PYAAF=$PYAAF27 ; else export PYAAF=$PYAAF35; fi
- wget -qO /tmp/${PYAAF} "https://github.com/markreidvfx/pyaaf/releases/download/v1.0.0/${PYAAF}"

install:
- pip install pep8 pyflakes flake8 coverage Pillow
- pip install pep8 pyflakes flake8 coverage
- pip install Pillow # only needed for some contrib adapters
- pip install --upgrade pip setuptools wheel
- pip install /tmp/${PYAAF}

script:
- make lint
- make test
- make test-contrib
- make coverage
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ Final Cut Pro X XML Format:
- http://www.amwa.tv/downloads/specifications/aafobjectspec-v1.1.pdf
- http://www.amwa.tv/downloads/specifications/aafeditprotocol.pdf

- set ${OTIO_AAF_PYTHON_LIB} to point the location of the PyAAF module.

Contrib Adapters
----------------

Expand Down
Loading