diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-09-09 14:07:55 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-09-10 20:35:45 +0200 |
| commit | d504da100d5af2577e34453ec591359df9baa926 (patch) | |
| tree | 949ceb353933517d57e0b233778dab5b9b1af1b5 /libAACenc | |
| parent | c89fb86cefb19ac9cf198c1e5cc31a85beab072e (diff) | |
| download | fdk-aac-d504da100d5af2577e34453ec591359df9baa926.tar.gz fdk-aac-d504da100d5af2577e34453ec591359df9baa926.tar.bz2 fdk-aac-d504da100d5af2577e34453ec591359df9baa926.zip | |
Add DAB+ AOTs again and remove AOT_MP2 from code
Diffstat (limited to 'libAACenc')
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index fe03f63..1037a36 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -327,7 +327,8 @@ static inline INT isSbrActive(const HANDLE_AACENC_CONFIG hAacConfig) { INT sbrUsed = 0; - if ( (hAacConfig->audioObjectType==AOT_SBR) || (hAacConfig->audioObjectType==AOT_PS) ) + if ( (hAacConfig->audioObjectType==AOT_SBR) || (hAacConfig->audioObjectType==AOT_PS) + || (hAacConfig->audioObjectType==AOT_DABPLUS_SBR) || (hAacConfig->audioObjectType==AOT_DABPLUS_PS) ) { sbrUsed = 1; } @@ -343,7 +344,8 @@ static inline INT isPsActive(const AUDIO_OBJECT_TYPE audioObjectType) { INT psUsed = 0; - if ( (audioObjectType==AOT_PS) ) + if ( (audioObjectType==AOT_PS) + || (audioObjectType==AOT_DABPLUS_PS) ) { psUsed = 1; } @@ -369,7 +371,6 @@ 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_DABPLUS_SBR) || (audioObjectType==AOT_DABPLUS_PS) ) { switch (transportType) { case TT_MP4_ADIF: @@ -429,16 +430,13 @@ static void FDKaacEnc_MapConfig( /* Map virtual aot to transport aot. */ switch (hAacConfig->audioObjectType) { case AOT_DABPLUS_AAC_LC: - case AOT_MP2_AAC_LC: transport_AOT = AOT_AAC_LC; break; case AOT_DABPLUS_SBR: - case AOT_MP2_SBR: transport_AOT = AOT_SBR; cc->flags |= CC_SBR; break; case AOT_DABPLUS_PS: - case AOT_MP2_PS: transport_AOT = AOT_PS; cc->flags |= CC_SBR; break; @@ -1848,21 +1846,18 @@ AACENC_ERROR aacEncoder_SetParam( case AOT_PS: case AOT_DRM_SBR: // Added mfeilen case AOT_DABPLUS_PS: - case AOT_MP2_PS: if (!(hAacEncoder->encoder_modis & (ENC_MODE_FLAG_PS))) { err = AACENC_INVALID_CONFIG; goto bail; } case AOT_SBR: case AOT_DABPLUS_SBR: - case AOT_MP2_SBR: if (!(hAacEncoder->encoder_modis & (ENC_MODE_FLAG_SBR))) { err = AACENC_INVALID_CONFIG; goto bail; } case AOT_AAC_LC: case AOT_DABPLUS_AAC_LC: - case AOT_MP2_AAC_LC: case AOT_ER_AAC_LD: case AOT_ER_AAC_ELD: if (!(hAacEncoder->encoder_modis & (ENC_MODE_FLAG_AAC))) { |