From 6ed8977548a46ae5b3166314f5f8041378f9f4a1 Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Wed, 25 Jan 2023 17:35:27 -0700 Subject: [PATCH] Update flv docs (#5238) * Update camera_specific.md * Update restream.md --- docs/docs/configuration/camera_specific.md | 9 ++++++--- docs/docs/configuration/restream.md | 11 +++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/docs/docs/configuration/camera_specific.md b/docs/docs/configuration/camera_specific.md index 5069d712e..d61d5cbd9 100644 --- a/docs/docs/configuration/camera_specific.md +++ b/docs/docs/configuration/camera_specific.md @@ -108,8 +108,11 @@ According to [this discussion](https://github.com/blakeblackshear/frigate/issues ```yaml go2rtc: streams: - reolink: ffmpeg:http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=username&password=password#video=copy#audio=copy#audio=opus - reolink_sub: ffmpeg:http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_ext.bcs&user=username&password=password + reolink: + - http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=username&password=password + - ffmpeg:reolink#audio=opus + reolink_sub: + - http://reolink_ip/flv?port=1935&app=bcs&stream=channel0_ext.bcs&user=username&password=password cameras: reolink: @@ -119,7 +122,7 @@ cameras: input_args: preset-rtsp-restream roles: - record - - path: rtsp://127.0.0.1:8554/reolink?video=copy + - path: rtsp://127.0.0.1:8554/reolink_sub?video=copy input_args: preset-rtsp-restream roles: - detect diff --git a/docs/docs/configuration/restream.md b/docs/docs/configuration/restream.md index 09967ea8b..d28d3421d 100644 --- a/docs/docs/configuration/restream.md +++ b/docs/docs/configuration/restream.md @@ -31,8 +31,9 @@ go2rtc: rtsp_cam: # <- for RTSP streams - rtsp://192.168.1.5:554/live0 # <- stream which supports video & aac audio - ffmpeg:rtsp_cam#audio=opus # <- copy of the stream which transcodes audio to the missing codec (usually will be opus) - http_cam: # <- for http streams - - "ffmpeg:http://192.168.50.155/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=user&password=password#video=copy#audio=copy#audio=opus" # <- http streams must use ffmpeg to set all types + http_cam: # <- for other streams + - http://192.168.50.155/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=user&password=password # <- stream which supports video & aac audio + - ffmpeg:http_cam#audio=opus # <- copy of the stream which transcodes audio to the missing codec (usually will be opus) cameras: rtsp_cam: @@ -71,9 +72,11 @@ go2rtc: - rtsp://192.168.1.5:554/substream # <- stream which supports video & aac audio. This is only supported for rtsp streams, http must use ffmpeg - ffmpeg:rtsp_cam_sub#audio=opus # <- copy of the stream which transcodes audio to opus http_cam: - - "ffmpeg:http://192.168.50.155/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=user&password=password#video=copy#audio=copy#audio=opus" # <- http streams must use ffmpeg to set all types + - http://192.168.50.155/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=user&password=password # <- stream which supports video & aac audio. This is only supported for rtsp streams, http must use ffmpeg + - ffmpeg:http_cam#audio=opus # <- copy of the stream which transcodes audio to opus http_cam_sub: - - "ffmpeg:http://192.168.50.155/flv?port=1935&app=bcs&stream=channel0_ext.bcs&user=user&password=password#video=copy#audio=copy#audio=opus" # <- http streams must use ffmpeg to set all types + - http://192.168.50.155/flv?port=1935&app=bcs&stream=channel0_ext.bcs&user=user&password=password # <- stream which supports video & aac audio. This is only supported for rtsp streams, http must use ffmpeg + - ffmpeg:http_cam_sub#audio=opus # <- copy of the stream which transcodes audio to opus cameras: rtsp_cam: