2 files changed, 33 insertions, 13 deletions

diff --git a/apps/web/src/lib/media-processing.ts b/apps/web/src/lib/media-processing.ts
index 4c1294ae..353c3113 100644
--- a/apps/web/src/lib/media-processing.ts
+++ b/apps/web/src/lib/media-processing.ts
@@ -6,7 +6,7 @@ import {
   getImageDimensions,
   type MediaItem,
 } from "@/stores/media-store";
-// import { generateThumbnail, getVideoInfo } from "./ffmpeg-utils"; // Temporarily disabled
+import { generateThumbnail, getVideoInfo } from "./ffmpeg-utils";
 
 export interface ProcessedMediaItem extends Omit<MediaItem, "id"> {}
 
@@ -33,6 +33,7 @@ export async function processMediaFiles(
     let duration: number | undefined;
     let width: number | undefined;
     let height: number | undefined;
+    let fps: number | undefined;
 
     try {
       if (fileType === "image") {
@@ -41,17 +42,31 @@ export async function processMediaFiles(
         width = dimensions.width;
         height = dimensions.height;
       } else if (fileType === "video") {
-        // Use basic thumbnail generation for now
-        const videoResult = await generateVideoThumbnail(file);
-        thumbnailUrl = videoResult.thumbnailUrl;
-        width = videoResult.width;
-        height = videoResult.height;
-      } else if (fileType === "audio") {
-        // For audio, we don't set width/height (they'll be undefined)
-      }
+        try {
+          // Use FFmpeg for comprehensive video info extraction
+          const videoInfo = await getVideoInfo(file);
+          duration = videoInfo.duration;
+          width = videoInfo.width;
+          height = videoInfo.height;
+          fps = videoInfo.fps;
 
-      // Get duration for videos and audio (if not already set by FFmpeg)
-      if ((fileType === "video" || fileType === "audio") && !duration) {
+          // Generate thumbnail using FFmpeg
+          thumbnailUrl = await generateThumbnail(file, 1);
+        } catch (error) {
+          console.warn(
+            "FFmpeg processing failed, falling back to basic processing:",
+            error
+          );
+          // Fallback to basic processing
+          const videoResult = await generateVideoThumbnail(file);
+          thumbnailUrl = videoResult.thumbnailUrl;
+          width = videoResult.width;
+          height = videoResult.height;
+          duration = await getMediaDuration(file);
+          // FPS will remain undefined for fallback
+        }
+      } else if (fileType === "audio") {
+        // For audio, we don't set width/height/fps (they'll be undefined)
         duration = await getMediaDuration(file);
       }
 
@@ -64,6 +79,7 @@ export async function processMediaFiles(
         duration,
         width,
         height,
+        fps,
       });
 
       // Yield back to the event loop to keep the UI responsive
diff --git a/apps/web/src/lib/time.ts b/apps/web/src/lib/time.ts
index e2db28c2..b3147946 100644
--- a/apps/web/src/lib/time.ts
+++ b/apps/web/src/lib/time.ts
@@ -1,14 +1,16 @@
 // Time-related utility functions

 

-// Helper function to format time in various formats (MM:SS, HH:MM:SS, HH:MM:SS:CS)

+// Helper function to format time in various formats (MM:SS, HH:MM:SS, HH:MM:SS:CS, HH:MM:SS:FF)

 export const formatTimeCode = (

   timeInSeconds: number,

-  format: "MM:SS" | "HH:MM:SS" | "HH:MM:SS:CS" = "HH:MM:SS:CS"

+  format: "MM:SS" | "HH:MM:SS" | "HH:MM:SS:CS" | "HH:MM:SS:FF" = "HH:MM:SS:CS",

+  fps: number = 30

 ): string => {

   const hours = Math.floor(timeInSeconds / 3600);

   const minutes = Math.floor((timeInSeconds % 3600) / 60);

   const seconds = Math.floor(timeInSeconds % 60);

   const centiseconds = Math.floor((timeInSeconds % 1) * 100);

+  const frames = Math.floor((timeInSeconds % 1) * fps);

 

   switch (format) {

     case "MM:SS":

@@ -17,5 +19,7 @@ export const formatTimeCode = (
       return `${hours.toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}`;

     case "HH:MM:SS:CS":

       return `${hours.toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}:${centiseconds.toString().padStart(2, "0")}`;

+    case "HH:MM:SS:FF":

+      return `${hours.toString().padStart(2, "0")}:${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}:${frames.toString().padStart(2, "0")}`;

   }

 };