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

Make mp4 the default streaming for now

Browse Source
This commit is contained in:
Nick Mowen 2022-10-14 14:40:05 -06:00
parent fc68ebb312
commit 000b76e13f
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/rootfs/usr/local/nginx/conf/nginx.conf
View File

@ -178,16 +178,13 @@ http {
proxy_set_header Host $host; proxy_set_header Host $host;
} }
location /restream/ { location ~ /restream/mp4/(.*)$ {
location ~ /mp4/(.*)$ {
proxy_pass http://go2rtc/api/stream.mp4?src=$1; proxy_pass http://go2rtc/api/stream.mp4?src=$1;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header Host $host; proxy_set_header Host $host;
} }
}
location /go2rtc/ { location /go2rtc/ {
proxy_pass http://go2rtc/; proxy_pass http://go2rtc/;

3
frigate/config.py
View File

@ -524,13 +524,12 @@ class RestreamConfig(FrigateBaseModel):
class CameraLiveSourceEnum(str, Enum): class CameraLiveSourceEnum(str, Enum):
jsmpeg = "jsmpeg" jsmpeg = "jsmpeg"
mp4 = "mp4" mp4 = "mp4"
webrtc = "webrtc"
class CameraLiveConfig(FrigateBaseModel): class CameraLiveConfig(FrigateBaseModel):
height: int = Field(default=720, title="Live camera view height") height: int = Field(default=720, title="Live camera view height")
quality: int = Field(default=8, ge=1, le=31, title="Live camera view quality") 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): class CameraUiConfig(FrigateBaseModel):

3
web/src/routes/Camera.jsx
View File

@ -99,7 +99,6 @@ export default function Camera({ camera }) {
<Fragment> <Fragment>
<div style={`max-height: ${cameraConfig.live.height}px; max-width: ${liveWidth}px`}> <div style={`max-height: ${cameraConfig.live.height}px; max-width: ${liveWidth}px`}>
<VideoPlayer <VideoPlayer
audio={false}
live={true} live={true}
options={{ options={{
autoplay: true, autoplay: true,
@ -123,7 +122,7 @@ export default function Camera({ camera }) {
player = ( player = (
<Fragment> <Fragment>
<div> <div>
Not implemented webRTC not implemented
</div> </div>
</Fragment> </Fragment>
) )