summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2014-05-16 10:28:23 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2014-05-16 10:28:23 +0200
commitc4b00bc2b2763fe32874e5893daf940ffb7f4434 (patch)
treeb27c9b5aec79863fc1ed0c5c937b83ea0df65419
parentbb697e902b19a25a8f84de2ff0ade2f601303352 (diff)
downloadODR-AudioEnc-c4b00bc2b2763fe32874e5893daf940ffb7f4434.tar.gz
ODR-AudioEnc-c4b00bc2b2763fe32874e5893daf940ffb7f4434.tar.bz2
ODR-AudioEnc-c4b00bc2b2763fe32874e5893daf940ffb7f4434.zip
Prepare bugfix release v0.4.2v0.4.2
-rw-r--r--ChangeLog5
-rw-r--r--README.md13
-rw-r--r--configure.ac2
3 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0117e65..59c935e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-16: Matthias P. Braendli <matthias@mpb.li>
+ (v0.4.2):
+ Fix INTERNAL ERROR when the encoder was configured
+ in AAC-LC (bitrates above 80kbps)
+ Add --sbr --aaclc and --ps options to force AOT
2014-05-14: Matthias P. Braendli <matthias@mpb.li>
(v0.4.1):
Bugfix release for the file output that
diff --git a/README.md b/README.md
index 87abc43..c1ccff2 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,19 @@ input on port 9000.
DST="tcp://yourserver:9000"
BITRATE=64
+AAC encoder confiugration
+-------------------------
+
+By default, when not overridden by the --aaclc, --sbr or --ps options,
+the encoder is configured according to bitrate and number of channels.
+
+If only one channel is used, SBR (Spectral-Band Replication, also called
+HE-AAC) is enabled up to 64kbps. AAC-LC is used for higher bitrates.
+
+If two channels are used, PS (Parametric Stereo, also called HE-AAC v2)
+is enabled up to 48kbps. Between 56kbps and 80kbps, SBR is enabled. 88kbps
+and higher are using AAC-LC.
+
Scenario 1
----------
diff --git a/configure.ac b/configure.ac
index 03d7a47..9974dc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl -*- Autoconf -*-
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([fdk-aac-dabplus], [0.4.1], [http://opendigitalradio.org/])
+AC_INIT([fdk-aac-dabplus], [0.4.2], [http://opendigitalradio.org/])
AC_CONFIG_AUX_DIR(.)
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([tar-ustar foreign])