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

Custom fps cmx3600 #187

Merged
merged 8 commits into from Nov 20, 2017

Conversation

Projects
None yet
3 participants
@tuan-huy-truong
Contributor

tuan-huy-truong commented Nov 17, 2017

Clean branch for custom rate implementation based on adapter keyword arguments
Added 25fps edl in samples
Added test in test_cmx_3660.py

@jminor

jminor approved these changes Nov 18, 2017

This looks great, and we got the CLA from your company.

FYI, instead of making a new PR each time, you can just push new changes to the same branch and the PR will update. We tend to use Squash and Merge when accepting PRs, so the history will stay clean and simple on the master branch. We plan to accept this PR on Monday. Let us know if you want to make any more changes before we accept it.

Show outdated Hide outdated opentimelineio/adapters/cmx_3600.py
self.assertEqual(track[0].source_range.duration.value, 161)
self.assertEqual(track[1].source_range.duration.value, 200)
self.assertEqual(track[2].source_range.duration.value, 86)
self.assertEqual(track[3].source_range.duration.value, 49)

This comment has been minimized.

@jminor

jminor Nov 18, 2017

Collaborator

Thanks for writing a test for this :)

@jminor

jminor Nov 18, 2017

Collaborator

Thanks for writing a test for this :)

@tuan-huy-truong

This comment has been minimized.

Show comment
Hide comment
@tuan-huy-truong

tuan-huy-truong Nov 20, 2017

Contributor

Sorry for several PRs. It's just that i messed up my branches here so I deleted everything and start from scratch. Will do next time. Thanks

Contributor

tuan-huy-truong commented Nov 20, 2017

Sorry for several PRs. It's just that i messed up my branches here so I deleted everything and start from scratch. Will do next time. Thanks

Show outdated Hide outdated opentimelineio/adapters/cmx_3600.py
Show outdated Hide outdated opentimelineio/adapters/cmx_3600.py
@jminor

jminor approved these changes Nov 20, 2017

Thanks! This looks great. Is there anything else you plan to add, or are you ready for us to accept this PR?

@tuan-huy-truong

This comment has been minimized.

Show comment
Hide comment
@tuan-huy-truong

tuan-huy-truong Nov 20, 2017

Contributor

I'm ready. Thanks

Contributor

tuan-huy-truong commented Nov 20, 2017

I'm ready. Thanks

@jminor jminor merged commit 774324a into PixarAnimationStudios:master Nov 20, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jminor

This comment has been minimized.

Show comment
Hide comment
@jminor

jminor Nov 20, 2017

Collaborator

Thanks for the contribution!

Collaborator

jminor commented Nov 20, 2017

Thanks for the contribution!

@tuan-huy-truong

This comment has been minimized.

Show comment
Hide comment
@tuan-huy-truong

tuan-huy-truong Nov 20, 2017

Contributor

My pleasure.

Contributor

tuan-huy-truong commented Nov 20, 2017

My pleasure.

@jminor jminor added this to the Public Beta 7 milestone Dec 9, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment