Skip to content

Commit

Permalink
style(xges): Linting for xges adapter and the xges test (#458)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikekoetter @ssteinbach
mikekoetter authored and ssteinbach committed Mar 15, 2019
1 parent 2cafadd commit f236859
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 24 deletions.
1 change: 1 addition & 0 deletions opentimelineio_contrib/adapters/tests/test_xges_adapter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,6 @@ def test_roundtrip_disk2mem2disk(self):
with open(tmp_path, "r") as output_file:
self.assertNotEqual(original_file.read(), output_file.read())


if __name__ == '__main__':
unittest.main()
80 changes: 56 additions & 24 deletions opentimelineio_contrib/adapters/xges.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@
#

"""OpenTimelineIO GStreamer Editing Services XML Adapter. """
import os
import re
import unittest

from collections import defaultdict
from decimal import Decimal
from fractions import Fraction
from xml.etree import cElementTree
Expand Down Expand Up @@ -102,12 +100,12 @@ def get(self, key, default=None):
@staticmethod
def _find_eos(s):
# find next '"' without preceeding '\'
l = 0
line = 0
while 1: # faster than regexp for '[^\\]\"'
p = s.index('"')
l += p + 1
line += p + 1
if s[p - 1] != '\\':
return l
return line
s = s[(p + 1):]
return -1

Expand Down Expand Up @@ -267,7 +265,8 @@ def to_rational_time(self, ns_timestamp):
Returns:
RationalTime: A RationalTime object
"""
return otio.opentime.RationalTime(round(int(ns_timestamp) / (GST_SECOND / self.rate)), self.rate)
return otio.opentime.RationalTime(round(int(ns_timestamp) /
(GST_SECOND / self.rate)), self.rate)

def to_otio(self):
"""
Expand Down Expand Up @@ -359,7 +358,8 @@ def _add_clips_in_track(self, clips, track, all_names):

def _get_clip_name(self, clip, all_names):
i = 0
tmpname = name = clip.get("name", GstStructure(clip.get("properties", "properties;")).get("name"))
tmpname = name = clip.get("name", GstStructure(
clip.get("properties", "properties;")).get("name"))
while True:
if tmpname not in all_names:
all_names.add(tmpname)
Expand All @@ -371,7 +371,8 @@ def _get_clip_name(self, clip, all_names):
def _create_otio_transition(self, clip, all_names):
start = self.to_rational_time(clip.attrib["start"])
end = start + self.to_rational_time(clip.attrib["duration"])
cut_point = otio.opentime.RationalTime((end.value - start.value) / 2, start.rate)
cut_point = otio.opentime.RationalTime((end.value - start.value) /
2, start.rate)

return otio.schema.Transition(
name=self._get_clip_name(clip, all_names),
Expand All @@ -397,7 +398,6 @@ def _create_otio_uri_clip(self, clip, all_names):

return otio_clip


def _create_otio_clip(self, clip, all_names):
otio_clip = None

Expand Down Expand Up @@ -483,7 +483,8 @@ def _get_element_properties(self, element):
return element.metadata.get(META_NAMESPACE, {}).get("properties", "properties;")

def _get_element_metadatas(self, element):
return element.metadata.get(META_NAMESPACE, {"GES": {}}).get("metadatas", "metadatas;")
return element.metadata.get(META_NAMESPACE,
{"GES": {}}).get("metadatas", "metadatas;")

def _serialize_ressource(self, ressources, ressource, asset_type):
if isinstance(ressource, otio.schema.MissingReference):
Expand All @@ -495,26 +496,40 @@ def _serialize_ressource(self, ressources, ressource, asset_type):

properties = GstStructure(self._get_element_properties(ressource))
if properties.get('duration') is None:
properties.set('duration', 'guin64', to_gstclocktime(ressource.available_range.duration))
properties.set('duration', 'guin64',
to_gstclocktime(ressource.available_range.duration))

self._insert_new_sub_element(
ressources, 'asset',
attrib={
"id": ressource.target_url,
"extractable-type-name": 'GESUriClip',
"properties": str(properties),
"metadatas": self._get_element_metadatas(ressource),
"metadatas": self._get_element_metadatas(ressource),
}
)

def _get_transition_times(self, offset, otio_transition):
rational_offset = otio.opentime.RationalTime(round(int(offset) / (GST_SECOND / self.rate)), self.rate)
rational_offset = otio.opentime.RationalTime(
round(int(offset) / (GST_SECOND / self.rate)),
self.rate
)
start = rational_offset - otio_transition.in_offset
end = rational_offset + otio_transition.out_offset

return 0, to_gstclocktime(start), to_gstclocktime(end - start)

def _serialize_clip(self, otio_track, layer, layer_priority, ressources, otio_clip, clip_id, offset):
def _serialize_clip(
self,
otio_track,
layer,
layer_priority,
ressources,
otio_clip,
clip_id,
offset
):

# FIXME - Figure out a proper way to determine clip type!
asset_id = "GESTitleClip"
asset_type = "GESTitleClip"
Expand All @@ -532,7 +547,7 @@ def _serialize_clip(self, otio_track, layer, layer_priority, ressources, otio_cl
asset_type = "GESUriClip"

self._serialize_ressource(ressources, otio_clip.media_reference,
asset_type)
asset_type)

if otio_track.kind == otio.schema.TrackKind.Audio:
track_types = GESTrackType.AUDIO
Expand Down Expand Up @@ -561,12 +576,19 @@ def _serialize_clip(self, otio_track, layer, layer_priority, ressources, otio_cl
"rate": '0',
"inpoint": str(inpoint),
"duration": str(duration),
"metadatas": self._get_element_metadatas(otio_clip),
"metadatas": self._get_element_metadatas(otio_clip),
}
)

def _serialize_tracks(self, timeline, otio_timeline):
properties = 'properties, restriction-caps=(string)audio/x-raw(ANY),framerate=(GstFraction)1/%s' % otio_timeline.duration().rate
audio_vals = (
'properties',
'restriction-caps=(string)audio/x-raw(ANY)',
'framerate=(GstFraction)1',
otio_timeline.duration().rate
)

properties = '%s, %s,%s/%s' % audio_vals
self._insert_new_sub_element(
timeline, 'track',
attrib={
Expand All @@ -577,7 +599,14 @@ def _serialize_tracks(self, timeline, otio_timeline):
}
)

properties = 'properties, restriction-caps=(string)video/x-raw(ANY),framerate=(GstFraction)1/%s' % otio_timeline.duration().rate
video_vals = (
'properties',
'restriction-caps=(string)video/x-raw(ANY)',
'framerate=(GstFraction)1',
otio_timeline.duration().rate
)

properties = '%s, %s,%s/%s' % video_vals
for otio_track in otio_timeline.tracks:
if otio_track.kind == otio.schema.TrackKind.Video:
self._insert_new_sub_element(
Expand All @@ -602,12 +631,14 @@ def _serialize_layer(self, timeline, layers, layer_priority):
)

def _serialize_timeline_element(self, timeline, layers, layer_priority,
offset, otio_track, otio_element, ressources, all_clips):
offset, otio_track, otio_element,
ressources, all_clips):
self._serialize_layer(timeline, layers, layer_priority)
layer = layers[layer_priority]
if isinstance(otio_element, (otio.schema.Clip, otio.schema.Transition)):
element = self._serialize_clip(otio_track, layer, layer_priority,
ressources, otio_element, str(len(all_clips)), offset)
ressources, otio_element,
str(len(all_clips)), offset)
all_clips.add(element)
if isinstance(otio_element, otio.schema.Transition):
# Make next clip overlap
Expand Down Expand Up @@ -655,7 +686,7 @@ def _serialize_timeline(self, project, ressources, otio_timeline):
project, 'timeline',
attrib={
"properties": self._get_element_properties(otio_timeline),
"metadatas": str(metadatas),
"metadatas": str(metadatas),
}
)
self._serialize_tracks(timeline, otio_timeline)
Expand Down Expand Up @@ -691,13 +722,13 @@ def to_xges(self):

metadatas = GstStructure(self._get_element_metadatas(self.container))
if self.container.name is not None:
metadatas.set( "name", "string", self.container.name)
metadatas.set("name", "string", self.container.name)
if not isinstance(self.container, otio.schema.Timeline):
project = self._insert_new_sub_element(
xges, 'project',
attrib={
"properties": self._get_element_properties(self.container),
"metadatas": str(metadatas),
"metadatas": str(metadatas),
}
)

Expand All @@ -711,7 +742,7 @@ def to_xges(self):
project = self._insert_new_sub_element(
xges, 'project',
attrib={
"metadatas": str(metadatas),
"metadatas": str(metadatas),
}
)
otio_timeline = self.container
Expand Down Expand Up @@ -783,5 +814,6 @@ def test_empty_string(self):
struct = GstStructure('properties, name=(string)"";')
self.assertEqual(struct["name"], "")


if __name__ == '__main__':
unittest.main()

0 comments on commit f236859

Please sign in to comment.