aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-07-24 10:49:04 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-07-24 10:51:40 +0200
commit7103e8b88ef48d29761cd18ed681a034281a5de5 (patch)
tree8cfc8b3ada70b1bdc4e40214a6923ca362f35eaf
parente0b0d0fb65c4ee99e2b8c61ae9adbc18504342e0 (diff)
downloadODR-AudioEnc-7103e8b88ef48d29761cd18ed681a034281a5de5.tar.gz
ODR-AudioEnc-7103e8b88ef48d29761cd18ed681a034281a5de5.tar.bz2
ODR-AudioEnc-7103e8b88ef48d29761cd18ed681a034281a5de5.zip
Improve usage screen, remove experimental mention
-rw-r--r--README.md2
-rw-r--r--src/odr-audioenc.cpp18
2 files changed, 11 insertions, 9 deletions
diff --git a/README.md b/README.md
index f74c0b1..8c90d54 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ and encode to a file, a pipe, or to a ZeroMQ output compatible with ODR-DabMux.
The libVLC input allows the encoder to use all inputs supported by VLC, and
therefore also webstreams and other network sources.
-The ALSA and libVLC inputs support experimental sound card clock drift
+The ALSA and libVLC inputs support sound card clock drift
compensation, that can compensate for imprecise sound card clocks.
The JACK input does not automatically connect to anything. The encoder runs
diff --git a/src/odr-audioenc.cpp b/src/odr-audioenc.cpp
index 1101c71..8fff655 100644
--- a/src/odr-audioenc.cpp
+++ b/src/odr-audioenc.cpp
@@ -98,28 +98,30 @@ enum class encoder_selection_t {
using namespace std;
-void usage(const char* name) {
+void usage(const char* name)
+{
fprintf(stderr,
"ODR-AudioEnc %s is an audio encoder for both DAB and DAB+.\n"
"The encoder can read from JACK, ALSA or\n"
"a file source and encode to a ZeroMQ output for ODR-DabMux.\n"
- "(Experimental!)It can also use libvlc as an input.\n"
+ "It can also use libvlc as an input.\n"
"\n"
- "The -D option enables experimental sound card clock drift compensation.\n"
+ "The -D option enables sound card clock drift compensation.\n"
"A consumer sound card has a clock that is always a bit imprecise, and\n"
- "would drift off after some time. ODR-DabMux cannot handle such drift\n"
- "because it would have to throw away or insert a full DAB+ superframe,\n"
+ "would drift off slowly. ODR-DabMux cannot handle such drift\n"
+ "because it would have to throw away or insert complete encoded audio frames,\n"
"which would create audible artifacts. This drift compensation can\n"
"make sure that the encoding rate is correct by inserting or deleting\n"
- "audio samples. It can be used for both ALSA and VLC inputs.\n"
+ "audio samples. It can be used for both ALSA and VLC inputs and requires\n"
+ "a system clock synchronised using NTP.\n"
"\n"
"When this option is enabled, you will see U and O printed in the\n"
"console. These correspond to audio underruns and overruns caused\n"
"by sound card clock drift. When sparse, they should not create audible\n"
"artifacts.\n"
"\n"
- "This encoder includes PAD (DLS and MOT Slideshow) support by\n"
- "http://rd.csp.it to be used with mot-encoder\n"
+ "This encoder is able to insert PAD (DLS and MOT Slideshow)\n"
+ "generated by ODR-PadEnc.\n"
"\nUsage:\n"
"%s [INPUT SELECTION] [OPTION...]\n",
#if defined(GITVERSION)