Skip to content

MasterMob Transcribing Changes #44

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.

Sign up for GitHub

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

Merged
timlehr merged 7 commits into from
Aug 26, 2025
Merged

MasterMob Transcribing Changes #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be60034
Version bump
markreidvfx May 15, 2025
e35a838
DataDefinition can be determined from media_kind
markreidvfx May 15, 2025
ed1ea24
Reworking Mob parsing
markreidvfx May 15, 2025
d4898d9
Reworking OperationGroup parsing
markreidvfx May 15, 2025
6e32580
Parse OperationGroup Rendering property
markreidvfx May 15, 2025
49e9562
Parse and decode effect_id
markreidvfx May 15, 2025
f09a971
Drop ci support for python 3.7 and 3.8
markreidvfx May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,14 @@ jobs:
# When OTIO has an Apple Silicon build we can switch back to macos-latest for that version
os: [ubuntu-latest, macos-13, windows-latest, macos-latest]
otio-version: ["main", "0.17.0"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: [ "3.9", "3.10", "3.11", "3.12"]
Copy link
Copy Markdown
Collaborator

@timlehr timlehr May 16, 2025

Choose a reason for hiding this comment

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

Should this be in a separate PR?

include:
- { os: ubuntu-latest, shell: bash }
- { os: ubuntu-22.04, shell: bash, python-version: 3.7 }
- { os: macos-latest, shell: bash }
- { os: macos-13, shell: bash }
- { os: windows-latest, shell: pwsh }
exclude:
- { os: macos-latest, python-version: 3.7 }
- { os: macos-latest, python-version: 3.8 }
- { os: macos-latest, python-version: 3.9 }
- { os: ubuntu-latest, python-version: 3.7 }

name: ${{ matrix.os }} py-${{ matrix.python-version }} otio-${{ matrix.otio-version }}
runs-on: ${{ matrix.os }}
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "hatchling.build"

[project]
name = "otio-aaf-adapter"
version = "1.1.0"
version = "2.0.0"
description = "OpenTimelineIO AAF Adapter"
authors = [
{ name="Contributors to the OpenTimelineIO project", email="otio-discussion@lists.aswf.io" },
Expand All @@ -16,7 +16,7 @@ readme = "README.md"
requires-python = ">=3.7"
dependencies = [
"opentimelineio >= 0.17.0",
"pyaaf2>=1.4.0"
"pyaaf2>=1.7.0"
Copy link
Copy Markdown
Collaborator

@timlehr timlehr May 16, 2025

Choose a reason for hiding this comment

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

Should this be in a separate PR?
Might as well require pyaaf2>=1.7.1

]

classifiers = [
Expand Down
9 changes: 6 additions & 3 deletions src/otio_aaf_adapter/adapters/aaf_adapter/aaf_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,8 @@ def _gather_clip_mob_ids(input_otio,

def _from_clip_metadata(clip):
"""Get the MobID from the clip.metadata."""
return clip.metadata.get("AAF", {}).get("SourceID")
return (clip.metadata.get("AAF", {}).get("MobID") or
clip.metadata.get("AAF", {}).get("SourceID"))

def _from_media_reference_metadata(clip):
"""Get the MobID from the media_reference.metadata."""
Expand Down Expand Up @@ -682,8 +683,8 @@ def aaf_transition(self, otio_transition):
by_pass = op_group_metadata["Operation"].get("Bypass")
number_inputs = op_group_metadata["Operation"].get("NumberInputs")
operation_category = op_group_metadata["Operation"].get("OperationCategory")
data_def_name = op_group_metadata["Operation"]["DataDefinition"]["Name"]
data_def = self.aaf_file.dictionary.lookup_datadef(str(data_def_name))
data_def = self.aaf_file.dictionary.lookup_datadef(str(self.media_kind))

description = op_group_metadata["Operation"]["Description"]
op_def_name = otio_transition.metadata["AAF"][
"OperationGroup"
Expand Down Expand Up @@ -770,6 +771,8 @@ def _create_tapemob(self, otio_clip):
tapemob_slot = tapemob.create_empty_slot(self.edit_rate, self.media_kind)
tapemob_slot.segment.length = int(
otio_clip.media_reference.available_range.duration.value)
tapemob_slot.segment.start = int(
otio_clip.media_reference.available_range.start_time.value)
return tapemob, tapemob_slot

def transcribe_otio_aaf_descriptor(
Expand Down
Loading