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

Add support for multiple timecode objects in an AAF #966

Merged
merged 7 commits into from
May 12, 2021

Conversation

stefanschulze
Copy link
Contributor

The current implementation of the AAF reader is very strict if it comes to the number of discovered TimeCode objects in the AAF. If there is more than one TimeCode object found, the reader throws an exception.

However, there are situations where you can have multiple TimeCode objects, for example one created via the AuxTC24 bin-column in MediaComposer.

This change relaxes the rule a bit by accepting multiple TimeCode objects as long as they have the same start and length, in which case they are considered 'same'.

Also added an AAF with such multiple TimeCode objects and updated test_aaf_adapter to just read that AAF to make sure it can be read without throwing an exception.

Copy link
Collaborator

@meshula meshula left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@codecov-commenter
Copy link

codecov-commenter commented May 11, 2021

Codecov Report

Merging #966 (e223153) into master (76368b5) will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #966      +/-   ##
==========================================
+ Coverage   85.61%   85.63%   +0.01%     
==========================================
  Files         191      191              
  Lines       18212    18227      +15     
  Branches     2071     2074       +3     
==========================================
+ Hits        15593    15608      +15     
  Misses       2088     2088              
  Partials      531      531              
Flag Coverage Δ
unittests 85.63% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...neio_contrib/adapters/advanced_authoring_format.py 86.24% <100.00%> (+0.28%) ⬆️
...elineio_contrib/adapters/tests/test_aaf_adapter.py 98.22% <100.00%> (+0.01%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 76368b5...e223153. Read the comment docs.

Copy link
Collaborator

@ssteinbach ssteinbach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, just had some style things in there. Thanks @stefanschulze!

stefanschulze and others added 3 commits May 11, 2021 14:51
…mat.py

Co-authored-by: Stephan Steinbach <61017+ssteinbach@users.noreply.github.com>
…mat.py

Co-authored-by: Stephan Steinbach <61017+ssteinbach@users.noreply.github.com>
Co-authored-by: Stephan Steinbach <61017+ssteinbach@users.noreply.github.com>
Copy link
Collaborator

@jminor jminor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. I made a couple of small requests.

Copy link
Collaborator

@meshula meshula left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor typos

Copy link
Collaborator

@ssteinbach ssteinbach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks @stefanschulze

@jminor jminor added this to To do in AAF Adapter via automation May 12, 2021
@jminor jminor added this to the Public Beta 14 milestone May 12, 2021
@jminor jminor merged commit 5b7b715 into AcademySoftwareFoundation:master May 12, 2021
AAF Adapter automation moved this from To do to Done May 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
AAF Adapter
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

5 participants