From 9cf50af569b7d8f082b80bcb1ee3bf3c6b717b1e Mon Sep 17 00:00:00 2001 From: htt Date: Sat, 18 Jun 2016 00:29:48 +0200 Subject: [PATCH] Use rtspt because it works with the modems --- python/feeder/config.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/python/feeder/config.py b/python/feeder/config.py index ecbad37..16c3359 100644 --- a/python/feeder/config.py +++ b/python/feeder/config.py @@ -2,8 +2,8 @@ CAMERA_FEEDS = { '/tmp/feed1' : '192.168.2.20', -# '/tmp/feed2' : '192.168.2.30', -# '/tmp/feed3' : '192.168.2.40', + '/tmp/feed2' : '192.168.2.30', + '/tmp/feed3' : '192.168.2.40', } MIXER_PIPE = '/tmp/mixer1' @@ -11,7 +11,7 @@ MIXER_PIPE = '/tmp/mixer1' MIXER_WIDTH = 1280 MIXER_HEIGHT = 720 MIXER_FRAMERATE = 25 -SHM_SIZE = 10000000 +SHM_SIZE = MIXER_WIDTH * MIXER_WIDTH * 4 * 26 SCREEN_WIDTH = 640 SCREEN_HEIGHT = 360 @@ -19,13 +19,13 @@ OUTPUT_PORT = 6666 -FEED_SOURCE = 'rtspsrc location=rtsp://%(ip)s ! rtph264depay ! h264parse ! avdec_h264' +FEED_SOURCE = 'rtspsrc location=rtspt://%(ip)s ! rtph264depay ! h264parse ! avdec_h264' MIXER_FORMAT = 'video/x-raw, format=BGRA,'\ + ' width=%(width)d, height=%(height)d, framerate=%(framerate)d/1, pixel-aspect-ratio=1/1' SCALE = 'videorate ! videoscale ! videoconvert' -FEED_SINK = 'shmsink socket-path=%(feed_pipe)s shm-size=%(shm_size)d wait-for-connection=0' +FEED_SINK = 'shmsink socket-path=%(feed_pipe)s shm-size=%(shm_size)d wait-for-connection=1 sync=true' OUTPUT_SOURCE = 'shmsrc socket-path=%(mixer_pipe)s do-timestamp=true is-live=true' SCREEN_OUTPUT = 'videoscale ! video/x-raw, format=BGRA, width=%(screen_width)d, height=%(screen_height)d !'\ + 'videoconvert ! timeoverlay ! ximagesink' -NETWORK_OUTPUT = 'videoconvert ! timeoverlay ! x264enc tune="zerolatency" ! mpegtsmux ! tcpserversink host=0.0.0.0 port=%(port)d' +NETWORK_OUTPUT = 'videoconvert ! x264enc tune="zerolatency" ! video/x-h264, profile="high" ! mpegtsmux ! tcpserversink host=0.0.0.0 port=%(port)d'