From 1e1e43d9bfa006049bde3d210030e5f0b2d38ca3 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Sat, 5 Nov 2016 16:34:40 +0100 Subject: Describe inputs a bit better in advanced.mux --- doc/advanced.mux | 32 ++++++++++++++++++++++++++++++-- src/input/File.h | 3 +++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/doc/advanced.mux b/doc/advanced.mux index 8d460d2..41a3446 100644 --- a/doc/advanced.mux +++ b/doc/advanced.mux @@ -130,8 +130,17 @@ services { } ; The subchannels are defined in the corresponding section. -; supported types are : audio, bridge, data, enhancedpacket, -; dabplus, dmb, packet, test +; supported types are : audio, data, enhancedpacket, +; dabplus, packet +; +; Type 'packet' expects to receive data in the format described +; in EN 300 401 Clause 3.5.2. +; +; 'enhancedpacket' mode will calculate FEC for MSC packet mode +; as described in EN 300 401 Clause 5.3.5. +; +; 'data' will read from the source and write it unmodified into +; the MSC. subchannels { sub-fu { type audio @@ -235,6 +244,25 @@ subchannels { zmq-buffer 40 zmq-prebuffering 20 } + + ; 'prbs' will generate a pseudorandom bit sequence according to + ; ETS 300 799 Clause G.2.1. This is useful for testing purposes and + ; measurement of bit error rate. + sub-prbs { + type data + + ; Use the default PRBS polynomial. + inputfile "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 + ; (1 << 20) + (1 << 17) + (1 << 0) = 0x120001 + ;inputuri "prbs://:0x120001 + + bitrate 16 + id 5 + protection 3 + } } ; For now, each component links one service to one subchannel diff --git a/src/input/File.h b/src/input/File.h index bf99748..080d6b5 100644 --- a/src/input/File.h +++ b/src/input/File.h @@ -79,6 +79,9 @@ class PacketFile : public FileBase { std::array m_packetData; size_t m_packetLength; + /* Enhanced packet mode enables FEC for MSC packet mode + * as described in EN 300 401 Clause 5.3.5 + */ bool m_enhancedPacketEnabled = false; std::array,12> m_enhancedPacketData; size_t m_enhancedPacketWaiting; -- cgit v1.2.3