offset is no longer implicitly multiplied by clip speed

WyattBlue · Apr 12, 2024 · 8a8f2ef · 8a8f2ef
1 parent 6b6f262
commit 8a8f2ef
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/auto_editor/formats/fcp11.py b/auto_editor/formats/fcp11.py
@@ -140,7 +140,7 @@ def make_clip(ref: str, clip: TlVideo | TlAudio, speed_warn: bool) -> bool:
             "ref": ref,
             "offset": fraction(clip.start),
             "duration": fraction(clip.dur),
-            "start": fraction(int(clip.offset // clip.speed)),
+            "start": fraction(clip.offset),
             "tcFormat": "NDF",
         }
         asset = SubElement(spine, "asset-clip", clip_properties)

diff --git a/auto_editor/formats/fcp7.py b/auto_editor/formats/fcp7.py
@@ -296,7 +296,7 @@ def xml_bool(val: str) -> bool:
 
                 start = clipitem["start"]
                 dur = clipitem["end"] - start
-                offset = int(clipitem["in"] * speed)
+                offset = clipitem["in"]
 
                 vobjs[t].append(
                     TlVideo(start, dur, sources[file_id], offset, speed, stream=0)
@@ -324,7 +324,7 @@ def xml_bool(val: str) -> bool:
 
                 start = clipitem["start"]
                 dur = clipitem["end"] - start
-                offset = int(clipitem["in"] * speed)
+                offset = clipitem["in"]
 
                 aobjs[t].append(
                     TlAudio(
@@ -414,8 +414,8 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
 
             _start = f"{clip.start}"
             _end = f"{clip.start + clip.dur}"
-            _in = f"{int(clip.offset / clip.speed)}"
-            _out = f"{int(clip.offset / clip.speed) + clip.dur}"
+            _in = f"{clip.offset}"
+            _out = f"{clip.offset + clip.dur}"
 
             clipitem = ET.SubElement(track, "clipitem", id=f"clipitem-{j+1}")
             ET.SubElement(clipitem, "name").text = src.path.stem
@@ -473,8 +473,8 @@ def fcp7_write_xml(name: str, output: str, tl: v3, log: Log) -> None:
 
                 _start = f"{aclip.start}"
                 _end = f"{aclip.start + aclip.dur}"
-                _in = f"{int(aclip.offset / aclip.speed)}"
-                _out = f"{int(aclip.offset / aclip.speed) + aclip.dur}"
+                _in = f"{aclip.offset}"
+                _out = f"{aclip.offset + aclip.dur}"
 
                 if not src.videos:
                     clip_item_num = j + 1

diff --git a/auto_editor/formats/shotcut.py b/auto_editor/formats/shotcut.py
@@ -92,7 +92,7 @@ def shotcut_write_mlt(output: str, tl: v3) -> None:
 
     for clip in clips:
         src = clip.src
-        length = to_timecode((clip.offset / clip.speed + clip.dur) / tb, "standard")
+        length = to_timecode((clip.offset + clip.dur) / tb, "standard")
 
         if clip.speed == 1:
             resource = f"{src.path}"
@@ -127,8 +127,8 @@ def shotcut_write_mlt(output: str, tl: v3) -> None:
 
     producers = 0
     for i, clip in enumerate(clips):
-        _in = to_timecode(clip.offset / clip.speed / tb, "standard")
-        _out = to_timecode((clip.offset / clip.speed + clip.dur) / tb, "standard")
+        _in = to_timecode(clip.offset / tb, "standard")
+        _out = to_timecode((clip.offset + clip.dur) / tb, "standard")
 
         tag_name = f"chain{i}"
         if clip.speed != 1:

diff --git a/auto_editor/make_layers.py b/auto_editor/make_layers.py
@@ -42,7 +42,7 @@ def clipify(chunks: Chunks, src: FileInfo, start: int = 0) -> list[Clip]:
             if dur == 0:
                 continue
 
-            offset = chunk[0]
+            offset = int(chunk[0] / chunk[2])
 
             if not (clips and clips[-1].start == round(start)):
                 clips.append(Clip(start, dur, offset, chunk[2], src))
@@ -228,7 +228,7 @@ def echunk(
             if dur == 0:
                 continue
 
-            offset = chunk[1]
+            offset = int(chunk[1] / chunk[3])
 
             if not (clips and clips[-1].start == round(start)):
                 clips.append(Clip(start, dur, offset, chunk[3], chunk[0]))

diff --git a/auto_editor/preview.py b/auto_editor/preview.py
@@ -32,7 +32,8 @@ def all_cuts(tl: v3, in_len: int) -> list[int]:
     oe: list[tuple[int, int]] = []
 
     for clip in tl.a[0]:
-        oe.append((clip.offset, clip.offset + clip.dur))
+        old_offset = clip.offset * clip.speed
+        oe.append((round(old_offset * clip.speed), round(old_offset + clip.dur)))
 
     cut_lens = []
     i = 0

diff --git a/auto_editor/render/audio.py b/auto_editor/render/audio.py
@@ -208,8 +208,8 @@ def make_new_audio(
                 del leng
 
             samp_list = samples[(clip.src, clip.stream)]
-            samp_start = clip.offset * sr // tb
-            samp_end = round((clip.offset + clip.dur * clip.speed) * sr / tb)
+            samp_start = round(clip.offset * clip.speed * sr / tb)
+            samp_end = round((clip.offset + clip.dur) * clip.speed * sr / tb)
             if samp_end > len(samp_list):
                 samp_end = len(samp_list)
 

diff --git a/auto_editor/render/video.py b/auto_editor/render/video.py
@@ -244,7 +244,7 @@ def render_av(
                 for lobj in layer:
                     if isinstance(lobj, TlVideo):
                         if index >= lobj.start and index < (lobj.start + lobj.dur):
-                            _i = lobj.offset + round((index - lobj.start) * lobj.speed)
+                            _i = round((lobj.offset + index - lobj.start) * lobj.speed)
                             obj_list.append(VideoFrame(_i, lobj.src))
                     elif index >= lobj.start and index < lobj.start + lobj.dur:
                         obj_list.append(lobj)