diff options
| -rwxr-xr-x | encode-fbplus.sh | 4 | ||||
| -rw-r--r-- | examplemod.ini | 2 | ||||
| -rw-r--r-- | test.ini | 15 | ||||
| -rw-r--r-- | zmq-simul.mux | 28 |
4 files changed, 29 insertions, 20 deletions
diff --git a/encode-fbplus.sh b/encode-fbplus.sh index e83f7f1..75448ea 100755 --- a/encode-fbplus.sh +++ b/encode-fbplus.sh @@ -28,7 +28,7 @@ then -b $BITRATE -f raw -a -o $DSTPORT else mpg123 -s $URL |\ - sox -t raw -r 44100 -e signed -b 16 -c 2 - -t raw - rate 48k |\ + sox -t raw -r 44100 -e signed -b 16 -c 2 - -t raw - rate 32k |\ ../fdk-aac-dabplus/aac-enc-dabplus-zmq -i /dev/stdin \ - -b $BITRATE -f raw -a -o $DSTPORT + -r 32000 -b $BITRATE -f raw -a -o $DSTPORT fi diff --git a/examplemod.ini b/examplemod.ini index 66ee92c..f51b883 100644 --- a/examplemod.ini +++ b/examplemod.ini @@ -12,6 +12,8 @@ filename=/dev/stderr [input] transport=file source=/dev/stdin +;transport=zeromq +;source=tcp://mpb.li:9100 loop=0 [modulator] @@ -11,12 +11,12 @@ filename=/dev/stderr [input] transport=file -source=/home/bram/dab/mmbtools-aux/eti/funk.raw.eti +source=/home/bram/dab/mmbtools-aux/eti/csp.eti #source=/dev/stdin #transport=zeromq #source=tcp://localhost:8080 -loop=0 +loop=1 [modulator] ; Gain mode: 0=FIX, 1=MAX, 2=VAR @@ -40,14 +40,21 @@ filtertapsfile=filter/simplefiltertaps.txt [output] ; choose output: possible values: uhd, file -output=file +output=uhd [fileoutput] filename=/dev/null [uhdoutput] +;frequency=234208000 +channel=13C + +; For the B200 +;device=master_clock_rate=20480000,type=b200 +;txgain=40 + +; For the B100 device=master_clock_rate=32768000,type=b100 -frequency=234208000 txgain=2 ; possible values : internal, external, MIMO diff --git a/zmq-simul.mux b/zmq-simul.mux index 7759be7..784f481 100644 --- a/zmq-simul.mux +++ b/zmq-simul.mux @@ -27,7 +27,7 @@ ensemble { } services { - srv_fb { + srv-fb { label "FB" shortlabel "FB" pty 0 @@ -35,7 +35,7 @@ services { id 60 ; also supports id } - srv_label { + srv-label { label "label" id 40 ; also supports id @@ -46,7 +46,7 @@ services { ; supported types are : audio, bridge, data, enhancedpacket, ; dabplus, dmb, packet, test subchannels { - sub_fb { + sub-fb { type dabplus ; use ZeroMQ: inputfile "tcp://*:9000" @@ -55,7 +55,7 @@ subchannels { id 24 protection 3 } - sub_label { + sub-label { type audio inputfile "tcp://*:9001" nonblock false @@ -69,24 +69,24 @@ subchannels { 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-fb { + label "FBcomp" + shortlabel "FBcomp" + service srv-fb + subchannel sub-fb } - comp_label { + comp-label { label "label" - service srv_label - subchannel sub_label + service srv-label + subchannel sub-label } } ; A list of outputs, in the format -; unique_id "uri" +; unique-id "uri" outputs { - foobar "fifo:///dev/stdout?type=raw" + stdout "fifo:///dev/stdout?type=raw" ;zmq "zmq+tcp://*:8080" ; This throttles muxing down to nominal rate |