Fix video duration metadata

apps/desktop/src-tauri/src/export.rs

@@ -93,25 +93,14 @@ pub async fn get_export_estimates(
     resolution: XY<u32>,
     fps: u32,
 ) -> Result<ExportEstimates, String> {
-    let screen_metadata = get_video_metadata(path.clone()).await?;
-    let camera_metadata = get_video_metadata(path.clone()).await.ok();
-
-    let raw_duration = screen_metadata.duration.max(
-        camera_metadata
-            .map(|m| m.duration)
-            .unwrap_or(screen_metadata.duration),
-    );
+    let metadata = get_video_metadata(path.clone()).await?;
 
     let meta = RecordingMeta::load_for_project(&path).unwrap();
     let project_config = meta.project_config();
     let duration_seconds = if let Some(timeline) = &project_config.timeline {
-        timeline
-            .segments
-            .iter()
-            .map(|s| (s.end - s.start) / s.timescale)
-            .sum()
+        timeline.segments.iter().map(|s| s.duration()).sum()
     } else {
-        raw_duration
+        metadata.duration
     };
 
     let (width, height) = (resolution.x, resolution.y);

apps/desktop/src-tauri/src/lib.rs

@@ -88,6 +88,8 @@ use windows::EditorWindowIds;
 use windows::set_window_transparent;
 use windows::{CapWindowId, ShowCapWindow};
 
+use crate::upload::build_video_meta;
+
 #[allow(clippy::large_enum_variant)]
 pub enum RecordingState {
     None,
@@ -1123,28 +1125,6 @@ async fn upload_exported_video(
         return Ok(UploadResult::NotAuthenticated);
     };
 
-    let screen_metadata = get_video_metadata(path.clone()).await.map_err(|e| {
-        sentry::capture_message(
-            &format!("Failed to get video metadata: {e}"),
-            sentry::Level::Error,
-        );
-
-        "Failed to read video metadata. The recording may be from an incompatible version."
-            .to_string()
-    })?;
-
-    let camera_metadata = get_video_metadata(path.clone()).await.ok();
-
-    let duration = screen_metadata.duration.max(
-        camera_metadata
-            .map(|m| m.duration)
-            .unwrap_or(screen_metadata.duration),
-    );
-
-    if !auth.is_upgraded() && duration > 300.0 {
-        return Ok(UploadResult::UpgradeRequired);
-    }
-
     let mut meta = RecordingMeta::load_for_project(&path).map_err(|v| v.to_string())?;
 
     let output_path = meta.output_path();
@@ -1153,6 +1133,13 @@ async fn upload_exported_video(
         return Err("Failed to upload video: Rendered video not found".to_string());
     }
 
+    let metadata = build_video_meta(&output_path)
+        .map_err(|err| format!("Error getting output video meta: {}", err.to_string()))?;
+
+    if !auth.is_upgraded() && metadata.duration_in_secs > 300.0 {
+        return Ok(UploadResult::UpgradeRequired);
+    }
+
     UploadProgress { progress: 0.0 }.emit(&app).ok();
 
     let s3_config = async {
@@ -1177,7 +1164,7 @@ async fn upload_exported_video(
             false,
             video_id,
             Some(meta.pretty_name.clone()),
-            Some(duration.to_string()),
+            Some(metadata.clone()),
         )
         .await
     }
@@ -1191,7 +1178,7 @@ async fn upload_exported_video(
         output_path,
         Some(s3_config),
         Some(meta.project_path.join("screenshots/display.jpg")),
-        Some(duration.to_string()),
+        Some(metadata),
     )
     .await
     {

apps/desktop/src-tauri/src/recording.rs

@@ -770,7 +770,7 @@ async fn handle_recording_finish(
                                 output_path,
                                 Some(video_upload_info.config.clone()),
                                 Some(display_screenshot.clone()),
-                                meta.map(|v| v.duration),
+                                meta,
                             )
                             .await
                             {