From 5a16042823f18d3fa52018d0effbd6e0522c050a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florent=20Thi=C3=A9ry?= <florent.thiery@ubicast.eu> Date: Tue, 19 Mar 2019 15:16:38 +0100 Subject: [PATCH] use .demo domain instead of .local, fixes #28313 --- .../mirisconf/recorderd/room-a.json | 77 +------------------ 1 file changed, 2 insertions(+), 75 deletions(-) diff --git a/13.Demokit/1.Deploy_demokit/mirisconf/recorderd/room-a.json b/13.Demokit/1.Deploy_demokit/mirisconf/recorderd/room-a.json index 1ad79d78..3bf6a5b2 100755 --- a/13.Demokit/1.Deploy_demokit/mirisconf/recorderd/room-a.json +++ b/13.Demokit/1.Deploy_demokit/mirisconf/recorderd/room-a.json @@ -4,7 +4,6 @@ "videomixer_height": 1440, "gst_debug_string": "3", "framerate": 25, - "autopublish_targets": [{"name": "localmediaserver", "channel_oid": ""}], "autoremove": true, "gop_size_s": 1, "benchmark_dur_s": 10, @@ -14,7 +13,7 @@ "enabled": true, "name": "sonycam_1", "template": "rtspvsource", - "uri": "rtsp://camera.local/media/video1", + "uri": "rtsp://camera.demo/media/video1", "width": 1280, "height": 720, "custom_delay_ms": 100 @@ -23,63 +22,14 @@ "enabled": true, "name": "sonyve_1", "template": "rtspvsource", - "uri": "rtsp://display.local/media/video1", + "uri": "rtsp://display.demo/media/video1", "width": 1920, "height": 1080, "custom_delay_ms": 150, "enable_change_detection": true - }, - { - "enabled": false, - "name": "canon_1", - "template": "rtspvsource", - "uri": "rtsp://root:camera@192.168.43.115/stream/profile1=r", - "custom_delay_ms": -220, - "width": 1920, - "height": 1080 - }, - { - "enabled": false, - "name": "q1755", - "template": "rtspvsource", - "uri": "rtsp://root:admin@192.168.1.233/axis-media/media.amp?streamprofile=Quality", - "custom_delay_ms": -60, - "width": 1280, - "height": 720 - }, - { - "enabled": false, - "name": "rawrtpvideo1", - "template": "rawrtpvsource", - "port": 6008, - "width": 1920, - "height": 1080 - }, - { - "enabled": false, - "name": "vtest1", - "template": "vtestsource", - "pattern": "smpte", - "width": 1920, - "height": 1080 - }, - { - "enabled": false, - "name": "benchtest1", - "template": "benchtestsource", - "width": 1920, - "height": 1080 } ], "audiosources": [ - { - "enabled": false, - "name": "alsa1", - "template": "alsasource", - "device": "hw:0,1", - "channels": 1, - "rate": 44100 - }, { "enabled": true, "name": "sonycam_1", @@ -93,29 +43,6 @@ "template": "rtspasource", "channels": 1, "rate": 44100 - }, - { - "enabled": false, - "name": "srg360_1", - "template": "rtspasource_adts_workaround", - "channels": 1, - "rate": 44100 - }, - { - "enabled": false, - "name": "rawrtpaudio1", - "template": "rawrtpasource", - "port": 6010, - "channels": 2, - "rate": 44100 - }, - { - "enabled": false, - "name": "atest1", - "template": "atestsource", - "wave": "ticks", - "channels": 1, - "rate": 44100 } ], "streams": [ -- GitLab