diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-04-22 16:04:20 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-04-22 16:04:20 +0200 |
| commit | ab689f20d9fe8ce503f633ce98d94462229153cd (patch) | |
| tree | d9b1bde892192cdbc3a72a6922b2e0009da7c9df | |
| parent | 322c6d765ab1d83cfb5f201626525d3b139103d0 (diff) | |
| download | mmbtools-aux-ab689f20d9fe8ce503f633ce98d94462229153cd.tar.gz mmbtools-aux-ab689f20d9fe8ce503f633ce98d94462229153cd.tar.bz2 mmbtools-aux-ab689f20d9fe8ce503f633ce98d94462229153cd.zip | |
Random changes in enc-fip and zmq-simul
| -rw-r--r-- | supervisor/enc-fip.conf | 2 | ||||
| -rw-r--r-- | zmq-simul.mux | 75 |
2 files changed, 38 insertions, 39 deletions
diff --git a/supervisor/enc-fip.conf b/supervisor/enc-fip.conf index f9aa3af..ee1d14c 100644 --- a/supervisor/enc-fip.conf +++ b/supervisor/enc-fip.conf @@ -1,6 +1,6 @@ [program:enc-fip] #command=toolame -V http://http://audio.scdn.arkena.com/11016/fip-midfi128.mp3 -b 128 -s 48 -p 34 -P /home/bram/dab/fip.pad tcp://localhost:9002 -command=dabplus-enc --dab -v http://http://audio.scdn.arkena.com/11016/fip-midfi128.mp3 -b 128 -s 48 -p 34 -P /home/bram/dab/fip.pad -o tcp://localhost:9002 +command=dabplus-enc --dab -v http://http://audio.scdn.arkena.com/11016/fip-midfi128.mp3 -b 128 -s 48 -p 34 -P /home/bram/dab/fip.pad -o tcp://localhost:9002 -D startretries=30 directory=/home/bram/ autostart=true diff --git a/zmq-simul.mux b/zmq-simul.mux index 6a599dc..4953363 100644 --- a/zmq-simul.mux +++ b/zmq-simul.mux @@ -88,8 +88,7 @@ subchannels { sub-fb { type dabplus ; use ZeroMQ: - ;inputfile "tcp://*:9001" - inputfile "./stream-0.msc" + inputfile "tcp://*:9001" zmq-buffer 40 zmq-prebuffering 20 bitrate 128 @@ -149,41 +148,41 @@ outputs { ; This throttles muxing down to nominal rate throttle "simul://" - ;net_udp "udp://shack.local:31000" - net_tcp "tcp://0.0.0.0:31000" - - edi { - fec 0 - chunk_len 200 - - destinations { - multicast { - destination "239.20.64.1" - ;source "192.168.2.10" - source "192.168.0.100" - sourceport 52321 - ttl 1 - } - ;unicast { - ;destination "192.168.2.2" - ;} - } - - port 52002 - - ; EDI uses the UDP protocol - - ; Enable the PFT subsystem. If false, AFPackets are sent. - enable_pft true - - ; Save the packets sent over ethernet to the file ./edi.debug - dump false - - ; show more debugging info - verbose false - - ; optional: what kind of alignment to do in the tagpacket - tagpacket_alignment 16 - } + ;net_udp "udp://237.10.0.230:7000?src=10.0.1.125,ttl=10" + ;net_tcp "tcp://0.0.0.0:31000" + +; edi { +; fec 0 +; chunk_len 200 +; +; destinations { +; multicast { +; destination "239.20.64.1" +; ;source "192.168.2.10" +; source "192.168.0.100" +; sourceport 52321 +; ttl 1 +; } +; ;unicast { +; ;destination "192.168.2.2" +; ;} +; } +; +; port 52002 +; +; ; EDI uses the UDP protocol +; +; ; Enable the PFT subsystem. If false, AFPackets are sent. +; enable_pft true +; +; ; Save the packets sent over ethernet to the file ./edi.debug +; dump false +; +; ; show more debugging info +; verbose false +; +; ; optional: what kind of alignment to do in the tagpacket +; tagpacket_alignment 16 +; } } |