mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-03-17 21:58:22 +03:00
Revert LivePlayer transform wrapper regression
This commit is contained in:
parent
6e8fd4fa32
commit
171688445d
@ -51,11 +51,6 @@ type LivePlayerProps = {
|
||||
setFullResolution?: React.Dispatch<React.SetStateAction<VideoResolutionType>>;
|
||||
onError?: (error: LivePlayerError) => void;
|
||||
onResetLiveMode?: () => void;
|
||||
contentTransform?: {
|
||||
scale: number;
|
||||
positionX: number;
|
||||
positionY: number;
|
||||
};
|
||||
};
|
||||
|
||||
export default function LivePlayer({
|
||||
@ -81,7 +76,6 @@ export default function LivePlayer({
|
||||
setFullResolution,
|
||||
onError,
|
||||
onResetLiveMode,
|
||||
contentTransform,
|
||||
}: LivePlayerProps) {
|
||||
const { t } = useTranslation(["components/player"]);
|
||||
|
||||
@ -377,39 +371,27 @@ export default function LivePlayer({
|
||||
lowerClassName="md:rounded-2xl"
|
||||
/>
|
||||
)}
|
||||
<div
|
||||
className="absolute inset-0"
|
||||
style={
|
||||
contentTransform
|
||||
? {
|
||||
transform: `translate(${contentTransform.positionX}px, ${contentTransform.positionY}px) scale(${contentTransform.scale})`,
|
||||
transformOrigin: "0 0",
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
>
|
||||
{player}
|
||||
{player}
|
||||
|
||||
<div
|
||||
className={cn(
|
||||
"absolute inset-0 w-full",
|
||||
showStillWithoutActivity &&
|
||||
!liveReady &&
|
||||
!isReEnabling &&
|
||||
cameraEnabled
|
||||
? "visible"
|
||||
: "invisible",
|
||||
)}
|
||||
>
|
||||
<AutoUpdatingCameraImage
|
||||
className="pointer-events-none size-full"
|
||||
cameraClasses="relative size-full flex justify-center"
|
||||
camera={cameraConfig.name}
|
||||
showFps={false}
|
||||
reloadInterval={stillReloadInterval}
|
||||
periodicCache
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
className={cn(
|
||||
"absolute inset-0 w-full",
|
||||
showStillWithoutActivity &&
|
||||
!liveReady &&
|
||||
!isReEnabling &&
|
||||
cameraEnabled
|
||||
? "visible"
|
||||
: "invisible",
|
||||
)}
|
||||
>
|
||||
<AutoUpdatingCameraImage
|
||||
className="pointer-events-none size-full"
|
||||
cameraClasses="relative size-full flex justify-center"
|
||||
camera={cameraConfig.name}
|
||||
showFps={false}
|
||||
reloadInterval={stillReloadInterval}
|
||||
periodicCache
|
||||
/>
|
||||
</div>
|
||||
|
||||
{cameraEnabled &&
|
||||
|
||||
@ -435,7 +435,7 @@ export default function DraggableGridLayout({
|
||||
const [audioStates, setAudioStates] = useState<AudioState>({});
|
||||
const [volumeStates, setVolumeStates] = useState<VolumeState>({});
|
||||
const [statsStates, setStatsStates] = useState<StatsState>({});
|
||||
const [cameraZoomStates, setCameraZoomStates] = useState<
|
||||
const [_cameraZoomStates, setCameraZoomStates] = useState<
|
||||
Record<string, CameraZoomRuntimeTransform>
|
||||
>({});
|
||||
const cameraZoomViewportRefs = useRef<Record<string, HTMLDivElement | null>>(
|
||||
@ -779,8 +779,6 @@ export default function DraggableGridLayout({
|
||||
const useWebGL =
|
||||
currentGroupStreamingSettings?.[camera.name]
|
||||
?.compatibilityMode || false;
|
||||
const zoomTransform =
|
||||
cameraZoomStates[camera.name] ?? getDefaultZoomTransform();
|
||||
return (
|
||||
<GridLiveContextMenu
|
||||
className="size-full"
|
||||
@ -837,7 +835,6 @@ export default function DraggableGridLayout({
|
||||
alwaysShowCameraName={displayCameraNames}
|
||||
useWebGL={useWebGL}
|
||||
cameraRef={cameraRef}
|
||||
contentTransform={zoomTransform}
|
||||
className={cn(
|
||||
"draggable-live-grid-mse-cover size-full rounded-lg bg-black md:rounded-2xl",
|
||||
camera.ui?.rotate &&
|
||||
|
||||
Loading…
Reference in New Issue
Block a user