main

2026-04-25 14:37:46 +02:00
parent ad5a97a4fd
commit 9d8c34b39d
34 changed files with 5853 additions and 164 deletions
@@ -23,8 +23,10 @@ public class VideoRenderPipeline
    private readonly ILogger<VideoRenderPipeline> _logger;
    private readonly HiggsFieldService _higgsField;
    private readonly TtsService _tts;
+    private readonly OpenAiTtsService _openAiTts;
    private readonly SunoMusicService _sunoMusic;
    private readonly AudioCraftService _audioCraft;
+    private readonly RemotionService _remotion;
    private readonly FFmpegService _ffmpeg;
    private readonly S3StorageService _s3;
    private readonly FFmpegSettings _ffmpegSettings;
@@ -33,8 +35,10 @@ public class VideoRenderPipeline
        ILogger<VideoRenderPipeline> logger,
        HiggsFieldService higgsField,
        TtsService tts,
+        OpenAiTtsService openAiTts,
        SunoMusicService sunoMusic,
        AudioCraftService audioCraft,
+        RemotionService remotion,
        FFmpegService ffmpeg,
        S3StorageService s3,
        IOptions<FFmpegSettings> ffmpegSettings)
@@ -42,8 +46,10 @@ public class VideoRenderPipeline
        _logger = logger;
        _higgsField = higgsField;
        _tts = tts;
+        _openAiTts = openAiTts;
        _sunoMusic = sunoMusic;
        _audioCraft = audioCraft;
+        _remotion = remotion;
        _ffmpeg = ffmpeg;
        _s3 = s3;
        _ffmpegSettings = ffmpegSettings.Value;
@@ -67,30 +73,13 @@ public class VideoRenderPipeline
        try
        {
            var scenes = job.Scenes.OrderBy(s => s.Order).ToList();
-            var totalSteps = scenes.Count * 3 + 4; // (video+tts+ambient per scene) + music + merge + upload + finalize
+            var totalSteps = scenes.Count * 2 + 4; // (tts+ambient per scene) + music + remotion + upload + finalize
            var completedSteps = 0;

            // ═══════════════════════════════════════
-            // ADIM 1: Her sahne için video klip üret
+            // ADIM 1: Video Klip Üretimi (ATLANDI - REMOTION YAPACAK)
            // ═══════════════════════════════════════
-            _logger.LogInformation(
-                "📹 Adım 1/5: Video klip üretimi — {Count} sahne", scenes.Count);
-
-            var videoTasks = new List<Task<GeneratedMediaFile>>();
-            foreach (var scene in scenes)
-            {
-                videoTasks.Add(GenerateVideoClipWithProgress(
-                    scene, projectDir, job.AspectRatio,
-                    () =>
-                    {
-                        completedSteps++;
-                        var progress = (int)(completedSteps / (double)totalSteps * 60); // Video %0-60
-                        return progressCallback(Math.Min(progress, 60), "VIDEO_GENERATION");
-                    }, ct));
-            }
-
-            var videoResults = await Task.WhenAll(videoTasks);
-            allMediaFiles.AddRange(videoResults);
+            _logger.LogInformation("📹 Adım 1: Video üretimi atlandı, görseller doğrudan Remotion'da Ken Burns ile işlenecek.");

            // ═══════════════════════════════════════
            // ADIM 2: Her sahne için TTS narration üret
@@ -107,8 +96,8 @@ public class VideoRenderPipeline
                    () =>
                    {
                        completedSteps++;
-                        var progress = 60 + (int)(completedSteps / (double)totalSteps * 10); // TTS %60-70
-                        return progressCallback(Math.Min(progress, 70), "TTS_GENERATION");
+                        var progress = (int)(completedSteps / (double)totalSteps * 40); // TTS %0-40
+                        return progressCallback(progress, "TTS_GENERATION");
                    }, ct));
            }

@@ -119,7 +108,7 @@ public class VideoRenderPipeline
            // ADIM 3: Background müzik üret
            // ═══════════════════════════════════════
            _logger.LogInformation("🎵 Adım 3/6: Background müzik üretimi (AudioCraft MusicGen)");
-            await progressCallback(72, "MUSIC_GENERATION");
+            await progressCallback(45, "MUSIC_GENERATION");

            var musicPrompt = job.ScriptJson?.MusicPrompt
                ?? "Cinematic orchestral, mysterious, slow build, 80 BPM, strings and piano";
@@ -164,13 +153,13 @@ public class VideoRenderPipeline
                }
            }

-            await progressCallback(78, "MUSIC_GENERATION");
+            await progressCallback(55, "MUSIC_GENERATION");

            // ═══════════════════════════════════════
            // ADIM 4: AudioGen — Sahne bazlı ambient sesler
            // ═══════════════════════════════════════
            _logger.LogInformation("🔊 Adım 4/6: AudioGen ambient ses efektleri");
-            await progressCallback(79, "AMBIENT_GENERATION");
+            await progressCallback(60, "AMBIENT_GENERATION");

            var ambientFiles = new List<GeneratedMediaFile>();
            try
@@ -184,67 +173,16 @@ public class VideoRenderPipeline
                _logger.LogWarning(ex, "Ambient ses üretimi başarısız — ambientsiz devam ediliyor");
            }

-            await progressCallback(82, "AMBIENT_GENERATION");
+            await progressCallback(70, "AMBIENT_GENERATION");

            // ═══════════════════════════════════════
-            // ADIM 5: FFmpeg — Birleştirme, ambient overlay ve altyazı
+            // ADIM 5: REMOTION — Video render (Ken Burns + Audio Merge + Subtitles)
            // ═══════════════════════════════════════
-            _logger.LogInformation("🎬 Adım 5/6: FFmpeg render — merge + ambient + subtitle + finalize");
-            await progressCallback(83, "MEDIA_MERGE");
+            _logger.LogInformation("🎬 Adım 5/6: Remotion render — Ken Burns + audio merge + subtitle");
+            await progressCallback(75, "MEDIA_MERGE");

-            var mergedScenePaths = new List<string>();
-
-            foreach (var scene in scenes)
-            {
-                var videoFile = videoResults.FirstOrDefault(v =>
-                    v.SceneOrder == scene.Order && v.Type == MediaFileType.VideoClip);
-                var ttsFile = ttsResults.FirstOrDefault(t =>
-                    t.SceneOrder == scene.Order && t.Type == MediaFileType.AudioNarration);
-
-                if (videoFile == null)
-                {
-                    _logger.LogWarning("Sahne {Order} için video bulunamadı, atlanıyor", scene.Order);
-                    continue;
-                }
-
-                var currentPath = videoFile.LocalPath;
-
-                // Video + Narration merge
-                if (ttsFile != null)
-                {
-                    currentPath = await _ffmpeg.MergeVideoWithNarrationAsync(
-                        currentPath, ttsFile.LocalPath, scene.Order, projectDir, ct);
-                }
-
-                // Ambient ses overlay (AudioGen)
-                var ambientFile = ambientFiles.FirstOrDefault(a =>
-                    a.SceneOrder == scene.Order && a.Type == MediaFileType.AudioAmbient);
-                if (ambientFile != null)
-                {
-                    currentPath = await _ffmpeg.OverlayAmbientAudioAsync(
-                        currentPath, ambientFile.LocalPath, scene.Order, projectDir, ct);
-                }
-
-                // Altyazı ekle
-                if (!string.IsNullOrEmpty(scene.SubtitleText))
-                {
-                    currentPath = await _ffmpeg.AddSubtitlesAsync(
-                        currentPath, scene.SubtitleText, scene.Order, projectDir, ct);
-                }
-
-                mergedScenePaths.Add(currentPath);
-            }
-
-            await progressCallback(88, "MEDIA_MERGE");
-
-            // Final concatenation + music mix
-            var finalLocalPath = await _ffmpeg.ConcatenateAndFinalize(
-                mergedScenePaths,
-                musicFile?.LocalPath,
-                projectDir,
-                job.ProjectId,
-                job.TargetDuration,
-                ct);
+            var finalLocalPath = await _remotion.RenderVideoAsync(
+                job.ProjectId, projectDir, scenes, allMediaFiles, musicFile?.LocalPath, job.TargetDuration, ct);

            allMediaFiles.Add(new GeneratedMediaFile
            {
@@ -255,7 +193,7 @@ public class VideoRenderPipeline
                MimeType = "video/mp4"
            });

-            await progressCallback(92, "MEDIA_MERGE");
+            await progressCallback(90, "MEDIA_MERGE");

            // ═══════════════════════════════════════
            // ADIM 6: S3'e yükle
@@ -285,22 +223,23 @@ public class VideoRenderPipeline
        }
    }

-    private async Task<GeneratedMediaFile> GenerateVideoClipWithProgress(
-        ScenePayload scene, string outputDir, string aspectRatio,
-        Func<Task> onComplete, CancellationToken ct)
-    {
-        var result = await _higgsField.GenerateVideoClipAsync(
-            scene, outputDir, aspectRatio, ct);
-        await onComplete();
-        return result;
-    }

    private async Task<GeneratedMediaFile> GenerateTtsWithProgress(
        ScenePayload scene, string outputDir, string voiceStyle,
        Func<Task> onComplete, CancellationToken ct)
    {
-        var result = await _tts.GenerateNarrationAsync(
-            scene, outputDir, voiceStyle, ct);
+        GeneratedMediaFile result;
+
+        if (!string.IsNullOrEmpty(scene.TtsProvider) && scene.TtsProvider.Equals("openai", StringComparison.OrdinalIgnoreCase))
+        {
+            result = await _openAiTts.GenerateNarrationAsync(scene, outputDir, voiceStyle, ct);
+        }
+        else
+        {
+            // Default: ElevenLabs
+            result = await _tts.GenerateNarrationAsync(scene, outputDir, voiceStyle, ct);
+        }
+
        await onComplete();
        return result;
    }