From bb59884bf1e16c05e17e2ed003236f0f770423c0 Mon Sep 17 00:00:00 2001
From: Sam Armstrong <sam.armstrong88@gmail.com>
Date: Thu, 27 Sep 2018 17:27:20 +1000
Subject: [PATCH] change to one example of each stream source type

---
 config/stream_setup.yaml | 32 ++++----------------------------
 launch/test_rtsp.launch  | 13 ++-----------
 2 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/config/stream_setup.yaml b/config/stream_setup.yaml
index 1ae609f..00a0a8a 100644
--- a/config/stream_setup.yaml
+++ b/config/stream_setup.yaml
@@ -1,34 +1,10 @@
 # Set up your streams to rtsp here.
-#
-# "type": ["cam" , "topic"] 
-# 
-# "source": 
-#     if type=cam, location of v4l2 camera
-#     if type=topic, the ROS Image topic to subscribe to. 
-#
-# Notes:
-#     Use a lower framerate of 10/1 on ROS topics. 
-#     There may be issues with appsrc 'media not prepared' errors if the framerate is too high.
+streams: # Cannot rename - must leave this as is.
 
-streams:
-
-  # stream-x:
-  #   type: cam
-  #   source: "v4l2src device=/dev/video0 ! videoconvert ! videoscale ! video/x-raw,framerate=15/1,width=1280,height=720"
-  #   mountpoint: /front
-  #   bitrate: 500
-
-  # stream1:
-  #   type: cam
-  #   source: "v4l2src device=/dev/video0 ! videoconvert ! videoscale ! video/x-raw,framerate=15/1,width=1280,height=720"
-  #   mountpoint: /back
-  #   bitrate: 500
-
-  stream-a:
-    type: topic
-    source: /usb_cam0/image_raw
+  stream-x:
+    type: cam
+    source: "v4l2src device=/dev/video0 ! videoconvert ! videoscale ! video/x-raw,framerate=15/1,width=1280,height=720"
     mountpoint: /front
-    caps: video/x-raw,framerate=10/1,width=640,height=480
     bitrate: 500
 
   stream-yay:
diff --git a/launch/test_rtsp.launch b/launch/test_rtsp.launch
index 3b3c852..db54976 100644
--- a/launch/test_rtsp.launch
+++ b/launch/test_rtsp.launch
@@ -1,14 +1,5 @@
 <launch>
   <!-- Start the image publisher/s if required -->
-  <!-- <node name="usb_cam0" pkg="usb_cam" type="usb_cam_node" output="screen" >
-    <param name="video_device" value="/dev/video0" />
-    <param name="image_width" value="640" />
-    <param name="image_height" value="480" />
-    <param name="pixel_format" value="yuyv" />
-    <param name="camera_frame_id" value="yuyv" />
-    <param name="io_method" value="mmap"/>
-    <param name="autofocus" value="true"/>
-  </node>
   <node name="usb_cam1" pkg="usb_cam" type="usb_cam_node" output="screen" >
     <param name="video_device" value="/dev/video1" />
     <param name="image_width" value="640" />
@@ -17,10 +8,10 @@
     <param name="camera_frame_id" value="yuyv" />
     <param name="io_method" value="mmap"/>
     <param name="autofocus" value="true"/>
-  </node> -->
+  </node>
 
 
-  <!-- <node pkg="ros_rtsp" name="camera_publisher" type="camera_publisher" args="0"/> -->
+  <!-- Start the RTSP server -->
   <node pkg="nodelet" type="nodelet" name="standalone_nodelet" args="manager" output="screen"/>
 
 	<node pkg="nodelet" type="nodelet" name="Image2RTSPNodelet" args="load image2rtsp/Image2RTSPNodelet standalone_nodelet" output="screen">