Merge media with and w/o audio

WyattBlue · Jun 21, 2022 · c56b585 · c56b585
1 parent 4182b0f
commit c56b585
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 22 deletions.
diff --git a/auto_editor/edit.py b/auto_editor/edit.py
@@ -244,7 +244,7 @@ def pad_chunk(chunk: Chunk, total: int) -> Chunks:
                 continue
 
             _c = pad_chunk(chunk, total_frames)
-            vspace, aspace = make_av(clipify(_c, 0, 0), inp)
+            vspace, aspace = make_av([clipify(_c, 0, 0)], [inp])
             my_timeline = Timeline(
                 timeline.inputs,
                 timeline.fps,

diff --git a/auto_editor/formats/json.py b/auto_editor/formats/json.py
@@ -97,7 +97,7 @@ def read_json(path: str, ffmpeg: FFmpeg, log: Log) -> Timeline:
         chunks = validate_chunks(data["chunks"], log)
         inp = FileInfo(data["source"], ffmpeg, log)
 
-        vspace, aspace = make_av(clipify(chunks, 0, 0), inp)
+        vspace, aspace = make_av([clipify(chunks, 0, 0)], [inp])
 
         fps = inp.get_fps()
         sr = inp.get_samplerate()

diff --git a/auto_editor/timeline.py b/auto_editor/timeline.py
@@ -37,6 +37,9 @@ class Clip(NamedTuple):
 
 
 def unclipify(layer: List[Clip]) -> NDArray[np.float_]:
+    if len(layer) == 0:
+        raise ValueError("Empty Clips")
+
     l: List[int] = []
     for clip in layer:
         if clip.src != 0:
@@ -52,7 +55,6 @@ def unclipify(layer: List[Clip]) -> NDArray[np.float_]:
 
     if len(set(l)) != len(l) or sorted(l) != l:
         raise ValueError(f"Clip layer to complex, cannot convert to speed list: {l}")
-
     arr = np.empty(layer[-1].offset + layer[-1].dur, dtype=float)
     arr.fill(99999)
 
@@ -166,20 +168,27 @@ def clipify(chunks: Chunks, src: int, start: float) -> List[Clip]:
     return clips
 
 
-def make_av(clips: List[Clip], inp: FileInfo) -> Tuple[VSpace, ASpace]:
+def make_av(all_clips: List[List[Clip]], inputs: List[FileInfo]) -> Tuple[VSpace, ASpace]:
     vclips: VSpace = [[]]
-    aclips: ASpace = [[] for a in inp.audios]
-
-    for clip in clips:
-        vclips[0].append(
-            VideoObj(clip.start, clip.dur, clip.offset, clip.speed, clip.src)
-        )
 
-    for a, _ in enumerate(inp.audios):
-        for clip in clips:
-            aclips[a].append(
-                AudioObj(clip.start, clip.dur, clip.offset, clip.speed, clip.src, a)
-            )
+    max_a = 0
+    for inp in inputs:
+        max_a = max(max_a, len(inp.audios))
+
+    aclips: ASpace = [[] for a in range(max_a)]
+
+    for clips, inp in zip(all_clips, inputs):
+        if len(inp.videos) > 0:
+            for clip in clips:
+                vclips[0].append(
+                    VideoObj(clip.start, clip.dur, clip.offset, clip.speed, clip.src)
+                )
+        if len(inp.audios) > 0:
+            for clip in clips:
+                for a, _ in enumerate(inp.audios):
+                    aclips[a].append(
+                        AudioObj(clip.start, clip.dur, clip.offset, clip.speed, clip.src, a)
+                    )
 
     return vclips, aclips
 
@@ -188,19 +197,22 @@ def make_layers(
     inputs: List[FileInfo], speedlists: List[NDArray[np.float_]]
 ) -> Tuple[Optional[Chunks], VSpace, ASpace]:
 
-    clips = []
+    all_clips: List[List[Clip]] = []
     start = 0.0
     for i, _chunks in enumerate([chunkify(s) for s in speedlists]):
-        clips += clipify(_chunks, i, start)
+        all_clips.append(clipify(_chunks, i, start))
         start += chunks_len(_chunks)
 
     chunks: Optional[Chunks] = None
     try:
+        from itertools import chain
+
+        clips = list(chain.from_iterable(all_clips))
         chunks = chunkify(unclipify(clips))
     except ValueError:
         pass
 
-    vclips, aclips = make_av(clips, inputs[0])
+    vclips, aclips = make_av(all_clips, inputs)
     return chunks, vclips, aclips
 
 
@@ -214,14 +226,12 @@ def make_timeline(
 ) -> Timeline:
     assert len(inputs) > 0
 
-    inp = inputs[0]
-
     if args.frame_rate is None:
-        fps = inp.get_fps()
+        fps = inputs[0].get_fps()
     else:
         fps = args.frame_rate
 
-    res = inp.get_res()
+    res = inputs[0].get_res()
 
     speedlists = []
     for i, inp in enumerate(inputs):