From 9681416e87a65bcc0bdadb6f2a9dcc2e687f4858 Mon Sep 17 00:00:00 2001 From: andimik Date: Tue, 6 Apr 2021 21:29:11 +0200 Subject: Usage added in Readme - copied usage from `etisnoop --help` text - mentioned XPADexpert - some hints regarding N (subchannel) and naming convention for output - described what ETI is (link to wiki) --- README.md | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a69cbb7..a855573 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ETISnoop analyser ================= -The ETISnoop analyser decodes a RAW ETI file and prints out +The ETISnoop analyser decodes a RAW ETI (see https://wiki.opendigitalradio.org/Ensemble_Transport_Interface ) file and prints out its contents in YAML for easier analysis. It can show information about the signalling, details about the FIGs, @@ -20,6 +20,36 @@ Then do ./configure make sudo make install + + +Usage +----- + +``` +etisnoop [options] [(-i|-I) filename] + + -i the file contains RAW ETI + -I the file contains FIC + -v increase verbosity (can be given more than once) + -d N decode subchannel N into stream-N.msc file + if DAB+: decode audio to stream-N.wav file and extract PAD to stream-N.msc + -s + statistics mode: decode all subchannels and measure audio level, write statistics to file + -n N stop analysing after N ETI frames + -f analyse FIC carousel (no YAML output) + -r analyse FIG rates in FIGs per second + -R analyse FIG rates in frames per FIG + -w decode CRC-DABMUX and ODR-DabMux watermark. + -e decode frames with SYNC error and decode FIGs with invalid CRC + -F / + add FIG type/ext to list of FIGs to display. + if the option is not given, all FIGs are displayed. +``` + +You can open the stream-N.msc file in https://www.basicmaster.de/xpadxpert/ +(remark: in case of DAB please rename the .msc to .mp2) + +Hint: subchannel N means the (N+1)th subchannel in a mux (including data subchannels!) About ----- -- cgit v1.2.3 From f1e452b6ad9db7d68d3fa0a0d8a1eeca3e978b38 Mon Sep 17 00:00:00 2001 From: andimik Date: Tue, 6 Apr 2021 21:33:30 +0200 Subject: option -d help text --- src/etisnoop.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/etisnoop.cpp b/src/etisnoop.cpp index 45f4f9e..5f9e2c2 100644 --- a/src/etisnoop.cpp +++ b/src/etisnoop.cpp @@ -94,7 +94,8 @@ void usage(void) " -i the file contains RAW ETI\n" " -I the file contains FIC\n" " -v increase verbosity (can be given more than once)\n" - " -d N decode subchannel N into .msc file and if DAB+, decode to .wav file\n" + " -d N decode subchannel N into stream-N.msc file\n" + " if DAB+: decode audio to stream-N.wav file and extract PAD to stream-N.msc\n" " -s \n" " statistics mode: decode all subchannels and measure audio level, write statistics to file\n" " -n N stop analysing after N ETI frames\n" -- cgit v1.2.3 From 3e04686157ed9e648b49a26c91dfbe9786225cc3 Mon Sep 17 00:00:00 2001 From: andimik Date: Tue, 6 Apr 2021 21:37:45 +0200 Subject: changed extension from .msc to .dab otherwise XPADxpert detects the .msc as DAB+ without RS code see https://user-images.githubusercontent.com/24510556/111703624-372d5600-883e-11eb-94cf-b78ddf60e4d4.png --- src/dabplussnoop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dabplussnoop.cpp b/src/dabplussnoop.cpp index 2f28982..b064d11 100644 --- a/src/dabplussnoop.cpp +++ b/src/dabplussnoop.cpp @@ -338,7 +338,7 @@ void StreamSnoop::push(uint8_t* streamdata, size_t streamsize) // First dump to subchannel file (superframe+parity word) if (m_dump_to_file and m_raw_data_stream_fd == nullptr) { stringstream dump_filename; - dump_filename << "stream-" << m_index << ".msc"; + dump_filename << "stream-" << m_index << ".dab"; m_raw_data_stream_fd = fopen(dump_filename.str().c_str(), "w"); -- cgit v1.2.3 From 90b45d0a8ac88e03c9792eaaba5ec0c882484bf5 Mon Sep 17 00:00:00 2001 From: andimik Date: Tue, 6 Apr 2021 21:46:24 +0200 Subject: changed msc to dab in README --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a855573..2179371 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,9 @@ etisnoop [options] [(-i|-I) filename] -i the file contains RAW ETI -I the file contains FIC -v increase verbosity (can be given more than once) - -d N decode subchannel N into stream-N.msc file - if DAB+: decode audio to stream-N.wav file and extract PAD to stream-N.msc + -d N decode subchannel N into stream-N.dab file + if DAB+: decode audio to stream-N.wav file and extract PAD to stream-N.dab + (superframes with RS coding) -s statistics mode: decode all subchannels and measure audio level, write statistics to file -n N stop analysing after N ETI frames @@ -46,8 +47,8 @@ etisnoop [options] [(-i|-I) filename] if the option is not given, all FIGs are displayed. ``` -You can open the stream-N.msc file in https://www.basicmaster.de/xpadxpert/ -(remark: in case of DAB please rename the .msc to .mp2) +You can open the stream-N.dab file in https://www.basicmaster.de/xpadxpert/ +(remark: in case of DAB please rename the .dab to .mp2) Hint: subchannel N means the (N+1)th subchannel in a mux (including data subchannels!) -- cgit v1.2.3 From 9d950a4a44f276aa956972439fdfce5a0cec28fc Mon Sep 17 00:00:00 2001 From: andimik Date: Tue, 6 Apr 2021 21:49:42 +0200 Subject: changed .msc to .dab --- src/etisnoop.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/etisnoop.cpp b/src/etisnoop.cpp index 5f9e2c2..d727146 100644 --- a/src/etisnoop.cpp +++ b/src/etisnoop.cpp @@ -94,8 +94,9 @@ void usage(void) " -i the file contains RAW ETI\n" " -I the file contains FIC\n" " -v increase verbosity (can be given more than once)\n" - " -d N decode subchannel N into stream-N.msc file\n" - " if DAB+: decode audio to stream-N.wav file and extract PAD to stream-N.msc\n" + " -d N decode subchannel N into stream-N.dab file\n" + " if DAB+: decode audio to stream-N.wav file and extract PAD to stream-N.dab\n" + " (superframes with RS coding)\n" " -s \n" " statistics mode: decode all subchannels and measure audio level, write statistics to file\n" " -n N stop analysing after N ETI frames\n" -- cgit v1.2.3 From 0136ed44ee5ea07d7bacd36c78bfe8977a44d5ef Mon Sep 17 00:00:00 2001 From: andimik Date: Tue, 6 Apr 2021 23:11:36 +0200 Subject: yamlexample.py for Ubuntu 20.04 hint --- yamlexample.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yamlexample.py b/yamlexample.py index 7001b23..6bd73e1 100755 --- a/yamlexample.py +++ b/yamlexample.py @@ -3,6 +3,9 @@ # An example on how to read the YAML output from etisnoop # Pipe etisnoop to this script # +# On Ubuntu 20.04+ install the following package: +# `sudo apt install python-is-python3` +# # License: public domain import sys -- cgit v1.2.3