diff --git a/docs/docs/configuration/camera_specific.md b/docs/docs/configuration/camera_specific.md index 1e65550cd..a678d4a92 100644 --- a/docs/docs/configuration/camera_specific.md +++ b/docs/docs/configuration/camera_specific.md @@ -11,18 +11,22 @@ This page makes use of presets of FFmpeg args. For more information on presets, ## 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 -input_args: preset-http-mjpeg-generic -``` - -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. - -```yaml -output_args: - record: preset-record-mjpeg - rtmp: preset-rtmp-mjpeg + mjpeg_cam: + ffmpeg: + inputs: + - path: rtsp://localhost:8554/mjpeg_cam + roles: + - detect + - record + - path: {your_mjpeg_stream_url} + roles: + - restream + restream: + enabled: true + video_encoding: h264 ``` ## JPEG Stream Cameras diff --git a/docs/docs/configuration/live.md b/docs/docs/configuration/live.md index a6c48ce51..dee883e2c 100644 --- a/docs/docs/configuration/live.md +++ b/docs/docs/configuration/live.md @@ -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: -| 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 | -| mse | low | native | native | yes (depends on audio codec) | yes | not supported on iOS | -| webrtc | lowest | native | native | yes (depends on audio codec) | yes | requires extra config | +| 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 | +| 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 extra configuration: @@ -38,4 +38,4 @@ See https://github.com/AlexxIT/go2rtc#module-webrtc for more details ```yaml volumes: - /path/to/your/go2rtc.yaml:/config/frigate-go2rtc.yaml:ro -``` \ No newline at end of file +```