Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: AcademySoftwareFoundation/OpenTimelineIO
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: GPLgithub/OpenTimelineIO
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Jun 27, 2022

  1. Squashed commit of the following: 

    commit beac098
Merge: 98a85b8 d48163e
Author: Stephane Deverly <[email protected]>
Date:   Thu Jun 23 18:30:44 2022 +0200

    Merge remote-tracking branch 'asf/main'

commit 98a85b8
Author: Stéphane Deverly <[email protected]>
Date:   Thu Jun 23 17:12:27 2022 +0200

    8956 cmx transitions (#1)

    Revisited how transitions are handled by the cmx 3600 adapter.

    - Transitions lines are now collected when parsing EDL lines and treated by the ClipHandler.
    - The clip source and record points are replaced with the transition values when the line is parsed.
    - The transition in_offset is now 0 and the out_offset is the transition duration, matching in the timeline what would be done if the editing was read from another format.
    - The transition is added just before the clip when it is added to a track, and that's it.
    - Adjusted tests for the new way of handling transitions, added some other checks.
    - Added an EDL read/write/read roundtrip to check that the reader and writer are compatible.
    - Removed code which was not needed anymore.

Signed-off-by: Stephane Deverly <[email protected]>
    @gplsteph
    gplsteph committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    23dfc87 View commit details
    Browse the repository at this point in the history
Loading