Skip to content

Fix export menu source resolution detection #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LILQK wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix export menu source resolution detection #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 50 additions & 14 deletions src/components/video-editor/VideoEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,10 @@ export default function VideoEditor() {
const [isPlaying, setIsPlaying] = useState(false);
const [currentTime, setCurrentTime] = useState(0);
const [duration, setDuration] = useState(0);
const [sourceVideoDimensions, setSourceVideoDimensions] = useState<{
width: number;
height: number;
} | null>(null);
const [wallpaper, setWallpaper] = useState<string>(initialEditorPreferences.wallpaper);
const [shadowIntensity, setShadowIntensity] = useState(
initialEditorPreferences.shadowIntensity,
Expand Down Expand Up @@ -635,6 +639,10 @@ export default function VideoEditor() {
}

const [timelineCollapsed, setTimelineCollapsed] = useState(false);
const effectiveSourceVideoDimensions = sourceVideoDimensions ?? {
width: 1920,
height: 1080,
};

useEffect(() => {
void window.electronAPI?.getPlatform?.()?.then((platform) => {
Expand Down Expand Up @@ -1243,6 +1251,25 @@ export default function VideoEditor() {
setPreviewVersion((version) => version + 1);
}, []);

useEffect(() => {
setSourceVideoDimensions(null);
}, [videoPath]);

const handleVideoMetadataChange = useCallback(
(metadata: { width: number; height: number }) => {
const width = Math.floor(metadata.width);
const height = Math.floor(metadata.height);
if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) {
return;
}

setSourceVideoDimensions((current) =>
current?.width === width && current.height === height ? current : { width, height },
);
},
[],
);

const clearPendingProjectAutosave = useCallback(() => {
if (projectAutosaveTimeoutRef.current !== null) {
window.clearTimeout(projectAutosaveTimeoutRef.current);
Expand Down Expand Up @@ -1363,22 +1390,30 @@ export default function VideoEditor() {
const gifOutputDimensions = useMemo(
() =>
calculateOutputDimensions(
videoPlaybackRef.current?.video?.videoWidth || 1920,
videoPlaybackRef.current?.video?.videoHeight || 1080,
effectiveSourceVideoDimensions.width,
effectiveSourceVideoDimensions.height,
gifSizePreset,
GIF_SIZE_PRESETS,
),
[gifSizePreset],
[
effectiveSourceVideoDimensions.height,
effectiveSourceVideoDimensions.width,
gifSizePreset,
],
);

const desiredMp4SourceDimensions = useMemo(
() =>
calculateMp4SourceDimensions(
videoPlaybackRef.current?.video?.videoWidth || 1920,
videoPlaybackRef.current?.video?.videoHeight || 1080,
effectiveSourceVideoDimensions.width,
effectiveSourceVideoDimensions.height,
aspectRatio,
),
[aspectRatio],
[
aspectRatio,
effectiveSourceVideoDimensions.height,
effectiveSourceVideoDimensions.width,
],
);

const mp4OutputDimensions = useMemo(() => {
Expand Down Expand Up @@ -4763,8 +4798,8 @@ export default function VideoEditor() {
return;
}

const sourceWidth = video.videoWidth || 1920;
const sourceHeight = video.videoHeight || 1080;
const sourceWidth = sourceVideoDimensions?.width || video.videoWidth || 1920;
const sourceHeight = sourceVideoDimensions?.height || video.videoHeight || 1080;
const settings = resolveExportStartSettings({
sourceWidth,
sourceHeight,
Expand Down Expand Up @@ -4794,6 +4829,8 @@ export default function VideoEditor() {
gifSizePreset,
exportBackendPreference,
exportPipelineModel,
sourceVideoDimensions?.height,
sourceVideoDimensions?.width,
handleExport,
]);

Expand Down Expand Up @@ -5853,15 +5890,13 @@ export default function VideoEditor() {
aspectRatio: getAspectRatioValue(
aspectRatio,
(() => {
const previewVideo =
videoPlaybackRef.current?.video;
if (
previewVideo &&
previewVideo.videoHeight > 0
sourceVideoDimensions &&
sourceVideoDimensions.height > 0
) {
return (
previewVideo.videoWidth /
previewVideo.videoHeight
sourceVideoDimensions.width /
sourceVideoDimensions.height
);
}
return 16 / 9;
Expand All @@ -5878,6 +5913,7 @@ export default function VideoEditor() {
ref={videoPlaybackRef}
videoPath={videoPath || ""}
onDurationChange={setDuration}
onVideoMetadataChange={handleVideoMetadataChange}
onPreviewReadyChange={setIsPreviewReady}
onTimeUpdate={setCurrentTime}
currentTime={currentTime}
Expand Down
11 changes: 11 additions & 0 deletions src/components/video-editor/VideoPlayback.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,11 @@ function getEffectiveNativeAspectRatio(
interface VideoPlaybackProps {
videoPath: string;
onDurationChange: (duration: number) => void;
onVideoMetadataChange?: (metadata: {
width: number;
height: number;
duration: number;
}) => void;
onPreviewReadyChange?: (ready: boolean) => void;
onTimeUpdate: (time: number) => void;
currentTime: number;
Expand Down Expand Up @@ -389,6 +394,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
{
videoPath,
onDurationChange,
onVideoMetadataChange,
onPreviewReadyChange,
onTimeUpdate,
currentTime,
Expand Down Expand Up @@ -2539,6 +2545,11 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
const handleLoadedMetadata = (e: React.SyntheticEvent<HTMLVideoElement, Event>) => {
const video = e.currentTarget;
onDurationChange(video.duration);
onVideoMetadataChange?.({
width: video.videoWidth,
height: video.videoHeight,
duration: video.duration,
});

// Push video info to extension host for query APIs
extensionHost.setVideoInfo({
Expand Down