diff options
| -rw-r--r-- | b200-sync.ini | 2 | ||||
| -rw-r--r-- | test.ini | 16 | ||||
| -rw-r--r-- | zmq-simul.mux | 10 | ||||
| -rw-r--r-- | zmqtest/zmq-sub/zmq-sub.c | 6 |
4 files changed, 18 insertions, 16 deletions
diff --git a/b200-sync.ini b/b200-sync.ini index 3cc01eb..6a996d5 100644 --- a/b200-sync.ini +++ b/b200-sync.ini @@ -1,4 +1,4 @@ -; Sample configuration file for CRC-DABMOD +; Sample configuration file for ODR-DabMod [remotecontrol] telnet=1 @@ -11,12 +11,12 @@ filename=/dev/stderr [input] transport=file -source=/home/bram/dab/mmbtools-aux/eti/csp.eti -;source=/dev/stdin +;source=/home/bram/dab/mmbtools-aux/eti/csp.eti +source=/dev/stdin ;transport=zeromq ;source=tcp://localhost:8080 -loop=1 +loop=0 [modulator] ; Gain mode: 0=FIX, 1=MAX, 2=VAR @@ -24,7 +24,7 @@ gainmode=2 ; Transmission mode ; If not defined, take the mode from ETI -;mode=2 +mode=1 ; Set to 0 to disable CicEqualiser dac_clk_rate=0 @@ -32,18 +32,18 @@ dac_clk_rate=0 digital_gain=1.0 ; Output sample rate -rate=3200000 +rate=8000000 [firfilter] -enabled=0 +enabled=1 filtertapsfile=filter/simplefiltertaps.txt [output] ; choose output: possible values: uhd, file -output=uhd +output=file [fileoutput] -filename=/dev/null +filename=/dev/stdout [uhdoutput] ;frequency=234208000 diff --git a/zmq-simul.mux b/zmq-simul.mux index d6b9f92..f4b73f4 100644 --- a/zmq-simul.mux +++ b/zmq-simul.mux @@ -54,10 +54,10 @@ subchannels { sub-fb { type dabplus ; use ZeroMQ: - inputfile "tcp://*:9000" + inputfile "tcp://*:9001" zmq-buffer 40 zmq-prebuffering 20 - bitrate 64 + bitrate 80 id 24 protection 3 @@ -68,7 +68,7 @@ subchannels { } sub-label { type audio - inputfile "tcp://*:9001" + inputfile "tcp://*:9002" zmq-buffer 40 zmq-prebuffering 20 bitrate 128 @@ -99,9 +99,9 @@ components { ; unique-id "uri" outputs { ;stdout "fifo:///dev/stdout?type=raw" - ;zmq "zmq+tcp://*:9100" + zmq "zmq+tcp://*:9100" ; This throttles muxing down to nominal rate throttle "simul://" - } + diff --git a/zmqtest/zmq-sub/zmq-sub.c b/zmqtest/zmq-sub/zmq-sub.c index ca3e468..22ba80a 100644 --- a/zmqtest/zmq-sub/zmq-sub.c +++ b/zmqtest/zmq-sub/zmq-sub.c @@ -56,12 +56,12 @@ void do_subscriber(const char* host, int port) memset(eti, 0x55, framelen); rc = zmq_recv(sock, &message, framelen, 0); - fprintf(stderr, "rc=%d \n", rc); - if (rc > 0 && message.version == 1) { uint8_t* buf = message.buf; for (int i = 0; i < NUM_FRAMES_PER_ZMQ_MESSAGE; i++) { + fprintf(stderr, "i=%d buflen=%d\n", i, message.buflen[i]); + memcpy(eti_p, buf, message.buflen[i]); eti_p += 6144; buf += message.buflen[i]; @@ -70,6 +70,8 @@ void do_subscriber(const char* host, int port) write(STDOUT_FILENO, eti, framelen); } else if (rc < 0) { + fprintf(stderr, "rc=%d \n", rc); + barf(); } } |