Merge branch 'master' into feat/queue-based-retry-policy

# Conflicts:
#	workflows/handle_multitrack.go

cmd/worker/main.go

@@ -66,6 +66,7 @@ var workerWorkflows = []any{
 	workflows.TranscribeFile,
 	workflows.TranscribeVX,
 	workflows.WatchFolderTranscode,
+	workflows.HandleMultitrackFile,
 	export.VXExport,
 	export.VXExportToVOD,
 	export.VXExportToPlayout,

services/vidispine/export.go

@@ -192,7 +192,7 @@ func getEmbeddedAudio(client Client, clip *Clip, languagesToExport []string) (*C
 	}
 
 	shape := shapes.GetShape("original")
-	if len(shape.AudioComponent) != 16 && len(shape.AudioComponent) > 2 {
+	if len(shape.AudioComponent) != 16 && len(shape.AudioComponent) != 8 && len(shape.AudioComponent) > 2 {
 		return clip, fmt.Errorf("found %d audio components, expected 1, 2 or 16", len(shape.AudioComponent))
 	}
 
@@ -241,6 +241,28 @@ func getEmbeddedAudio(client Client, clip *Clip, languagesToExport []string) (*C
 		}
 	}
 
+	if len(shape.AudioComponent) == 8 {
+		if len(languagesToExport) > 1 {
+			return clip, fmt.Errorf("found 8 audio components, expected 16")
+		}
+
+		var streams []int
+		for _, c := range shape.AudioComponent[:2] {
+			streams = append(streams, c.EssenceStreamID)
+			if c.ChannelCount != 1 {
+				return clip, fmt.Errorf("found %d channels in audio component, expected 1", c.ChannelCount)
+			}
+		}
+
+		for _, lang := range languagesToExport {
+			clip.AudioFiles[lang] = &AudioFile{
+				VXID:    clip.VXID,
+				File:    shape.GetPath(),
+				Streams: streams,
+			}
+		}
+	}
+
 	for _, lang := range languagesToExport {
 		// We have an actual 16 channel audio file, so we need to figure out which channels to use
 		// and assign them to the correct language

workflows/handle_multitrack.go

@@ -41,7 +41,7 @@ func HandleMultitrackFile(
 
 	lucidPath = lucidPath.Append(path.Base()).Prepend("01 Liveopptak fra Brunstad/01 RAW")
 
-	err = wfutils.ExecuteWithQueue(ctx, activities.CopyFile, activities.MoveFileInput{
+	err = wfutils.ExecuteWithQueue(ctx, activities.RcloneCopyFile, activities.RcloneFileInput{
 		Source:      path,
 		Destination: lucidPath,
 	}).Get(ctx, nil)