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

[RodeoFx] cmx_3600 adapter: Support unnamed markers #594 #598

Conversation

@elabrosseRodeofx
Copy link
Contributor

commented Sep 27, 2019

Issue: #594

Right now the cmx_3600 adapter will not add markers to a clip if it does not have a name.
This PR tweaks the regex that matches locators so it matches with or without names.

This is the content of an cmx_3600 EDL exported from Avid media composer:

TITLE:   Untitled Sequence.01 
FCM: NON-DROP FRAME
001  103043_0 V     C        01:00:00:00 01:00:08:10 01:00:00:00 01:00:08:10 
* FROM CLIP NAME:  MYMEDIA.MOV 
* LOC: 01:00:02:01 RED

As you can see the marker does not have a name

Current behavior:

>>> timeline = otio.adapters.read_from_file('markers.edl')
>>> list(timeline.each_clip())[0].markers
[]

Expected behavior:

>>> timeline = otio.adapters.read_from_file('markers.edl')
>>> list(timeline.each_clip())[0].markers
[
otio.schema.Marker(name='', marked_range=otio.opentime.TimeRange(start_time=otio.opentime.RationalTime(value=86449, rate=24), duration=otio.opentime.RationalTime(value=0, rate=1)), metadata={'cmx_3600': {'color': u'RED'}})
]
@codecov-io

This comment has been minimized.

Copy link

commented Sep 27, 2019

Codecov Report

Merging #598 into master will increase coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #598      +/-   ##
==========================================
+ Coverage    81.6%   81.65%   +0.05%     
==========================================
  Files          72       72              
  Lines        2729     2726       -3     
==========================================
- Hits         2227     2226       -1     
+ Misses        502      500       -2
Flag Coverage Δ
#py27 ?
#py36 81.65% <ø> (?)
#py37 81.65% <ø> (+0.07%) ⬆️
Impacted Files Coverage Δ
...ntimelineio/opentimelineio-bindings/otio_utils.cpp 87.05% <0%> (-0.16%) ⬇️
...eio/opentimelineio-bindings/otio_anyDictionary.cpp 100% <0%> (ø) ⬆️
...elineio/opentimelineio-bindings/otio_anyVector.cpp 100% <0%> (ø) ⬆️
src/opentimelineio/serializableObject.cpp 58.82% <0%> (ø) ⬆️
src/opentimelineio/serialization.cpp 82.6% <0%> (+0.66%) ⬆️

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 74c0951...5a1e6f7. Read the comment docs.

Copy link
Collaborator

left a comment

Could you add a test for this?

@jminor jminor requested a review from mikemahony Sep 27, 2019
@jminor
jminor approved these changes Oct 8, 2019
@jminor jminor merged commit ce13d17 into PixarAnimationStudios:master Oct 9, 2019
1 check passed
1 check passed
Travis CI - Pull Request Build Passed
Details
@jminor

This comment has been minimized.

Copy link
Collaborator

commented Oct 9, 2019

Thanks for the contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Interoperation
  
Awaiting triage
3 participants
You can’t perform that action at this time.