OpenTimelineIO
OpenTimelineIO copied to clipboard
EDL CMX 3600 Adapter: Fix Source Out calculation when a TimeWarp retiming effect is present
Signed-off-by: Nikita Glukhov [email protected]
Link the Issue(s) this Pull Request is related to.
Fixes #1458
Summarize your change.
Fixed an error in calculating the Source Out timecode value.
The division is replaced by multiplication. Fixed math of clip length summation.
The committers listed above are authorized under a signed CLA.
- :white_check_mark: login: ghost-luck / name: Nikita Glukhov (2018a7b2f879518eb9ef1bcca1e571cbcd526895, 9816a14afbc01fefb86fc337800b63fce9efe308, 9315c8df8f5841b209b95c85375e2b04726b8ed9)
The committers listed above are authorized under a signed CLA.
- :white_check_mark: login: ghost-luck / name: Nikita Glukhov (2018a7b2f879518eb9ef1bcca1e571cbcd526895, d3c9d00a8b82549578b951cdc5223740c6ee62a7)
Can you please include a unit test?
Added.
Going to close and re-open to trigger CI
CI is failing for a reason that seems unrelated to this PR, I can't see the trailing whitespace. line 1003 is not in the PR, nor does it have 84 characters on it???? @ghost-luck @reinecke can you see it?
lists of files in version control and sdist match
check-manifest succeeded
./src/py-opentimelineio/opentimelineio/adapters/cmx_3600.py:1003:84: W291 trailing whitespace
make: *** [Makefile:159: lint] Error 1
Error: Process completed with exit code 2.
@ghost-luck So sorry to have lost track of this item. I've been doing a re-build of the CMX reader from scratch to address a collection of these kinds of issues. Would you be able to take a look at that branch and let me know if it addresses this issue?
When I ran your sample test case through my branch, I got this error:
E AssertionError: 'TITL[19 chars]ARP\n\n001 B113RPTW V C 00:32:02:0[100 chars]01\n' != 'TITL[19 chars]ARP\n001 B113RPTW V C 00:32:02:06 [98 chars]01\n'
E TITLE: SOURCE_OUT_TIMEWARP
E -
E - 001 B113RPTW V C 00:32:02:06 00:32:06:20 01:34:53:09 01:34:57:13
E ? ^^
E + 001 B113RPTW V C 00:32:02:06 00:32:06:19 01:34:53:09 01:34:57:13
E ? ^^
E M2 000001 26.4 00:32:02:06
E * FROM CLIP NAME: 000001
tests/test_cmx_3600_adapter.py:1429: AssertionError
Is it possible this off-by-one is a rounding issue?