@gradio/video 0.1.8 → 0.1.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @gradio/video
 
+## 0.1.9
+
+### Fixes
+
+- [#6566](https://github.com/gradio-app/gradio/pull/6566) [`d548202`](https://github.com/gradio-app/gradio/commit/d548202d2b5bd8a99e3ebc5bf56820b0282ce0f5) - Improve video trimming and error handling.  Thanks [@hannahblair](https://github.com/hannahblair)!
+
 ## 0.1.8
 
 ### Patch Changes
@@ -228,4 +234,4 @@ Thanks [@pngwn](https://github.com/pngwn)!
   - @gradio/image@0.1.0
   - @gradio/utils@0.0.2
   - @gradio/atoms@0.0.2
-  - @gradio/upload@0.0.2
+  - @gradio/upload@0.0.2

package/Video.stories.svelte

@@ -3,30 +3,15 @@
 	import Video from "./Index.svelte";
 	import { format } from "svelte-i18n";
 	import { get } from "svelte/store";
+	import { userEvent, within } from "@storybook/testing-library";
+	import { waitFor } from "@testing-library/dom";
 </script>
 
-<Meta
-	title="Components/Video"
-	component={Video}
-	argTypes={{
-		video: {
-			control: "text",
-			description:
-				"A path or URL for the default value that Video component is going to take. Can also be a tuple consisting of (video filepath, subtitle filepath). If a subtitle file is provided, it should be of type .srt or .vtt. Or can be callable, in which case the function will be called whenever the app loads to set the initial value of the component.",
-			name: "value"
-		},
-		autoplay: {
-			control: [true, false],
-			description: "Whether to autoplay the video on load",
-			name: "autoplay",
-			value: true
-		}
-	}}
-/>
+<Meta title="Components/Video" component={Video} />
 
 <div>
 	<Template let:args>
-		<Video {...args} i18n={get(format)} />
+		<Video i18n={get(format)} {...args} />
 	</Template>
 </div>
 
@@ -72,3 +57,26 @@
 		value: null
 	}}
 />
+
+<Story
+	name="Trim video"
+	args={{
+		value: {
+			video: {
+				path: "https://gradio-static-files.s3.us-west-2.amazonaws.com/world.mp4",
+				url: "https://gradio-static-files.s3.us-west-2.amazonaws.com/world.mp4",
+				orig_name: "world.mp4"
+			}
+		},
+		label: "world video",
+		show_label: true,
+		interactive: "true",
+		sources: ["upload"],
+		width: 400
+	}}
+	play={async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+		const trimButton = canvas.getByLabelText("Trim video to selection");
+		userEvent.click(trimButton);
+	}}
+/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradio/video",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Gradio UI packages",
   "type": "module",
   "author": "",
@@ -9,14 +9,14 @@
   "dependencies": {
     "@ffmpeg/ffmpeg": "^0.12.7",
     "@ffmpeg/util": "^0.12.1",
-    "@gradio/atoms": "^0.3.0",
+    "@gradio/atoms": "^0.3.1",
     "@gradio/client": "^0.8.2",
-    "@gradio/icons": "^0.3.0",
-    "@gradio/statustracker": "^0.4.0",
-    "@gradio/image": "^0.4.1",
-    "@gradio/upload": "^0.5.1",
+    "@gradio/icons": "^0.3.1",
+    "@gradio/image": "^0.4.2",
+    "@gradio/statustracker": "^0.4.1",
+    "@gradio/wasm": "^0.3.0",
     "@gradio/utils": "^0.2.0",
-    "@gradio/wasm": "^0.3.0"
+    "@gradio/upload": "^0.5.2"
   },
   "devDependencies": {
     "mrmime": "^1.0.1"

package/shared/VideoControls.svelte

@@ -28,6 +28,11 @@
 		const minutes = Math.floor(seconds / 60);
 		const secondsRemainder = Math.round(seconds) % 60;
 		const paddedSeconds = `0${secondsRemainder}`.slice(-2);
+
+		if (Number.isNaN(minutes) || Number.isNaN(secondsRemainder)) {
+			return "00:00";
+		}
+
 		return `${minutes}:${paddedSeconds}`;
 	};
 

package/shared/VideoTimeline.svelte

@@ -156,6 +156,7 @@
 	{:else}
 		<div id="timeline" class="thumbnail-wrapper">
 			<button
+				aria-label="start drag handle for trimming video"
 				class="handle left"
 				on:mousedown={() => startDragging("left")}
 				on:blur={stopDragging}
@@ -176,6 +177,7 @@
 				<img src={thumbnail} alt={`frame-${i}`} draggable="false" />
 			{/each}
 			<button
+				aria-label="end drag handle for trimming video"
 				class="handle right"
 				on:mousedown={() => startDragging("right")}
 				on:blur={stopDragging}

package/shared/utils.ts

@@ -66,15 +66,19 @@ export async function trimVideo(
 	endTime: number,
 	videoElement: HTMLVideoElement
 ): Promise<any> {
+	const videoUrl = videoElement.src;
+	const mimeType = lookup(videoElement.src) || "video/mp4";
+	const blobUrl = await toBlobURL(videoUrl, mimeType);
+	const response = await fetch(blobUrl);
+	const vidBlob = await response.blob();
+	const type = getVideoExtensionFromMimeType(mimeType) || "mp4";
+	const inputName = `input.${type}`;
+	const outputName = `output.${type}`;
+
 	try {
-		const videoUrl = videoElement.src;
-		const mimeType = lookup(videoElement.src) || "video/mp4";
-		const blobUrl = await toBlobURL(videoUrl, mimeType);
-		const response = await fetch(blobUrl);
-		const vidBlob = await response.blob();
-		const type = getVideoExtensionFromMimeType(mimeType) || "mp4";
-		const inputName = `input.${type}`;
-		const outputName = `output.${type}`;
+		if (startTime === 0 && endTime === 0) {
+			return vidBlob;
+		}
 
 		await ffmpeg.writeFile(
 			inputName,
@@ -84,10 +88,8 @@ export async function trimVideo(
 		let command = [
 			"-i",
 			inputName,
-			"-ss",
-			startTime.toString(),
-			"-to",
-			endTime.toString(),
+			...(startTime !== 0 ? ["-ss", startTime.toString()] : []),
+			...(endTime !== 0 ? ["-to", endTime.toString()] : []),
 			"-c:a",
 			"copy",
 			outputName
@@ -102,6 +104,7 @@ export async function trimVideo(
 		return outputBlob;
 	} catch (error) {
 		console.error("Error initializing FFmpeg:", error);
+		return vidBlob;
 	}
 }