summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2013-12-15 17:27:24 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2013-12-15 17:27:24 +0100
commit12db17002b48ce6dcf9acae7ea20fe4e69fbeae1 (patch)
treeafa0c388c594d9990bb48df3382036e37e42d030
parentd52cf07f7855c402d3d317e94b219f6ef34fe803 (diff)
downloadODR-AudioEnc-12db17002b48ce6dcf9acae7ea20fe4e69fbeae1.tar.gz
ODR-AudioEnc-12db17002b48ce6dcf9acae7ea20fe4e69fbeae1.tar.bz2
ODR-AudioEnc-12db17002b48ce6dcf9acae7ea20fe4e69fbeae1.zip
add DAB AOTs to getSbrSignalingMode
This makes bitrates 80kbps and below work again with fdk-aac-dabplus
-rw-r--r--libAACenc/src/aacenc_lib.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp
index 50218f5..edda485 100644
--- a/libAACenc/src/aacenc_lib.cpp
+++ b/libAACenc/src/aacenc_lib.cpp
@@ -369,7 +369,8 @@ static SBR_PS_SIGNALING getSbrSignalingMode(
}
if ((audioObjectType==AOT_AAC_LC) || (audioObjectType==AOT_SBR) || (audioObjectType==AOT_PS) ||
- (audioObjectType==AOT_MP2_AAC_LC) || (audioObjectType==AOT_MP2_SBR) || (audioObjectType==AOT_MP2_PS) ) {
+ (audioObjectType==AOT_MP2_AAC_LC) || (audioObjectType==AOT_MP2_SBR) || (audioObjectType==AOT_MP2_PS) ||
+ (audioObjectType==AOT_DABPLUS_SBR) || (audioObjectType==AOT_DABPLUS_PS) ) {
switch (transportType) {
case TT_MP4_ADIF:
case TT_MP4_ADTS:
@@ -769,7 +770,7 @@ INT aacEncoder_LimitBitrate(
FDK_ASSERT(bitRate > 0);
- fprintf(stderr, "aacEncoder_LimitBitrate(): bitRate=%d", bitRate);
+ fprintf(stderr, "aacEncoder_LimitBitrate(): bitRate=%d\n", bitRate);
return bitRate;
}
@@ -1039,7 +1040,7 @@ AACENC_ERROR FDKaacEnc_AdjustEncSettings(HANDLE_AACENCODER hAacEncoder,
hAacEncoder->metaDataAllowed = 0;
}
- fprintf(stderr, "hAacEncoder->metaDataAllowed=%d", hAacEncoder->metaDataAllowed);
+ fprintf(stderr, "hAacEncoder->metaDataAllowed=%d\n", hAacEncoder->metaDataAllowed);
return err;
}