-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4659 from remotion-dev/webcodecs-scale
- Loading branch information
Showing
38 changed files
with
1,261 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| import {Dimensions} from '@remotion/media-parser'; | ||
| import {ResizeOperation} from '@remotion/webcodecs'; | ||
| import React, {useCallback} from 'react'; | ||
|
|
||
| export const ResizeCorner: React.FC<{ | ||
| readonly innerDimensions: Dimensions; | ||
| readonly outerDimensions: Dimensions; | ||
| readonly videoDimensions: Dimensions; | ||
| readonly setResizeMode: React.Dispatch< | ||
| React.SetStateAction<ResizeOperation | null> | ||
| >; | ||
| readonly onStart: () => void; | ||
| readonly onEnd: () => void; | ||
| }> = ({ | ||
| innerDimensions, | ||
| outerDimensions, | ||
| setResizeMode, | ||
| onEnd, | ||
| onStart, | ||
| videoDimensions, | ||
| }) => { | ||
| const onPointerDown: React.PointerEventHandler = useCallback( | ||
| (e) => { | ||
| if (e.button !== 0) { | ||
| // right-click | ||
| return; | ||
| } | ||
| onStart(); | ||
| e.preventDefault(); | ||
| const originalX = e.clientX; | ||
|
|
||
| const currentScale = innerDimensions.width / outerDimensions.width; | ||
|
|
||
| const getScale = (e: PointerEvent) => { | ||
| const dx = e.clientX - originalX; | ||
|
|
||
| const newScaleX = Math.max( | ||
| 0.2, | ||
| Math.min(1, currentScale + dx / (outerDimensions.width / 2)), | ||
| ); | ||
|
|
||
| const newSmallerSide = Math.min( | ||
| videoDimensions.width * newScaleX, | ||
| videoDimensions.height * newScaleX, | ||
| ); | ||
|
|
||
| const snapPoints = [2160, 1080, 720, 480, 360, 240, 144, 16]; | ||
| const isCloseToSnapPoint = snapPoints.find((point) => { | ||
| return Math.abs(newSmallerSide - point) < 20; | ||
| }); | ||
| const snapPoint = isCloseToSnapPoint ?? newSmallerSide; | ||
| const scale = (snapPoint / newSmallerSide) * newScaleX; | ||
|
|
||
| const newResizeMode: ResizeOperation = { | ||
| mode: 'scale', | ||
| scale, | ||
| }; | ||
| setResizeMode(newResizeMode); | ||
| }; | ||
|
|
||
| const onPointerMove = (e: PointerEvent) => { | ||
| getScale(e); | ||
| }; | ||
|
|
||
| const onPointerRelease = (e: PointerEvent) => { | ||
| getScale(e); | ||
| onEnd(); | ||
| window.removeEventListener('pointermove', onPointerMove); | ||
| window.removeEventListener('pointerup', onPointerRelease); | ||
| }; | ||
|
|
||
| window.addEventListener('pointermove', onPointerMove); | ||
| window.addEventListener('pointerup', onPointerRelease); | ||
| }, | ||
| [ | ||
| innerDimensions.width, | ||
| onEnd, | ||
| onStart, | ||
| outerDimensions.width, | ||
| setResizeMode, | ||
| videoDimensions.height, | ||
| videoDimensions.width, | ||
| ], | ||
| ); | ||
|
|
||
| return ( | ||
| <div | ||
| className="w-6 h-6 rotate-45 bg-white border-2 border-black absolute -bottom-3 -right-3 cursor-nwse-resize" | ||
| onPointerDown={onPointerDown} | ||
| /> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| import {Dimensions} from '@remotion/media-parser'; | ||
| import {ResizeOperation} from '@remotion/webcodecs'; | ||
| import React, {useCallback, useMemo} from 'react'; | ||
|
|
||
| export const ResizeOption: React.FC<{ | ||
| readonly max: number; | ||
| readonly selected: boolean; | ||
| readonly setResizeMode: React.Dispatch< | ||
| React.SetStateAction<ResizeOperation | null> | ||
| >; | ||
| readonly portrait: boolean; | ||
| }> = ({max, selected, setResizeMode, portrait}) => { | ||
| const onClick = useCallback(() => { | ||
| setResizeMode(() => { | ||
| if (portrait) { | ||
| return { | ||
| mode: 'max-width', | ||
| maxWidth: max, | ||
| }; | ||
| } | ||
| return { | ||
| mode: 'max-height', | ||
| maxHeight: max, | ||
| }; | ||
| }); | ||
| }, [max, portrait, setResizeMode]); | ||
|
|
||
| return ( | ||
| <div | ||
| data-selected={selected} | ||
| className="font-brand text-sm pl-2 pr-2 text-muted-foreground cursor-pointer transition-colors hover:text-black data-[selected=true]:text-brand" | ||
| onClick={onClick} | ||
| > | ||
| {max}p | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export const ResizeShortcuts: React.FC<{ | ||
| readonly originalDimensions: Dimensions; | ||
| readonly resolvedDimensions: Dimensions; | ||
| readonly setResizeMode: React.Dispatch< | ||
| React.SetStateAction<ResizeOperation | null> | ||
| >; | ||
| }> = ({originalDimensions, resolvedDimensions, setResizeMode}) => { | ||
| const options = useMemo(() => { | ||
| return [2160, 1080, 720, 480, 360, 240].filter( | ||
| (option) => | ||
| option < Math.min(originalDimensions.width, originalDimensions.height), | ||
| ); | ||
| }, [originalDimensions.height, originalDimensions.width]); | ||
|
|
||
| const smallerSideSelected = useMemo(() => { | ||
| return Math.min(resolvedDimensions.width, resolvedDimensions.height); | ||
| }, [resolvedDimensions.height, resolvedDimensions.width]); | ||
|
|
||
| const portrait = originalDimensions.height > originalDimensions.width; | ||
|
|
||
| return ( | ||
| <div className="flex flex-row justify-center mb-6"> | ||
| {options.map((option) => ( | ||
| <ResizeOption | ||
| key={option} | ||
| portrait={portrait} | ||
| selected={smallerSideSelected === option} | ||
| max={option} | ||
| setResizeMode={setResizeMode} | ||
| /> | ||
| ))} | ||
| </div> | ||
| ); | ||
| }; |
Oops, something went wrong.