administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-02 17:25:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'release-0.11.0' of https://github.com/blakeblackshear/frigate into mqtt-motion-detector

Browse Source
This commit is contained in:
Nick Mowen 2022-05-14 07:28:31 -06:00
commit 5dbf7da38e
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/Dockerfile
View File

@ -79,12 +79,13 @@ RUN apt-get -qq update \
&& apt-get -qq install --no-install-recommends --no-install-suggests -y \ && apt-get -qq install --no-install-recommends --no-install-suggests -y \
# coral drivers # coral drivers
libedgetpu1-max python3-tflite-runtime python3-pycoral \ libedgetpu1-max python3-tflite-runtime python3-pycoral \
jellyfin-ffmpeg \
&& pip3 install -U /wheels/*.whl \ && pip3 install -U /wheels/*.whl \
# amd64 specific packages # arch specific packages
&& if [ "${TARGETARCH}" = "amd64" ]; then \ && if [ "${TARGETARCH}" = "amd64" ]; then \
apt-get -qq install --no-install-recommends -y \ apt-get -qq install --no-install-recommends --no-install-suggests -y \
mesa-va-drivers; \ mesa-va-drivers jellyfin-ffmpeg; else \
apt-get -qq install --no-install-recommends --no-install-suggests -y \
ffmpeg; \
fi \ fi \
&& rm -rf /wheels \ && rm -rf /wheels \
&& apt-get remove gnupg apt-transport-https -y \ && apt-get remove gnupg apt-transport-https -y \

4
web/src/components/VideoPlayer.jsx
View File

@ -19,6 +19,10 @@ const defaultSeekOptions = {
export default function VideoPlayer({ children, options, seekOptions = {}, onReady = () => {}, onDispose = () => {} }) { export default function VideoPlayer({ children, options, seekOptions = {}, onReady = () => {}, onDispose = () => {} }) {
const playerRef = useRef(); const playerRef = useRef();
if (!videojs.browser.IS_FIREFOX) {
defaultOptions.playbackRates.push(16);
}
useEffect(() => { useEffect(() => {
const player = videojs(playerRef.current, { ...defaultOptions, ...options }, () => { const player = videojs(playerRef.current, { ...defaultOptions, ...options }, () => {
onReady(player); onReady(player);

2
web/src/routes/Events.jsx
View File

@ -388,7 +388,7 @@ export default function Events({ path, ...props }) {
onClick={() => (viewEvent === event.id ? setViewEvent(null) : setViewEvent(event.id))} onClick={() => (viewEvent === event.id ? setViewEvent(null) : setViewEvent(event.id))}
> >
<div <div
className="relative rounded-l flex-initial min-w-[125px] h-[125px] bg-contain" className="relative rounded-l flex-initial min-w-[125px] h-[125px] bg-contain bg-no-repeat bg-center"
style={{ style={{
'background-image': `url(${apiHost}/api/events/${event.id}/thumbnail.jpg)`, 'background-image': `url(${apiHost}/api/events/${event.id}/thumbnail.jpg)`,
}} }}