Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-11-21 19:07:46 +01:00
Code Issues Projects Releases Wiki Activity

Docs updates (#4903)

Browse Source 
* Make note that Firefox does not work with MSE

* Add restream recommendation for mjpeg
This commit is contained in:
Nicolas Mowen 2023-01-04 17:11:50 -07:00 committed by GitHub
parent 9fd13aad11
commit 5e71d95cb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docs/docs/configuration/camera_specific.md
View File

@ -11,18 +11,22 @@ This page makes use of presets of FFmpeg args. For more information on presets,
## MJPEG Cameras ## MJPEG Cameras
The input and output parameters need to be adjusted for MJPEG cameras Note that mjpeg cameras require encoding the video into h264 for recording, and restream roles. This will use significantly more CPU than if the cameras supported h264 feeds directly. It is recommended to use the restream role to create an h264 restream and then use that as the source for ffmpeg.
```yaml ```yaml
input_args: preset-http-mjpeg-generic mjpeg_cam:
``` ffmpeg:
inputs:
Note that mjpeg cameras require encoding the video into h264 for recording, and rtmp roles. This will use significantly more CPU than if the cameras supported h264 feeds directly. - path: rtsp://localhost:8554/mjpeg_cam
roles:
```yaml - detect
output_args: - record
record: preset-record-mjpeg - path: {your_mjpeg_stream_url}
rtmp: preset-rtmp-mjpeg roles:
- restream
restream:
enabled: true
video_encoding: h264
``` ```
## JPEG Stream Cameras ## JPEG Stream Cameras

12
docs/docs/configuration/live.md
View File

@ -9,11 +9,11 @@ Frigate has different live view options, some of which require [restream](restre
Live view options can be selected while viewing the live stream. The options are: Live view options can be selected while viewing the live stream. The options are:
| Source | Latency | Frame Rate | Resolution | Audio | Requires Restream | Other Limitations | | Source | Latency | Frame Rate | Resolution | Audio | Requires Restream | Other Limitations |
| ------ | ------- | -------------------------------------- | -------------- | ---------------------------- | ----------------- | --------------------- | | ------ | ------- | -------------------------------------- | -------------- | ---------------------------- | ----------------- | -------------------------------- |
| jsmpeg | low | same as `detect -> fps`, capped at 10 | same as detect | no | no | none | | jsmpeg | low | same as `detect -> fps`, capped at 10 | same as detect | no | no | none |
| mse | low | native | native | yes (depends on audio codec) | yes | not supported on iOS | | mse | low | native | native | yes (depends on audio codec) | yes | not supported on iOS or Firefox |
| webrtc | lowest | native | native | yes (depends on audio codec) | yes | requires extra config | | webrtc | lowest | native | native | yes (depends on audio codec) | yes | requires extra config |
### WebRTC extra configuration: ### WebRTC extra configuration:
@ -38,4 +38,4 @@ See https://github.com/AlexxIT/go2rtc#module-webrtc for more details
```yaml ```yaml
volumes: volumes:
- /path/to/your/go2rtc.yaml:/config/frigate-go2rtc.yaml:ro - /path/to/your/go2rtc.yaml:/config/frigate-go2rtc.yaml:ro
``` ```