From 114f153e6c1bc71e9f0ffc47abbce2e2c3803eb3 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Fri, 9 Sep 2016 15:07:50 +0200 Subject: Remove some references to FDK --- src/VLCInput.h | 2 +- src/odr-audioencoder.cpp | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/VLCInput.h b/src/VLCInput.h index da4b7ae..1d01d66 100644 --- a/src/VLCInput.h +++ b/src/VLCInput.h @@ -202,7 +202,7 @@ class VLCInput /* The thread running process takes samples from m_queue and writes * them into m_samplequeue. This decouples m_queue from m_samplequeue - * which is directly used by dabplus-enc.cpp + * which is directly used by odr-audioencoder.cpp */ void process(); diff --git a/src/odr-audioencoder.cpp b/src/odr-audioencoder.cpp index d98df64..80b7ae6 100644 --- a/src/odr-audioencoder.cpp +++ b/src/odr-audioencoder.cpp @@ -18,10 +18,10 @@ */ /*! \mainpage Introduction - * The ODR-mmbTools FDK-AAC-DABplus Audio encoder can encode audio for + * The ODR-mmbTools ODR-AudioEncoder Audio encoder can encode audio for * ODR-DabMux, both DAB and DAB+. The DAB encoder is based on toolame. The - * DAB+ encoder uses a modified library of the Fraunhofer FDK AAC code from - * Android, patched for 960-transform to do DAB+ broadcast encoding. + * DAB+ encoder requires a the Fraunhofer FDK AAC library, with the + * necessary patches for 960-transform to do DAB+ broadcast encoding. * * This document describes some internals of the encoder, and is intended * to help developers understand and improve the software package. @@ -101,10 +101,7 @@ using namespace std; void usage(const char* name) { fprintf(stderr, "ODR-AudioEncoder %s is an audio encoder for both DAB and DAB+.\n" - "The DAB+ HE-AACv2 encoder is based on a Thirt-Party Modified\n" - "Version of the Fraunhofer FDK AAC Codec Library for Android,\n" - "and the DAB encoder is using the tooLAME MPEG\n" - "encoder sources. The encoder can read from JACK, ALSA or\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" "\n" -- cgit v1.2.3