From 1a75cc3a2807e55e5bb5eaf2691409247125210b Mon Sep 17 00:00:00 2001 From: Michael Hunter Date: Mon, 30 Sep 2019 16:24:25 -0600 Subject: [PATCH 1/2] add rtsp/pipeline to documentation --- en/guide/configuration_file.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/en/guide/configuration_file.md b/en/guide/configuration_file.md index 938f75b..d47c94a 100644 --- a/en/guide/configuration_file.md +++ b/en/guide/configuration_file.md @@ -171,3 +171,15 @@ Example: [gazebo] camtopic=~/typhoon_h480/cgo3_camera_link/camera/image ``` + +### [rtsp] + +Key | Description | Default +-- | --- | --- +`pipeline` | a gstreamer pipeline for encoding the the pipeline to be used for transmitting. For example, it's used int the ubuntu.conf example.| + +[ubuntu.conf full example](../../camera-manager/master/samples/config/ubuntu.conf) +```shell +[rtsp] +pipeline=v4l2src device=/dev/video0 ! videoconvert ! video/x-raw, format=I420 ! x264enc speed-preset=ultrafast tune=zerolatency ! rtph264pay name=pay0 +``` From 1cb8b9ed11f28338a38e7949e522cee62daf81ba Mon Sep 17 00:00:00 2001 From: Michael Hunter Date: Mon, 30 Sep 2019 16:28:27 -0600 Subject: [PATCH 2/2] updated link fixed link to example --- en/guide/configuration_file.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/guide/configuration_file.md b/en/guide/configuration_file.md index d47c94a..b5529b0 100644 --- a/en/guide/configuration_file.md +++ b/en/guide/configuration_file.md @@ -178,7 +178,7 @@ Key | Description | Default -- | --- | --- `pipeline` | a gstreamer pipeline for encoding the the pipeline to be used for transmitting. For example, it's used int the ubuntu.conf example.| -[ubuntu.conf full example](../../camera-manager/master/samples/config/ubuntu.conf) +[ubuntu.conf full example](https://github.com/Dronecode/camera-manager/tree/master/samples/config/ubuntu.conf) ```shell [rtsp] pipeline=v4l2src device=/dev/video0 ! videoconvert ! video/x-raw, format=I420 ! x264enc speed-preset=ultrafast tune=zerolatency ! rtph264pay name=pay0