0x2620/oxtimelines
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

format

Browse source
This commit is contained in:
j 2017-01-07 16:42:09 +01:00
parent d6ef829998
commit 308513b5de
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
oxtimelines/timeline.py
View file

@ -32,7 +32,7 @@ class Timelines():
self.tile_path = tile_path self.tile_path = tile_path
self.cuts_path = cuts_path self.cuts_path = cuts_path
self.detect_cuts = cuts_path != None self.detect_cuts = cuts_path is not None
self.points = points self.points = points
@ -52,7 +52,7 @@ class Timelines():
self.no_cuts = [] self.no_cuts = []
self.short_cut = None self.short_cut = None
self.cut_frames = [] self.cut_frames = []
self.max_cut_len = 15000 # 10 minutes self.max_cut_len = 15000 # 10 minutes
self.max_distance = 64 * math.sqrt(3 * pow(255, 2)) self.max_distance = 64 * math.sqrt(3 * pow(255, 2))
else: else:
self.cuts = [] self.cuts = []
@ -117,9 +117,9 @@ class Timelines():
if self.render_video and not video.video: if self.render_video and not video.video:
self.modes = ['audio'] self.modes = ['audio']
self.render_antialias = \ self.render_antialias = \
self.render_slitscan = \ self.render_slitscan = \
self.render_keyframes = \ self.render_keyframes = \
self.render_video = False self.render_video = False
if not self.points: if not self.points:
self.in_frame = 0 self.in_frame = 0
@ -138,7 +138,7 @@ class Timelines():
self.large_tile_last_w = self.frame_n % self.large_tile_w or self.large_tile_w self.large_tile_last_w = self.frame_n % self.large_tile_w or self.large_tile_w
if self.render_small_tiles: if self.render_small_tiles:
self.small_tile_n = int(math.ceil(self.duration / self.small_tile_w)) self.small_tile_n = int(math.ceil(self.duration / self.small_tile_w))
self.small_tile_last_w =int(math.ceil(self.duration % self.small_tile_w)) or self.small_tile_w self.small_tile_last_w = int(math.ceil(self.duration % self.small_tile_w)) or self.small_tile_w
if self.render_antialias or self.render_audio: if self.render_antialias or self.render_audio:
self._open_full_tile() self._open_full_tile()
@ -532,7 +532,7 @@ class Profiler():
def set_task(self, task): def set_task(self, task):
now = time() now = time()
if self.task: if self.task:
if not self.task in self.times: if self.task not in self.times:
self.times[self.task] = 0 self.times[self.task] = 0
else: else:
self.times[self.task] += now - self.time self.times[self.task] += now - self.time
@ -541,4 +541,4 @@ class Profiler():
self.time = now self.time = now
def unset_task(self): def unset_task(self):
self.set_task(self.previous_task) self.set_task(self.previous_task)