Skip to content

Create professional demos and 3D mockups in seconds, directly in your browser

feat: enhance video export functionality with hardware acceleration options

CristianOlivera118d02f63c87f
diff --git a/app/[locale]/(editor)/editor/page.tsx b/app/[locale]/(editor)/editor/page.tsx
index 4ddc6b4..d7e02fa 100644
--- a/app/[locale]/(editor)/editor/page.tsx
+++ b/app/[locale]/(editor)/editor/page.tsx
@@ -18,7 +18,7 @@ import { useUndoRedo } from "@/hooks/useUndoRedo";
import { clearAllThumbnailCache } from "@/lib/thumbnail-cache";
import { addVideoToLibrary, addVideoToLibraryWithMetadata, getLibraryVideoCount, getLibraryVideo, findExistingVideo } from "@/lib/videos-library";
import { calculateTotalDuration, findNextClipPosition, getClipAtTime, splitClipAtTime, type VideoTrackClip } from "@/types/video-track.types";
-import type { ExportQuality, BackgroundTab, VideoCanvasHandle, BackgroundColorConfig, AspectRatio, CropArea, ZoomFragment, AudioTrack, ImageExportFormat } from "@/types";
+import type { ExportQuality, BackgroundTab, VideoCanvasHandle, BackgroundColorConfig, AspectRatio, CropArea, ZoomFragment, AudioTrack, ImageExportFormat, UploadedAudio } from "@/types";
import type { TrimRange } from "@/types/timeline.types";
import type { MockupConfig, MenuPage } from "@/types/mockup.types";
import type { EditorState } from "@/types/editor-state.types";
@@ -272,8 +272,8 @@ export default function Editor() {
const [multiSelectedElementIds, setMultiSelectedElementIds] = useState<string[]>([]);
// Audio state
- const [uploadedAudios, setUploadedAudios] = useState<import("@/types/audio.types").UploadedAudio[]>([]);
- const [audioTracks, setAudioTracks] = useState<import("@/types/audio.types").AudioTrack[]>([]);
+ const [uploadedAudios, setUploadedAudios] = useState<UploadedAudio[]>([]);
+ const [audioTracks, setAudioTracks] = useState<AudioTrack[]>([]);
const [muteOriginalAudio, setMuteOriginalAudio] = useState<boolean>(false);
const [masterVolume, setMasterVolume] = useState<number>(1);
const [selectedAudioTrackId, setSelectedAudioTrackId] = useState<string | null>(null);
@@ -746,7 +746,7 @@ export default function Editor() {
const [autoTrimModalOpen, setAutoTrimModalOpen] = useState(false);
const [pendingAudioUpload, setPendingAudioUpload] = useState<{
- audio: import("@/types/audio.types").UploadedAudio;
+ audio: UploadedAudio;
trackId: string;
} | null>(null);
@@ -1112,7 +1112,7 @@ export default function Editor() {
audio.addEventListener('error', () => reject(new Error('Failed to load audio')));
});
- const newAudio: import("@/types/audio.types").UploadedAudio = {
+ const newAudio: UploadedAudio = {
id: `audio-${crypto.randomUUID()}`,
name: file.name,
url,
@@ -1132,7 +1132,7 @@ export default function Editor() {
setPendingAudioUpload({ audio: newAudio, trackId });
setAutoTrimModalOpen(true);
} else {
- const newTrack: import("@/types/audio.types").AudioTrack = {
+ const newTrack: AudioTrack = {
id: trackId,
audioId: newAudio.id,
name: newAudio.name,
@@ -1183,7 +1183,7 @@ export default function Editor() {
const lastTrackEnd = audioTracks.reduce((max, track) =>
Math.max(max, track.startTime + track.duration), 0);
- const newTrack: import("@/types/audio.types").AudioTrack = {
+ const newTrack: AudioTrack = {
id: `track-${crypto.randomUUID()}`,
audioId,
name: audio.name,
@@ -1199,7 +1199,7 @@ export default function Editor() {
}
}, [uploadedAudios, audioTracks]);
- const handleUpdateAudioTrack = useCallback((trackId: string, updates: Partial<import("@/types/audio.types").AudioTrack>) => {
+ const handleUpdateAudioTrack = useCallback((trackId: string, updates: Partial<AudioTrack>) => {
setAudioTracks(prev => prev.map(track =>
track.id === trackId ? { ...track, ...updates } : track
));
diff --git a/hooks/useVideoExport.ts b/hooks/useVideoExport.ts
index ab3cb6e..6570edf 100644
--- a/hooks/useVideoExport.ts
+++ b/hooks/useVideoExport.ts
@@ -363,25 +363,54 @@ async function exportWithMediabunny(
const totalFrames = Math.ceil(outputDuration * fps);
const frameDuration = 1 / fps;
- const output = new Output({
+ let output = new Output({
format: new Mp4OutputFormat({
fastStart: "in-memory",
}),
target: new BufferTarget(),
});
- const videoSource = new CanvasSource(canvas, {
- codec: "avc",
- bitrate: bitrate,
- bitrateMode: "variable",
- latencyMode: "quality",
- fullCodecString: "avc1.640033",
- });
- output.addVideoTrack(videoSource, {
- frameRate: fps,
- });
+ let videoSource: CanvasSource;
+
+ try {
+ videoSource = new CanvasSource(canvas, {
+ codec: "avc",
+ bitrate: bitrate,
+ bitrateMode: "variable",
+ latencyMode: "quality",
+ fullCodecString: "avc1.640033",
+ hardwareAcceleration: "prefer-hardware",
+ });
+
+ output.addVideoTrack(videoSource, {
+ frameRate: fps,
+ });
+
+ await output.start();
+ } catch (error) {
- await output.start();
+ output = new Output({
+ format: new Mp4OutputFormat({
+ fastStart: "in-memory",
+ }),
+ target: new BufferTarget(),
+ });
+
+ videoSource = new CanvasSource(canvas, {
+ codec: "avc",
+ bitrate: bitrate,
+ bitrateMode: "variable",
+ latencyMode: "quality",
+ fullCodecString: "avc1.640033",
+ hardwareAcceleration: "prefer-software",
+ });
+
+ output.addVideoTrack(videoSource, {
+ frameRate: fps,
+ });
+
+ await output.start();
+ }
video.pause();
video.currentTime = trimStart;
@@ -514,25 +543,45 @@ async function exportWithMediabunnyAndAudio(
const totalFrames = Math.ceil(outputDuration * fps);
const frameDuration = 1 / fps;
- const output = new Output({
- format: new Mp4OutputFormat({
- fastStart: "in-memory",
- }),
+ let output = new Output({
+ format: new Mp4OutputFormat({ fastStart: "in-memory" }),
target: new BufferTarget(),
});
- const videoSource = new CanvasSource(canvas, {
- codec: "avc",
- bitrate: bitrate,
- bitrateMode: "variable",
- latencyMode: "quality",
- fullCodecString: "avc1.640033",
- });
- output.addVideoTrack(videoSource, {
- frameRate: fps,
- });
+ let videoSource: CanvasSource;
+
+ try {
+ videoSource = new CanvasSource(canvas, {
+ codec: "avc",
+ bitrate: bitrate,
+ bitrateMode: "variable",
+ latencyMode: "quality",
+ fullCodecString: "avc1.640033",
+ hardwareAcceleration: "prefer-hardware",
+ });
- await output.start();
+ output.addVideoTrack(videoSource, { frameRate: fps });
+ await output.start();
+
+ } catch (error) {
+
+ output = new Output({
+ format: new Mp4OutputFormat({ fastStart: "in-memory" }),
+ target: new BufferTarget(),
+ });
+
+ videoSource = new CanvasSource(canvas, {
+ codec: "avc",
+ bitrate: bitrate,
+ bitrateMode: "variable",
+ latencyMode: "quality",
+ fullCodecString: "avc1.640033",
+ hardwareAcceleration: "prefer-software",
+ });
+
+ output.addVideoTrack(videoSource, { frameRate: fps });
+ await output.start();
+ }
video.pause();