add zeromq encode script and mux config

4 files changed, 100 insertions, 3 deletions

diff --git a/encode-fbplus.sh b/encode-fbplus.sh
new file mode 100755
index 0000000..6741c44
--- /dev/null
+++ b/encode-fbplus.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# Encode Frequence Banane to ZMQ tcp://*:2720
+#
+mpg123 -s http://fbpc5.epfl.ch:8000/fb_192 |\
+    sox -t raw -r 44100 -e signed -b 16 -c 2 -   -t raw  - rate 48k |\
+    ../fdk-aac-dabplus/aac-enc-dabplus-zmq -i /dev/stdin -b 96 -f raw -a -o 'tcp://*:2720'
diff --git a/examplemod.ini b/examplemod.ini
index 00e49f3..080dcaa 100644
--- a/examplemod.ini
+++ b/examplemod.ini
@@ -10,7 +10,8 @@ filelog=1
 filename=/dev/stderr
 
 [input]
-filename=/dev/stdin
+transport=file
+source=/dev/stdin
 loop=0
 
 [modulator]
@@ -30,7 +31,7 @@ digital_gain=1.0
 rate=2048000
 
 [firfilter]
-enabled=1
+enabled=0
 filtertapsfile=filter/simplefiltertaps.txt
 
 [output]
diff --git a/test.ini b/test.ini
index a9e1b70..c8d470f 100644
--- a/test.ini
+++ b/test.ini
@@ -35,7 +35,7 @@ digital_gain=1.0
 rate=2048000
 
 [firfilter]
-enabled=1
+enabled=0
 filtertapsfile=filter/simplefiltertaps.txt
 
 [output]
diff --git a/zmq-simul.mux b/zmq-simul.mux
new file mode 100644
index 0000000..8352666
--- /dev/null
+++ b/zmq-simul.mux
@@ -0,0 +1,89 @@
+general {
+    ; the DAB Transmission mode (values 1-4 accepted)
+    dabmode 1
+
+    ; the number of ETI frames to generate (set to 0 to get an unlimited number)
+    nbframes 0
+
+
+    ; Enable TCPLog on port 12222
+    tcplog false
+    writescca false
+    tist false
+}
+
+; Some ensemble parameters
+ensemble {
+    id 20479
+    ecc 1249 ; Extended Country Code (decimal)
+    label "TuxMux"
+    shortlabel "Tux"
+}
+
+services {
+    srv_fb {
+        label "FB"
+        shortlabel "FB"
+        pty 0
+        language 0
+        id 60
+        ; also supports id
+    }
+    srv_funk {
+        label "Funk"
+        id 10
+        ; also supports id
+    }
+}
+
+; The subchannels are defined in the corresponding section.
+; supported types are : audio, bridge, data, enhancedpacket,
+;                       dabplus, dmb, packet, test
+subchannels {
+    sub_fb {
+        type dabplus
+        ;use ZeroMQ:
+        inputfile "tcp://localhost:2720"
+        nonblock false
+        bitrate 96
+        id 24
+        protection 3
+    }
+    sub_funk {
+        type audio
+        inputfile "funk.mp2"
+        nonblock false
+        bitrate 128
+        id 10
+        protection 5
+    }
+}
+
+; For now, each component links one service to one subchannel
+components {
+    ; the component unique identifiers are not used anywhere, but
+    ; are useful to disambiguate different components.
+    comp_fb {
+        label "FB"
+        shortlabel "FB"
+        service srv_fb
+        subchannel sub_fb
+    }
+
+    comp_funk {
+        label "Funk"
+        service srv_funk
+        subchannel sub_funk
+    }
+}
+
+; A list of outputs, in the format
+; unique_id "uri"
+outputs {
+    ;foobar "fifo:///dev/stdout?type=raw"
+    ;zmq  "zmq+tcp://*:8080"
+
+    ; This throttles muxing down to nominal rate
+    throttle "simul://"
+
+}