diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-11-11 11:38:02 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-11-11 11:38:02 +0100 |
| commit | 0e5af65c467b2423a0b857ae3ad98c91acc1e190 (patch) | |
| tree | d07f69550d8886271e44fe79c4dcfb299cafbd38 /README.md | |
| parent | efe406d9724f959c8bc2a31802559ca6d41fd897 (diff) | |
| download | ODR-AudioEnc-0e5af65c467b2423a0b857ae3ad98c91acc1e190.tar.gz ODR-AudioEnc-0e5af65c467b2423a0b857ae3ad98c91acc1e190.tar.bz2 ODR-AudioEnc-0e5af65c467b2423a0b857ae3ad98c91acc1e190.zip | |
Include patched FDK-AAC in the repository
The initial idea was to get the DAB+ patch into upstream, but since
that follows the android source releases, there is no place for a custom
DAB+ patch there.
So instead of having to maintain a patched fdk-aac that has to have the
same .so version as the distribution package on which it is installed,
we prefer having a separate fdk-aac-dab library to avoid collision.
At that point, there's no reason to keep fdk-aac in a separate
repository, as odr-audioenc is the only tool that needs DAB+ encoding
support. Including it here simplifies installation, and makes it
consistent with toolame-dab, also shipped in this repository.
DAB+ decoding support (needed by ODR-SourceCompanion, dablin, etisnoop,
welle.io and others) can be done using upstream FDK-AAC.
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -6,8 +6,7 @@ ODR-mmbTools. 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. FDK-AAC has to be supplied separately, and is available -in the [repository](https://github.com/Opendigitalradio/fdk-aac.git). +DAB+ broadcast encoding. Both encoders are part of this repository. The main tool is the *odr-audioenc* encoder, which can read audio from a file (raw or wav), from an ALSA source, from JACK or using libVLC, @@ -36,7 +35,6 @@ Requirements ============ * A C++11 compiler -* [FDK-AAC](https://github.com/Opendigitalradio/fdk-aac.git) (already contains the DAB+ patches) * ZeroMQ 4.0.4 or more recent * JACK audio connection kit (optional) * The alsa libraries (libasound2, optional) @@ -282,8 +280,10 @@ The ODR-AudioEnc project contains - The code for odr-audioenc in src/ licensed under the Apache Licence v2.0. See http://www.apache.org/licenses/LICENSE-2.0 - libtoolame-dab, derived from TooLAME, licensed under LGPL v2.1 or later. See - libtoolame-dab/LGPL.txt. This is built into a shared library. + `libtoolame-dab/LGPL.txt`. This is built into a shared library. - EDI output (files in src/edi) are GPLv3+ + - The FDK-AAC encoder, patched for DAB+ support, licensed under the terms in + `fdk-aac/NOTICE`, built into a shared library. The odr-audioenc binary is linked against the libtoolame-dab and fdk-aac shared libraries. |