From 000b76e13f248c28286fa89de9ea1192bce30d23 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Fri, 14 Oct 2022 14:40:05 -0600 Subject: [PATCH] Make mp4 the default streaming for now --- docker/rootfs/usr/local/nginx/conf/nginx.conf | 15 ++++++--------- frigate/config.py | 3 +-- web/src/routes/Camera.jsx | 3 +-- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/docker/rootfs/usr/local/nginx/conf/nginx.conf b/docker/rootfs/usr/local/nginx/conf/nginx.conf index 30a38d858..9142b3cd2 100644 --- a/docker/rootfs/usr/local/nginx/conf/nginx.conf +++ b/docker/rootfs/usr/local/nginx/conf/nginx.conf @@ -178,15 +178,12 @@ http { proxy_set_header Host $host; } - location /restream/ { - - location ~ /mp4/(.*)$ { - proxy_pass http://go2rtc/api/stream.mp4?src=$1; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; - } + location ~ /restream/mp4/(.*)$ { + proxy_pass http://go2rtc/api/stream.mp4?src=$1; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; } location /go2rtc/ { diff --git a/frigate/config.py b/frigate/config.py index 0b923d431..4a4fa8a01 100644 --- a/frigate/config.py +++ b/frigate/config.py @@ -524,13 +524,12 @@ class RestreamConfig(FrigateBaseModel): class CameraLiveSourceEnum(str, Enum): jsmpeg = "jsmpeg" mp4 = "mp4" - webrtc = "webrtc" class CameraLiveConfig(FrigateBaseModel): height: int = Field(default=720, title="Live camera view height") quality: int = Field(default=8, ge=1, le=31, title="Live camera view quality") - source: CameraLiveSourceEnum = Field(default=CameraLiveSourceEnum.restream) + source: CameraLiveSourceEnum = Field(default=CameraLiveSourceEnum.mp4) class CameraUiConfig(FrigateBaseModel): diff --git a/web/src/routes/Camera.jsx b/web/src/routes/Camera.jsx index 5b7c54b22..ab3d23e87 100644 --- a/web/src/routes/Camera.jsx +++ b/web/src/routes/Camera.jsx @@ -99,7 +99,6 @@ export default function Camera({ camera }) {
- Not implemented + webRTC not implemented
)