mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-03-21 15:48:22 +03:00
Merge pull request #18 from ibs0d/revert-15-codex/add-camera-rotation-config-option-yo8e42
Revert "Support dashboard rotate + cover-fit for camera tiles and players"
This commit is contained in:
commit
adfd015157
@ -412,24 +412,17 @@ export default function LivePlayer({
|
|||||||
lowerClassName="md:rounded-2xl"
|
lowerClassName="md:rounded-2xl"
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{applyDashboardTransforms ? (
|
<div
|
||||||
<div
|
ref={mediaViewportRef}
|
||||||
ref={mediaViewportRef}
|
className={cn(
|
||||||
className={cn(
|
"absolute inset-0",
|
||||||
"absolute inset-0",
|
shouldFillContainer && "overflow-hidden",
|
||||||
shouldFillContainer && "overflow-hidden",
|
)}
|
||||||
)}
|
>
|
||||||
>
|
<div className="absolute left-1/2 top-1/2" style={mediaTransformStyle}>
|
||||||
<div
|
{player}
|
||||||
className="absolute left-1/2 top-1/2"
|
|
||||||
style={mediaTransformStyle}
|
|
||||||
>
|
|
||||||
{player}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
) : (
|
</div>
|
||||||
player
|
|
||||||
)}
|
|
||||||
{cameraEnabled &&
|
{cameraEnabled &&
|
||||||
!offline &&
|
!offline &&
|
||||||
(!showStillWithoutActivity || isReEnabling) &&
|
(!showStillWithoutActivity || isReEnabling) &&
|
||||||
@ -487,63 +480,33 @@ export default function LivePlayer({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{applyDashboardTransforms ? (
|
<div
|
||||||
<div
|
className={cn(
|
||||||
|
"absolute inset-0 w-full",
|
||||||
|
showStillWithoutActivity &&
|
||||||
|
!liveReady &&
|
||||||
|
!isReEnabling &&
|
||||||
|
cameraEnabled
|
||||||
|
? "visible"
|
||||||
|
: "invisible",
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<AutoUpdatingCameraImage
|
||||||
className={cn(
|
className={cn(
|
||||||
"absolute inset-0",
|
"pointer-events-none size-full",
|
||||||
showStillWithoutActivity &&
|
|
||||||
!liveReady &&
|
|
||||||
!isReEnabling &&
|
|
||||||
cameraEnabled
|
|
||||||
? "visible"
|
|
||||||
: "invisible",
|
|
||||||
shouldFillContainer && "overflow-hidden",
|
shouldFillContainer && "overflow-hidden",
|
||||||
)}
|
)}
|
||||||
>
|
cameraClasses={cn(
|
||||||
<div
|
"relative size-full",
|
||||||
className="absolute left-1/2 top-1/2"
|
shouldFillContainer && "overflow-hidden",
|
||||||
style={mediaTransformStyle}
|
|
||||||
>
|
|
||||||
<AutoUpdatingCameraImage
|
|
||||||
className={cn(
|
|
||||||
"pointer-events-none size-full",
|
|
||||||
shouldFillContainer && "overflow-hidden",
|
|
||||||
)}
|
|
||||||
cameraClasses={cn(
|
|
||||||
"relative size-full",
|
|
||||||
shouldFillContainer && "overflow-hidden",
|
|
||||||
)}
|
|
||||||
fit={shouldFillContainer ? "cover" : "contain"}
|
|
||||||
camera={cameraConfig.name}
|
|
||||||
showFps={false}
|
|
||||||
reloadInterval={stillReloadInterval}
|
|
||||||
periodicCache
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div
|
|
||||||
className={cn(
|
|
||||||
"absolute inset-0 w-full",
|
|
||||||
showStillWithoutActivity &&
|
|
||||||
!liveReady &&
|
|
||||||
!isReEnabling &&
|
|
||||||
cameraEnabled
|
|
||||||
? "visible"
|
|
||||||
: "invisible",
|
|
||||||
)}
|
)}
|
||||||
>
|
fit={shouldFillContainer ? "cover" : "contain"}
|
||||||
<AutoUpdatingCameraImage
|
camera={cameraConfig.name}
|
||||||
className="pointer-events-none size-full"
|
showFps={false}
|
||||||
cameraClasses="relative size-full"
|
reloadInterval={stillReloadInterval}
|
||||||
fit="contain"
|
periodicCache
|
||||||
camera={cameraConfig.name}
|
/>
|
||||||
showFps={false}
|
</div>
|
||||||
reloadInterval={stillReloadInterval}
|
|
||||||
periodicCache
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{offline && applyDashboardTransforms && (
|
{offline && applyDashboardTransforms && (
|
||||||
<>
|
<>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user