Merge pull request #387 from bcc-code/feat/make-shorts-publish-ready

Update shorts generation to handle subtitles and audio

Author: KillerX

activities/crop_shorts.go

@@ -3,15 +3,18 @@ package activities
 import (
 	"context"
 	"fmt"
+	"github.com/bcc-code/bcc-media-flows/paths"
 	"math"
 	"strconv"
 	"strings"
+
+	"github.com/bcc-code/bcc-media-flows/services/ffmpeg"
 )
 
 type CropShortInput struct {
-	InputVideoPath  string
-	AudioVideoPath  string
-	OutputVideoPath string
+	InputVideoPath  paths.Path
+	OutputVideoPath paths.Path
+	SubtitlePath    paths.Path
 	KeyFrames       []Keyframe
 	InSeconds       float64
 	OutSeconds      float64
@@ -24,28 +27,48 @@ type CropShortResult struct {
 func (ua UtilActivities) CropShortActivity(ctx context.Context, params CropShortInput) (*CropShortResult, error) {
 	cropFilter := buildCropFilter(params.KeyFrames)
 
+	info, err := ffmpeg.GetStreamInfo(params.InputVideoPath.Local())
+	rate := 25
+	if err == nil && info.FrameRate > 40 {
+		rate = 50
+	}
+
+	// Build filter: crop, then optional subtitle burn-in, then label as [v]
+	filter := fmt.Sprintf("[0:v]%s", cropFilter)
+	if params.SubtitlePath.Local() != "" {
+		filter += ",subtitles=" + params.SubtitlePath.Local()
+	}
+	filter += "[v]"
+
 	args := []string{
-		"-i", params.InputVideoPath,
-		"-i", params.AudioVideoPath,
+		"-i", params.InputVideoPath.Local(),
+		"-progress", "pipe:1",
+		"-hide_banner",
+		"-strict", "unofficial",
 		"-filter_complex",
-		fmt.Sprintf(
-			"[0:v]%s[v]; [1:a]atrim=start=%.3f:end=%.3f,asetpts=PTS-STARTPTS[a]",
-			cropFilter, params.InSeconds, params.OutSeconds,
-		),
+		filter,
 		"-map", "[v]",
-		"-map", "[a]",
-		"-c:v", "libx264",
-		"-c:a", "aac",
-		"-pix_fmt", "yuv420p",
+		"-c:v", "prores",
+		"-profile:v", "3",
+		"-vendor", "ap10",
+		"-bits_per_mb", "8000",
+		"-r", strconv.Itoa(rate),
+		"-pix_fmt", "yuv422p10le",
+		"-color_primaries", "bt709",
+		"-color_trc", "bt709",
+		"-colorspace", "bt709",
 		"-y",
-		params.OutputVideoPath,
+		params.OutputVideoPath.Local(),
 	}
 	return &CropShortResult{Arguments: args}, nil
 }
 
 func buildCropFilter(keyframes []Keyframe) string {
 	if len(keyframes) == 0 {
-		return "crop=960:540:489:29"
+		// Default: portrait 9:16 crop, centered horizontally, full frame height.
+		// Ensure even dimensions for codec compatibility.
+		// width = floor(in_h*9/16) rounded to even, height = in_h, x = centered even, y = 0
+		return "crop=floor(in_h*9/16/2)*2:in_h:floor((in_w-out_w)/2/2)*2:0"
 	}
 	if len(keyframes) == 1 {
 		kf := keyframes[0]

workflows/export/generate_short.go

@@ -17,6 +17,8 @@ import (
 
 type GenerateShortResult struct {
 	VideoFile      *paths.Path
+	AudioFiles     map[string]paths.Path
+	SubtitleFiles  map[string]paths.Path
 	ShortVideoFile *paths.Path
 	Keyframes      []activities.Keyframe
 }
@@ -52,15 +54,24 @@ func GenerateShort(ctx workflow.Context, params GenerateShortDataParams) (*Gener
 		return nil, validationError("InSeconds must be < OutSeconds")
 	}
 
-	originalFile, err := wfutils.Execute(ctx, activities.Vidispine.GetFileFromVXActivity, vsactivity.GetFileFromVXParams{
-		VXID: params.VXID,
-		Tags: []string{"original"},
+	exportData, err := wfutils.Execute(ctx, activities.Vidispine.GetExportDataActivity, vsactivity.GetExportDataParams{
+		VXID:        params.VXID,
+		Languages:   []string{"no", "de", "en"},
+		AudioSource: vidispine.ExportAudioSourceEmbedded.Value,
+		Subclip:     "",
+		SubsAllowAI: true,
 	}).Result(ctx)
 
 	if err != nil {
 		return nil, err
 	}
 
+	if len(exportData.Clips) != 1 {
+		return nil, fmt.Errorf("only one clip supported, got %d", len(exportData.Clips))
+	}
+
+	// transcriptFile := exportData.Clips[0].JSONTranscriptFile
+
 	activityOptions := wfutils.GetDefaultActivityOptions()
 	ctx = workflow.WithActivityOptions(ctx, activityOptions)
 
@@ -75,43 +86,21 @@ func GenerateShort(ctx workflow.Context, params GenerateShortDataParams) (*Gener
 		return nil, err
 	}
 
-	originalFileName := originalFile.FilePath
-	fileNameWithoutExt := originalFileName.BaseNoExt()
-	titleWithShort := fileNameWithoutExt + "_short"
-
-	clip := vidispine.Clip{
-		VideoFile:          originalFileName.Linux(),
-		InSeconds:          params.InSeconds,
-		OutSeconds:         params.OutSeconds,
-		SequenceIn:         0,
-		SequenceOut:        params.OutSeconds - params.InSeconds,
-		AudioFiles:         nil,
-		SubtitleFiles:      nil,
-		JSONTranscriptFile: "",
-		VXID:               "",
-	}
-
-	data := vidispine.ExportData{
-		Clips:               []*vidispine.Clip{&clip},
-		SafeTitle:           titleWithShort,
-		Title:               titleWithShort,
-		ImportDate:          nil,
-		BmmTitle:            nil,
-		BmmTrackID:          nil,
-		OriginalLanguage:    "no",
-		TranscribedLanguage: "",
-	}
+	titleWithShort := exportData.Title + "_short"
+	clip := exportData.Clips[0]
+	clip.InSeconds = params.InSeconds
+	clip.OutSeconds = params.OutSeconds
 
 	mergeExportDataParams := MergeExportDataParams{
-		ExportData:       &data,
+		ExportData:       exportData,
 		TempDir:          tempFolder,
 		SubtitlesDir:     subtitlesOutputDir,
 		MakeVideo:        true,
-		MakeAudio:        false,
+		MakeAudio:        true,
 		MakeSubtitles:    true,
 		MakeTranscript:   true,
-		Languages:        []string{"no"},
-		OriginalLanguage: data.OriginalLanguage,
+		Languages:        []string{"no", "de", "en"},
+		OriginalLanguage: exportData.OriginalLanguage,
 	}
 
 	var clipResult MergeExportDataResult
@@ -163,15 +152,15 @@ func GenerateShort(ctx workflow.Context, params GenerateShortDataParams) (*Gener
 		}
 	}
 
-	shortVideoPath := tempFolder.Append(titleWithShort + "_cropped.mp4")
+	shortVideoPath := tempFolder.Append(titleWithShort + "_cropped.mov")
 
 	var cropRes activities.CropShortResult
 	err = wfutils.Execute(ctx,
 		activities.Util.CropShortActivity,
 		activities.CropShortInput{
-			InputVideoPath:  clipResult.VideoFile.Local(),
-			AudioVideoPath:  originalFileName.Linux(),
-			OutputVideoPath: shortVideoPath.Local(),
+			InputVideoPath:  *clipResult.VideoFile,
+			OutputVideoPath: shortVideoPath,
+			SubtitlePath:    clipResult.SubtitleFiles["no"],
 			KeyFrames:       keyframes,
 			InSeconds:       params.InSeconds,
 			OutSeconds:      params.OutSeconds,
@@ -195,5 +184,7 @@ func GenerateShort(ctx workflow.Context, params GenerateShortDataParams) (*Gener
 		VideoFile:      clipResult.VideoFile,
 		ShortVideoFile: &shortVideoPath,
 		Keyframes:      keyframes,
+		AudioFiles:     clipResult.AudioFiles,
+		SubtitleFiles:  clipResult.SubtitleFiles,
 	}, nil
 }