summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2019-08-21 10:11:35 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2019-08-21 10:11:35 +0200
commit86ea8cd8b8b5af7917db28ae30cfb2d2886868fe (patch)
tree7222d8e077dd2155eecac68b8c78330bcfe5dc80 /doc
parent86fbf91f7323a2c5626a357b8414b15e20c19c9e (diff)
parent5ee85c4ac41337e383eb1a735bc05f1e5d46a98f (diff)
downloaddabmux-86ea8cd8b8b5af7917db28ae30cfb2d2886868fe.tar.gz
dabmux-86ea8cd8b8b5af7917db28ae30cfb2d2886868fe.tar.bz2
dabmux-86ea8cd8b8b5af7917db28ae30cfb2d2886868fe.zip
Merge branch 'ediInput' into next
Diffstat (limited to 'doc')
-rw-r--r--doc/advanced.mux17
-rw-r--r--doc/example.mux3
2 files changed, 13 insertions, 7 deletions
diff --git a/doc/advanced.mux b/doc/advanced.mux
index fb67b82..b9cec05 100644
--- a/doc/advanced.mux
+++ b/doc/advanced.mux
@@ -163,7 +163,8 @@ subchannels {
sub-fu {
type audio
; example file input
- inputfile "funk.mp2"
+ inputproto zmq
+ inputuri "funk.mp2"
nonblock false
bitrate 128
id 10
@@ -188,7 +189,8 @@ subchannels {
; Receive STI-D(LI) carried in STI(PI, X) inside RTP using UDP.
; This is intended to be compatible with AVT audio encoders.
; EXPERIMENTAL!
- inputfile "sti-rtp://127.0.0.1:32010"
+ inputproto sti
+ inputuri "rtp://127.0.0.1:32010"
bitrate 96
id 3
protection 3
@@ -196,11 +198,12 @@ subchannels {
sub-ri {
type dabplus
; example file input
- ;inputfile "rick.dabp"
+ ;inputuri "rick.dabp"
; example zmq input:
; Accepts connections to port 9000 from any interface.
; Use ODR-AudioEnc as encoder
- inputfile "tcp://*:9000"
+ inputproto zmq
+ inputuri "tcp://*:9000"
bitrate 96
id 1
protection 1
@@ -256,7 +259,8 @@ subchannels {
; for audio types, you can use the ZeroMQ input (if compiled in)
; with the following configuration in combination with
; Toolame-DAB
- inputfile "tcp://*:9001"
+ inputproto zmq
+ inputuri "tcp://*:9001"
bitrate 96
id 1
protection 1
@@ -273,7 +277,8 @@ subchannels {
type data
; Use the default PRBS polynomial.
- inputfile "prbs://"
+ inputproto prbs
+ inputuri "prbs://"
; To use another polynomial, set it in the url as hexadecimal
; The default polynomial is G(x) = x^20 + x^17 + 1, represented as
diff --git a/doc/example.mux b/doc/example.mux
index 6c2bc18..31e072d 100644
--- a/doc/example.mux
+++ b/doc/example.mux
@@ -171,7 +171,8 @@ subchannels {
type dabplus
; Accepts connections to port 9000 from any interface.
; Use ODR-AudioEnc as encoder
- inputfile "tcp://*:9000"
+ inputproto zmq
+ inputuri "tcp://*:9000"
bitrate 96
id 1
protection 3