diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-12-14 17:32:17 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2018-09-12 14:20:53 +0200 |
| commit | bdfafd471e3c7c240b5c78e8d1233ce61f17c296 (patch) | |
| tree | 4cff9d116268d3941bd328e606c15f0ee8d3a6df /libSBRenc/src | |
| parent | 651ff34d8d35fb6a3b75471d54b271852f5924cc (diff) | |
| download | fdk-aac-bdfafd471e3c7c240b5c78e8d1233ce61f17c296.tar.gz fdk-aac-bdfafd471e3c7c240b5c78e8d1233ce61f17c296.tar.bz2 fdk-aac-bdfafd471e3c7c240b5c78e8d1233ce61f17c296.zip | |
Add DAB+ support
Diffstat (limited to 'libSBRenc/src')
| -rw-r--r-- | libSBRenc/src/env_est.cpp | 1 | ||||
| -rw-r--r-- | libSBRenc/src/sbr_encoder.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libSBRenc/src/env_est.cpp b/libSBRenc/src/env_est.cpp index 0eb8425..4af561b 100644 --- a/libSBRenc/src/env_est.cpp +++ b/libSBRenc/src/env_est.cpp @@ -1151,6 +1151,7 @@ void FDKsbrEnc_extractSbrEnvelope2( SBR_STEREO_MODE stereoMode = h_con->stereoMode; int nChannels = h_con->nChannels; + FDK_ASSERT(nChannels <= MAX_NUM_CHANNELS); const int *v_tuning; static const int v_tuningHEAAC[6] = {0, 2, 4, 0, 0, 0}; diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp index df9e996..26257a1 100644 --- a/libSBRenc/src/sbr_encoder.cpp +++ b/libSBRenc/src/sbr_encoder.cpp @@ -2096,7 +2096,7 @@ INT sbrEncoder_Init(HANDLE_SBR_ENCODER hSbrEncoder, *downSampleFactor = 2; } - if (aot == AOT_PS) { + if (aot == AOT_PS || aot == AOT_DABPLUS_PS) { usePs = 1; } if (aot == AOT_ER_AAC_ELD) { |