feat: implement multitrack

Author: k1nho

?app.go

@@ -13,6 +13,7 @@ import (
 
 	"runtime"
 
+	"github.com/k1nho/gahara/internal/timeline"
 	"github.com/k1nho/gahara/internal/video"
 	"github.com/wailsapp/wails/v2/pkg/menu"
 	"github.com/wailsapp/wails/v2/pkg/menu/keys"
@@ -37,15 +38,17 @@ type App struct {
 	ctx context.Context
 	// config: gahara configuration
 	config Config
-	// Timeline: the project timeline
-	Timeline video.Timeline `json:"timeline"`
+	// Timeline: the timeline of the project (NODE_VIDEO0, NODE_AUDIO, NODE_PLACEHOLDER, etc)
+	Timeline timeline.Timeline
 	// FFmpegPath: the configured ffmpeg on build
 	FFmpegPath string
+	// TrackDuration: the duration of the track being encoded
+	TrackDuration int
 }
 
 // NewApp creates a new App application struct
 func NewApp() *App {
-	return &App{Timeline: video.NewTimeline()}
+	return &App{Timeline: timeline.NewTimeline()}
 }
 
 // startup is called when the app starts. The context is saved
@@ -99,6 +102,14 @@ func (a *App) FilePicker() error {
 
 }
 
+func (a *App) AddTrack() {
+	a.Timeline.AddTrack()
+}
+
+func (a *App) RemoveTrack(tid int) error {
+	return a.Timeline.RemoveTrack(tid)
+}
+
 func (a *App) OpenFile(filepath string) error {
 	var cmd *exec.Cmd
 	switch runtime.GOOS {
@@ -316,7 +327,7 @@ func (a *App) EnableVideoMenus() {
 	timelineMenu.AddText("Save Timeline", keys.CmdOrCtrl("s"), func(cd *menu.CallbackData) {
 		err := a.SaveTimeline()
 		if err != nil {
-			wruntime.LogError(a.ctx, "could not save timeline")
+			wruntime.LogError(a.ctx, "could not save video")
 		}
 		wruntime.EventsEmit(a.ctx, video.EVT_SAVED_TIMELINE, "-- SAVED --")
 	})
@@ -342,7 +353,7 @@ func (a *App) EnableVideoMenus() {
 	})
 	timelineMenu.AddText("Toggle Vim Mode", keys.CmdOrCtrl("i"), func(cd *menu.CallbackData) {
 		wruntime.EventsEmit(a.ctx, video.EVT_TOGGLE_VIM_MODE)
-		wruntime.EventsEmit(a.ctx, video.EVT_TRACK_MOVE, 0)
+		wruntime.EventsEmit(a.ctx, video.EVT_CLIP_MOVE, 0)
 	})
 	vimCommandsMenu := timelineMenu.AddSubmenu("Vim Commands")
 	vimCommandsMenu.AddText("Normal Mode", keys.Key("i"), func(cd *menu.CallbackData) {
@@ -366,28 +377,42 @@ func (a *App) EnableVideoMenus() {
 	vimCommandsMenu.AddText("Execute Edit", keys.Key("enter"), func(cd *menu.CallbackData) {
 		wruntime.EventsEmit(a.ctx, video.EVT_EXECUTE_EDIT)
 	})
-	vimCommandsMenu.AddText("Move Track Left", keys.Key("h"), func(cd *menu.CallbackData) {
+	vimCommandsMenu.AddText("Move Down Track", keys.Key("j"), func(cd *menu.CallbackData) {
+		wruntime.EventsEmit(a.ctx, video.EVT_TRACK_MOVE, 1)
+	})
+	vimCommandsMenu.AddText("Move Up Track", keys.Key("k"), func(cd *menu.CallbackData) {
 		wruntime.EventsEmit(a.ctx, video.EVT_TRACK_MOVE, -1)
 	})
+	vimCommandsMenu.AddText("Move Track Left", keys.Key("h"), func(cd *menu.CallbackData) {
+		wruntime.EventsEmit(a.ctx, video.EVT_CLIP_MOVE, -1)
+	})
 	vimCommandsMenu.AddText("Move Track Right", keys.Key("l"), func(cd *menu.CallbackData) {
-		wruntime.EventsEmit(a.ctx, video.EVT_TRACK_MOVE, 1)
+		wruntime.EventsEmit(a.ctx, video.EVT_CLIP_MOVE, 1)
 	})
 	vimCommandsMenu.AddText("Move to Beginning of Track", keys.Key("0"), func(cd *menu.CallbackData) {
-		wruntime.EventsEmit(a.ctx, video.EVT_TRACK_MOVE, -len(a.Timeline.VideoNodes))
+		wruntime.EventsEmit(a.ctx, video.EVT_CLIP_MOVE, -len(a.Timeline.Nodes[0]))
 	})
 	vimCommandsMenu.AddText("Move to End of Track", keys.Key("$"), func(cd *menu.CallbackData) {
-		wruntime.EventsEmit(a.ctx, video.EVT_TRACK_MOVE, len(a.Timeline.VideoNodes))
+		wruntime.EventsEmit(a.ctx, video.EVT_CLIP_MOVE, len(a.Timeline.Nodes[0]))
 	})
 	vimCommandsMenu.AddText("Zoom In Timeline", keys.Shift("+"), func(cd *menu.CallbackData) {
 		wruntime.EventsEmit(a.ctx, video.EVT_ZOOM_TIMELINE, "in")
 	})
 	vimCommandsMenu.AddText("Zoom Out Timeline", keys.Shift("-"), func(cd *menu.CallbackData) {
 		wruntime.EventsEmit(a.ctx, video.EVT_ZOOM_TIMELINE, "out")
 	})
+
+	vimCommandsMenu.AddText("Add Timeline Track", keys.Shift("t"), func(cd *menu.CallbackData) {
+		wruntime.EventsEmit(a.ctx, video.EVT_ADD_TRACK)
+	})
+	vimCommandsMenu.AddText("Remove Timeline Track", keys.Shift("d"), func(cd *menu.CallbackData) {
+		wruntime.EventsEmit(a.ctx, video.EVT_REMOVE_TRACK)
+	})
+
 	vimCommandsMenu.AddText("Save Timeline", keys.Shift("w"), func(cd *menu.CallbackData) {
 		err := a.SaveTimeline()
 		if err != nil {
-			wruntime.LogError(a.ctx, "could not save timeline")
+			wruntime.LogError(a.ctx, "could not save video")
 		}
 		wruntime.EventsEmit(a.ctx, video.EVT_SAVED_TIMELINE, "-- SAVED --")
 	})
@@ -397,6 +422,9 @@ func (a *App) EnableVideoMenus() {
 	vimCommandsMenu.AddText("Search Timeline Clip", keys.Shift("f"), func(cd *menu.CallbackData) {
 		wruntime.EventsEmit(a.ctx, video.EVT_SEARCH_TIMELINE_CLIP)
 	})
+	vimCommandsMenu.AddText("Insert Placeholder Clip", keys.Shift("p"), func(cd *menu.CallbackData) {
+		wruntime.EventsEmit(a.ctx, video.EVT_SEARCH_PLACEHOLDER)
+	})
 
 	appMenu := a.AppMenu()
 	appMenu.Items = append(appMenu.Items, &menu.MenuItem{

?ffmpegbuilder/ffmpegbuilder.go

@@ -205,12 +205,12 @@ func (f *FFmpegBuilder) ConcatFilter(videoNodes []video.VideoNode) (string, erro
 
 	concatQuery.WriteString("\"")
 	for i, videoNode := range videoNodes {
-		if pos, ok := ridToPos[videoNode.RID]; ok {
-			concatQuery.WriteString(fmt.Sprintf("[%d:v]trim=start=%.4f:end=%.4f,setpts=PTS-STARTPTS,scale=%s[v%d];", pos, videoNode.Start, videoNode.End, f.FilterGraphParams.Scale, i))
+		if pos, ok := ridToPos[videoNode.VideoRID]; ok {
+			concatQuery.WriteString(fmt.Sprintf("[%d:v]trim=start=%.4f:end=%.4f,setpts=PTS-STARTPTS,scale=%s[v%d];", pos, videoNode.VideoStart, videoNode.VideoEnd, f.FilterGraphParams.Scale, i))
 			continue
 		}
-		ridToPos[videoNode.RID] = pos
-		concatQuery.WriteString(fmt.Sprintf("[%d:v]trim=start=%.4f:end=%.4f,setpts=PTS-STARTPTS,scale=%s[v%d];", pos, videoNode.Start, videoNode.End, f.FilterGraphParams.Scale, i))
+		ridToPos[videoNode.VideoRID] = pos
+		concatQuery.WriteString(fmt.Sprintf("[%d:v]trim=start=%.4f:end=%.4f,setpts=PTS-STARTPTS,scale=%s[v%d];", pos, videoNode.VideoStart, videoNode.VideoEnd, f.FilterGraphParams.Scale, i))
 		pos += 1
 	}
 

?ffmpegbuilder/ffmpegbuilder_test.go

@@ -4,16 +4,17 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/k1nho/gahara/internal/timeline"
 	"github.com/k1nho/gahara/internal/video"
 )
 
-func mockTl() *video.Timeline {
-	return &video.Timeline{VideoNodes: []video.VideoNode{
-		{RID: "root1", ID: "1", Name: "input1", Start: 20.1, End: 25.2, LosslessExport: true},
-		{RID: "root1", ID: "2", Name: "input2", Start: 1.12, End: 10.2, LosslessExport: true},
-		{RID: "root2", ID: "3", Name: "input3", Start: 12.2, End: 21.2, LosslessExport: true},
-		{RID: "root3", ID: "4", Name: "input4", Start: 69.112, End: 80.23, LosslessExport: true},
-	}}
+func mockTl() *timeline.Timeline {
+	return &timeline.Timeline{Nodes: [][]timeline.TimelineNode{{
+		&video.VideoNode{VideoRID: "root1", VideoID: "1", VideoName: "input1", VideoStart: 20.1, VideoEnd: 25.2, LosslessExport: true},
+		&video.VideoNode{VideoRID: "root1", VideoID: "2", VideoName: "input2", VideoStart: 1.12, VideoEnd: 10.2, LosslessExport: true},
+		&video.VideoNode{VideoRID: "root2", VideoID: "3", VideoName: "input3", VideoStart: 12.2, VideoEnd: 21.2, LosslessExport: true},
+		&video.VideoNode{VideoRID: "root3", VideoID: "4", VideoName: "input4", VideoStart: 69.112, VideoEnd: 80.23, LosslessExport: true},
+	}}}
 
 }
 
@@ -65,8 +66,8 @@ func TestFFmpegBuilder(t *testing.T) {
 
 	t.Run("concat filter query", func(t *testing.T) {
 		expectedQuery := "ffmpeg -hide_banner -v quiet -stats_period 5s -progress pipe:2 -i \"root1\" -i \"root2\" -i \"root3\" -filter_complex \"[0:v]trim=start=20.1000:end=25.2000,setpts=PTS-STARTPTS,scale=1920x1080[v0];[0:v]trim=start=1.1200:end=10.2000,setpts=PTS-STARTPTS,scale=1920x1080[v1];[1:v]trim=start=12.2000:end=21.2000,setpts=PTS-STARTPTS,scale=1920x1080[v2];[2:v]trim=start=69.1120:end=80.2300,setpts=PTS-STARTPTS,scale=1920x1080[v3];[v0][v1][v2][v3]concat=n=4:v=1:a=0[out]\" -map \"[out]\" -c:v libx264 -crf 18 -preset medium \"outputpath/myvideo.mp4\" "
-
-		query, err := MergeClipsQuery("ffmpeg", mockTl().VideoNodes, video.ProcessingOpts{
+		videoNodes := ExtractVideoNodes(mockTl().Nodes[0])
+		query, err := MergeClipsQuery("ffmpeg", videoNodes, video.ProcessingOpts{
 			Resolution:  "1920x1080",
 			Codec:       "libx264",
 			CRF:         "18",
@@ -85,14 +86,14 @@ func TestFFmpegBuilder(t *testing.T) {
 	})
 
 	t.Run("lossless cut query", func(t *testing.T) {
-		videoNode := video.VideoNode{RID: "root1", Name: "myvideo", Start: 22.2300, End: 28.4321, ID: "1", LosslessExport: true}
-		duration := videoNode.End - videoNode.Start
+		videoNode := video.VideoNode{VideoRID: "root1", VideoName: "myvideo", VideoStart: 22.2300, VideoEnd: 28.4321, VideoID: "1", LosslessExport: true}
+		duration := videoNode.VideoEnd - videoNode.VideoStart
 
 		expectedQuery := fmt.Sprintf("ffmpeg -hide_banner -v quiet -stats_period 5s -progress pipe:2 -ss 22.2300 -i \"root1\" -t %.4f -avoid_negative_ts make_zero -c copy -movflags '+faststart' \"outputpath/myvideo.mp4\" ", duration)
 
 		query, err := LosslessCutQuery("ffmpeg", videoNode, video.ProcessingOpts{
 			OutputPath:  "outputpath",
-			Filename:    videoNode.Name,
+			Filename:    videoNode.VideoName,
 			VideoFormat: ".mp4",
 		})
 

?ffmpegbuilder/query.go

@@ -78,10 +78,10 @@ func MergeClipsQuery(FFmpegPath string, videoNodes []video.VideoNode, userOpts v
 // LosslessCutQuery: returns the query string to make a lossless cut of a video node
 func LosslessCutQuery(FFmpegPath string, videoNode video.VideoNode, userOpts video.ProcessingOpts) (string, error) {
 	// overwrite filename, if it was passed by default lossy opts
-	userOpts.Filename = videoNode.Name
+	userOpts.Filename = videoNode.VideoName
 
-	querybuilder := NewDefaultFFmpegBuilder(FFmpegPath).WithInputs(videoNode.RID).WithInputStartTime(videoNode.Start).
-		WithOutputDuration(videoNode.End - videoNode.Start).WithCodec("copy").WithAvoidNegativeTS("make_zero").
+	querybuilder := NewDefaultFFmpegBuilder(FFmpegPath).WithInputs(videoNode.VideoRID).WithInputStartTime(videoNode.VideoStart).
+		WithOutputDuration(videoNode.VideoEnd - videoNode.VideoStart).WithCodec("copy").WithAvoidNegativeTS("make_zero").
 		WithMovFlags("+faststart").WithOutputs(GetFullOutputPath(userOpts))
 
 	if err := querybuilder.validateLosslessCutQuery(); err != nil {

?ffmpegbuilder/utils.go

@@ -3,14 +3,16 @@ package ffmpegbuilder
 import (
 	"path"
 
+	"github.com/k1nho/gahara/internal/audio"
+	"github.com/k1nho/gahara/internal/timeline"
 	"github.com/k1nho/gahara/internal/video"
 )
 
 // extractInputs: extract input params from video nodes
 func ExtractInputs(videoNodes []video.VideoNode) []string {
 	var inputs []string
 	for _, videoNode := range videoNodes {
-		inputs = append(inputs, videoNode.RID)
+		inputs = append(inputs, videoNode.VideoRID)
 	}
 	return inputs
 }
@@ -24,3 +26,27 @@ func GetFullOutputPath(opts video.ProcessingOpts) string {
 func GetFullInputPath(opts video.ProcessingOpts) string {
 	return path.Join(opts.InputPath, opts.Filename+opts.VideoFormat)
 }
+
+func ExtractVideoNodes(track []timeline.TimelineNode) []video.VideoNode {
+	videoNodes := make([]video.VideoNode, 0)
+	for _, node := range track {
+		if node.Type() == video.NODE_VIDEO {
+			if videoNode, ok := node.(*video.VideoNode); ok {
+				videoNodes = append(videoNodes, *videoNode)
+			}
+		}
+	}
+	return videoNodes
+}
+
+func ExtractAudioNodes(track []timeline.TimelineNode) []audio.AudioNode {
+	audioNodes := make([]audio.AudioNode, 0)
+	for _, node := range track {
+		if node.Type() == audio.NODE_AUDIO {
+			if audioNode, ok := node.(*audio.AudioNode); ok {
+				audioNodes = append(audioNodes, *audioNode)
+			}
+		}
+	}
+	return audioNodes
+}

?frontend/src/App.svelte

@@ -7,6 +7,7 @@
     videoFiles,
     videoStore,
     projectName,
+    trackStore,
   } from "./stores";
   import ExportMenuLayout from "./ExportMenuLayout.svelte";
   import {
@@ -18,6 +19,7 @@
   import { onDestroy } from "svelte";
   const { route, setRoute } = router;
   const { isProcessingVid } = exportOptionsStore;
+  const { resetTrackStore } = trackStore;
   const { resetVideo } = videoStore;
   const { resetVideoFiles } = videoFiles;
 
@@ -30,6 +32,7 @@
     } catch (err) {
       console.log(err);
     }
+    resetTrackStore();
     WindowSetTitle("Gahara");
   }
 

?frontend/src/ExportMenuLayout.svelte

@@ -14,6 +14,7 @@
   import { EventsOff, EventsOn } from "../wailsjs/runtime/runtime";
   import type { video } from "wailsjs/go/models";
   import { formatSecondsToHMS } from "./lib/utils";
+  import { isNodeVideo } from "./lib/timeline";
   const { setRoute } = router;
   const {
     filename,
@@ -52,7 +53,13 @@
     if ($projectName) setFilename($projectName.replace(/\s+/g, ""));
     GetTimeline()
       .then((timeline) => {
-        videoNodes = [...timeline.video_nodes];
+        let tmpVideoNodes: video.VideoNode[] = [];
+        timeline.timeline.forEach((track) => {
+          track.forEach((node) => {
+            if (isNodeVideo(node)) tmpVideoNodes.push(node);
+          });
+        });
+        videoNodes = [...tmpVideoNodes];
       })
       .catch(() => console.log("could not load timeline"));
     EnableExportMenus();
@@ -84,7 +91,7 @@
   }
 
   function handleCheck(pos: number) {
-    ToggleLossless(pos);
+    ToggleLossless(0, pos);
   }
 
   function handleExport() {

?frontend/src/MainMenuLayout.svelte

@@ -129,7 +129,7 @@
         class="border-solid border-indigo-300 border-2 rounded-md focus:border-indigo-500 focus:outline-none"
       />
       <button
-        class="rounded-full bg-indigo-500 font-semibold text-white px-4 py-1.5 hover:bg-indigo-700 transition ease-in-out duration-200 self-center"
+        class="rounded-lg border-white border-2 bg-indigo-500 font-semibold text-white px-4 py-1.5 hover:bg-indigo-700 transition ease-in-out duration-200 self-center"
         on:click={() => createProject()}>Start</button
       >
     </div>