Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.
TypeScript agent-skillscodex-clideskop-appdubbingimage-generationlocalizationskillsttsvideo-editingvideo-generationvideo-transcriptionvideo-translation
fix: harden dubbing runner assembly
wulien0650aefd678c
diff --git a/internal/service/dubbing/audio.go b/internal/service/dubbing/audio.goindex f751140f..d3a1252e 100644--- a/internal/service/dubbing/audio.go+++ b/internal/service/dubbing/audio.go@@ -90,6 +90,11 @@ func AssembleAudio(plan []PlanItem, segmentsDir, outputAudio string, run Commandrun = defaultFFmpegRunner}+ filters, err := validateAssemblePlan(plan, segmentsDir)+ if err != nil {+ return err+ }+fittedDir := filepath.Join(segmentsDir, "fitted")if err := os.MkdirAll(fittedDir, 0755); err != nil {return err@@ -97,21 +102,17 @@ func AssembleAudio(plan []PlanItem, segmentsDir, outputAudio string, run CommandconcatLines := make([]string, 0, len(plan)*2)lastEnd := 0.0- for _, item := range plan {+ for i, item := range plan {raw := filepath.Join(segmentsDir, "raw", fmt.Sprintf("%d.wav", item.Index))if err := ensureNonEmptyFile(raw, "raw segment"); err != nil {return err}fitted := fittedSegmentPath(segmentsDir, item.Index)- filter, err := buildAtempoFilter(item.SpeedFactor)- if err != nil {- return err- }if err := run([]string{"-y","-i", raw,- "-filter:a", filter,+ "-filter:a", filters[i],"-ar", "44100","-ac", "1","-c:a", "pcm_s16le",@@ -120,9 +121,6 @@ func AssembleAudio(plan []PlanItem, segmentsDir, outputAudio string, run Commandreturn fmt.Errorf("fit segment %d: %w", item.Index, err)}- if item.NewStart < lastEnd {- return fmt.Errorf("plan item %d starts before previous end: start %.3f lastEnd %.3f", item.Index, item.NewStart, lastEnd)- }if item.NewStart > lastEnd {silence := filepath.Join(fittedDir, fmt.Sprintf("silence_%d.wav", item.Index))if err := run([]string{@@ -162,3 +160,34 @@ func AssembleAudio(plan []PlanItem, segmentsDir, outputAudio string, run Commandreturn nil}++func validateAssemblePlan(plan []PlanItem, segmentsDir string) ([]string, error) {+ if len(plan) == 0 {+ return nil, fmt.Errorf("plan is empty")+ }++ filters := make([]string, len(plan))+ lastEnd := 0.0+ for i, item := range plan {+ if item.NewEnd <= item.NewStart {+ return nil, fmt.Errorf("plan item %d new end must be greater than new start: start %.3f end %.3f", item.Index, item.NewStart, item.NewEnd)+ }+ if item.NewStart < lastEnd {+ return nil, fmt.Errorf("plan item %d starts before previous end: start %.3f lastEnd %.3f", item.Index, item.NewStart, lastEnd)+ }++ filter, err := buildAtempoFilter(item.SpeedFactor)+ if err != nil {+ return nil, err+ }+ filters[i] = filter++ raw := filepath.Join(segmentsDir, "raw", fmt.Sprintf("%d.wav", item.Index))+ if err := ensureNonEmptyFile(raw, "raw segment"); err != nil {+ return nil, err+ }++ lastEnd = item.NewEnd+ }+ return filters, nil+}diff --git a/internal/service/dubbing/audio_assemble_test.go b/internal/service/dubbing/audio_assemble_test.goindex 787675a2..99a0fdbe 100644--- a/internal/service/dubbing/audio_assemble_test.go+++ b/internal/service/dubbing/audio_assemble_test.go@@ -31,3 +31,69 @@ func TestAssembleAudioWritesConcatListInFittedDir(t *testing.T) {t.Fatalf("concat list = %q", string(data))}}++func TestAssembleAudioRejectsInvalidWindowBeforeRunner(t *testing.T) {+ dir := t.TempDir()+ rawDir := filepath.Join(dir, "raw")+ if err := os.MkdirAll(rawDir, 0755); err != nil {+ t.Fatal(err)+ }+ if err := os.WriteFile(filepath.Join(rawDir, "1.wav"), []byte("raw"), 0644); err != nil {+ t.Fatal(err)+ }+ calls := 0+ plan := []PlanItem{{Index: 1, NewStart: 1.0, NewEnd: 1.0, SpeedFactor: 1.0}}+ err := AssembleAudio(plan, dir, filepath.Join(dir, "out.wav"), func(args []string) error {+ calls+++ return nil+ })+ if err == nil || !strings.Contains(err.Error(), "new end must be greater than new start") {+ t.Fatalf("AssembleAudio() error = %v, want invalid window error", err)+ }+ if calls != 0 {+ t.Fatalf("runner calls = %d, want 0", calls)+ }+}++func TestAssembleAudioRejectsOverlappingPlanBeforeRunner(t *testing.T) {+ dir := t.TempDir()+ rawDir := filepath.Join(dir, "raw")+ if err := os.MkdirAll(rawDir, 0755); err != nil {+ t.Fatal(err)+ }+ for _, name := range []string{"1.wav", "2.wav"} {+ if err := os.WriteFile(filepath.Join(rawDir, name), []byte("raw"), 0644); err != nil {+ t.Fatal(err)+ }+ }+ calls := 0+ plan := []PlanItem{+ {Index: 1, NewStart: 1.0, NewEnd: 2.0, SpeedFactor: 1.0},+ {Index: 2, NewStart: 0.5, NewEnd: 1.5, SpeedFactor: 1.0},+ }+ err := AssembleAudio(plan, dir, filepath.Join(dir, "out.wav"), func(args []string) error {+ calls+++ return nil+ })+ if err == nil || !strings.Contains(err.Error(), "starts before previous end") {+ t.Fatalf("AssembleAudio() error = %v, want overlap error", err)+ }+ if calls != 0 {+ t.Fatalf("runner calls = %d, want 0", calls)+ }+}++func TestAssembleAudioRejectsEmptyPlan(t *testing.T) {+ dir := t.TempDir()+ calls := 0+ err := AssembleAudio(nil, dir, filepath.Join(dir, "out.wav"), func(args []string) error {+ calls+++ return nil+ })+ if err == nil || !strings.Contains(err.Error(), "plan is empty") {+ t.Fatalf("AssembleAudio() error = %v, want empty plan error", err)+ }+ if calls != 0 {+ t.Fatalf("runner calls = %d, want 0", calls)+ }+}diff --git a/internal/service/dubbing/runner.go b/internal/service/dubbing/runner.goindex 3cf2a749..a095babd 100644--- a/internal/service/dubbing/runner.go+++ b/internal/service/dubbing/runner.go@@ -51,17 +51,22 @@ func (r *Runner) Run(ctx context.Context) (Result, error) {return Result{}, err}+ cues, err := ParseSRTFile(r.deps.InputSRT)+ if err != nil {+ return Result{}, err+ }+ if len(cues) == 0 {+ return Result{}, errors.New("input srt has no cues")+ }+dubbingDir := filepath.Join(r.deps.Workdir, DubbingDirName)segmentsDir := filepath.Join(dubbingDir, "segments")if err := os.MkdirAll(segmentsDir, 0755); err != nil {return Result{}, err}- cues, err := ParseSRTFile(r.deps.InputSRT)- if err != nil {- return Result{}, err- }- if err := WriteSRTFile(filepath.Join(dubbingDir, DubbingInputFileName), cues); err != nil {+ cleanedCues := cleanCuesForSpeech(cues)+ if err := WriteSRTFile(filepath.Join(dubbingDir, DubbingInputFileName), cleanedCues); err != nil {return Result{}, err}@@ -92,6 +97,9 @@ func (r *Runner) Run(ctx context.Context) (Result, error) {return Result{}, err}+ if err := ensureParentDir(r.deps.OutputAudio); err != nil {+ return Result{}, err+ }if err := AssembleAudio(fitted, segmentsDir, r.deps.OutputAudio, r.deps.FFmpeg); err != nil {return Result{}, err}@@ -99,6 +107,9 @@ func (r *Runner) Run(ctx context.Context) (Result, error) {return Result{}, err}+ if err := ensureParentDir(r.deps.OutputVideo); err != nil {+ return Result{}, err+ }if err := r.deps.FFmpeg(buildMuxArgs(r.deps.InputVideo, r.deps.OutputAudio, r.deps.OutputVideo)); err != nil {return Result{}, err}@@ -135,6 +146,23 @@ func (r *Runner) validate() error {return nil}+func cleanCuesForSpeech(cues []Cue) []Cue {+ cleaned := make([]Cue, len(cues))+ copy(cleaned, cues)+ for i := range cleaned {+ cleaned[i].Text = CleanTextForSpeech(cleaned[i].Text)+ }+ return cleaned+}++func ensureParentDir(path string) error {+ dir := filepath.Dir(path)+ if dir == "" || dir == "." {+ return nil+ }+ return os.MkdirAll(dir, 0755)+}+func ensureNonEmptyFile(path, label string) error {info, err := os.Stat(path)if err != nil {diff --git a/internal/service/dubbing/runner_test.go b/internal/service/dubbing/runner_test.goindex e4a9423d..fa7310ca 100644--- a/internal/service/dubbing/runner_test.go+++ b/internal/service/dubbing/runner_test.go@@ -2,6 +2,7 @@ package dubbingimport ("context"+ "errors""os""path/filepath""strings"@@ -18,6 +19,16 @@ func fakeRunnerWritingOutputs(dir string) CommandRunner {}}+func fakeRunnerWritingOutputsWithoutMkdir() CommandRunner {+ return func(args []string) error {+ out := args[len(args)-1]+ if strings.HasSuffix(out, ".wav") || strings.HasSuffix(out, ".mp4") {+ return os.WriteFile(out, []byte("media"), 0644)+ }+ return nil+ }+}+func TestRunWritesDubbingArtifactsWithFakeTTS(t *testing.T) {dir := t.TempDir()input := filepath.Join(dir, "input.srt")@@ -61,6 +72,122 @@ func TestRunWritesDubbingArtifactsWithFakeTTS(t *testing.T) {}}+func TestRunWritesCleanedDubbingInput(t *testing.T) {+ dir := t.TempDir()+ input := filepath.Join(dir, "input.srt")+ video := filepath.Join(dir, "origin.mp4")+ if err := os.WriteFile(input, []byte("1\n00:00:00,000 --> 00:00:01,000\n(music) 你好 ™\n\n"), 0644); err != nil {+ t.Fatal(err)+ }+ if err := os.WriteFile(video, []byte("video"), 0644); err != nil {+ t.Fatal(err)+ }+ deps := Dependencies{+ TTS: &fakeTTS{writeOnReturn: true},+ Language: "zh_cn",+ Voice: "voice",+ Workdir: dir,+ InputSRT: input,+ InputVideo: video,+ OutputAudio: filepath.Join(dir, "tts_final_audio.wav"),+ OutputVideo: filepath.Join(dir, "video_with_tts.mp4"),+ Config: DefaultConfig(),+ FFmpeg: fakeRunnerWritingOutputs(dir),+ Duration: func(string) (float64, error) {+ return 0.8, nil+ },+ }+ if _, err := NewRunner(deps).Run(context.Background()); err != nil {+ t.Fatalf("Run() error = %v", err)+ }++ data, err := os.ReadFile(filepath.Join(dir, DubbingDirName, DubbingInputFileName))+ if err != nil {+ t.Fatal(err)+ }+ text := string(data)+ if strings.Contains(text, "music") || strings.Contains(text, "™") {+ t.Fatalf("dubbing input contains unclean text: %q", text)+ }+ if !strings.Contains(text, "你好") {+ t.Fatalf("dubbing input missing speech text: %q", text)+ }+}++func TestRunRejectsEmptySRTBeforeWritingArtifacts(t *testing.T) {+ dir := t.TempDir()+ input := filepath.Join(dir, "input.srt")+ video := filepath.Join(dir, "origin.mp4")+ if err := os.WriteFile(input, []byte(""), 0644); err != nil {+ t.Fatal(err)+ }+ if err := os.WriteFile(video, []byte("video"), 0644); err != nil {+ t.Fatal(err)+ }+ deps := Dependencies{+ TTS: &fakeTTS{writeOnReturn: true},+ Language: "zh_cn",+ Voice: "voice",+ Workdir: dir,+ InputSRT: input,+ InputVideo: video,+ OutputAudio: filepath.Join(dir, "tts_final_audio.wav"),+ OutputVideo: filepath.Join(dir, "video_with_tts.mp4"),+ Config: DefaultConfig(),+ FFmpeg: fakeRunnerWritingOutputs(dir),+ Duration: func(string) (float64, error) {+ return 0.8, nil+ },+ }++ _, err := NewRunner(deps).Run(context.Background())+ if err == nil || !strings.Contains(err.Error(), "input srt has no cues") {+ t.Fatalf("Run() error = %v, want no cues error", err)+ }+ if _, statErr := os.Stat(filepath.Join(dir, DubbingDirName, DubbingInputFileName)); !errors.Is(statErr, os.ErrNotExist) {+ t.Fatalf("dubbing input stat error = %v, want not exist", statErr)+ }+}++func TestRunCreatesCustomOutputParentDirs(t *testing.T) {+ dir := t.TempDir()+ input := filepath.Join(dir, "input.srt")+ video := filepath.Join(dir, "origin.mp4")+ outputAudio := filepath.Join(dir, "nested", "audio", "tts_final_audio.wav")+ outputVideo := filepath.Join(dir, "nested", "video", "video_with_tts.mp4")+ if err := os.WriteFile(input, []byte("1\n00:00:00,000 --> 00:00:01,000\n你好\n\n"), 0644); err != nil {+ t.Fatal(err)+ }+ if err := os.WriteFile(video, []byte("video"), 0644); err != nil {+ t.Fatal(err)+ }+ deps := Dependencies{+ TTS: &fakeTTS{writeOnReturn: true},+ Language: "zh_cn",+ Voice: "voice",+ Workdir: dir,+ InputSRT: input,+ InputVideo: video,+ OutputAudio: outputAudio,+ OutputVideo: outputVideo,+ Config: DefaultConfig(),+ FFmpeg: fakeRunnerWritingOutputsWithoutMkdir(),+ Duration: func(string) (float64, error) {+ return 0.8, nil+ },+ }++ result, err := NewRunner(deps).Run(context.Background())+ if err != nil {+ t.Fatalf("Run() error = %v", err)+ }+ for _, path := range []string{result.Audio, result.Video} {+ if info, err := os.Stat(path); err != nil || info.Size() == 0 {+ t.Fatalf("missing output %s: info=%v err=%v", path, info, err)+ }+ }+}+func TestRunnerRequiresInputVideoForMux(t *testing.T) {dir := t.TempDir()input := filepath.Join(dir, "input.srt")