diff options
| author | Martin Storsjo <martin@martin.st> | 2012-11-01 11:08:03 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-11-01 11:08:03 +0200 |
| commit | 54dfe1ec6972ca0d56dcb671448f84fea5e37e35 (patch) | |
| tree | 5d26aa077f3aa32d3e5113546abc5a4219332640 /libAACenc/src/aacenc.cpp | |
| parent | fea3c1d0ffaf5975bb15462e11edf9c7a664890d (diff) | |
| parent | 6ab36997af5d5acda4f21d33031f4e45c85f96b7 (diff) | |
| download | fdk-aac-54dfe1ec6972ca0d56dcb671448f84fea5e37e35.tar.gz fdk-aac-54dfe1ec6972ca0d56dcb671448f84fea5e37e35.tar.bz2 fdk-aac-54dfe1ec6972ca0d56dcb671448f84fea5e37e35.zip | |
Merge remote-tracking branch 'aosp/jb-mr1-release' into master
Conflicts:
libAACenc/src/band_nrg.cpp
libAACenc/src/grp_data.cpp
libSBRenc/src/env_est.cpp
Diffstat (limited to 'libAACenc/src/aacenc.cpp')
| -rw-r--r-- | libAACenc/src/aacenc.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libAACenc/src/aacenc.cpp b/libAACenc/src/aacenc.cpp index 85083cd..d3f36aa 100644 --- a/libAACenc/src/aacenc.cpp +++ b/libAACenc/src/aacenc.cpp @@ -149,7 +149,7 @@ INT FDKaacEnc_LimitBitrate( transportBits = 208; } - bitRate = FDKmax(bitRate, ((((40 * nChannels) + transportBits + frameLength) * (coreSamplingRate)) / frameLength) ); + bitRate = FDKmax(bitRate, ((((40 * nChannels) + transportBits) * (coreSamplingRate)) / frameLength) ); FDK_ASSERT(bitRate >= 0); bitRate = FDKmin(bitRate, ((nChannelsEff * MIN_BUFSIZE_PER_EFF_CHAN)*(coreSamplingRate>>shift)) / (frameLength>>shift)) ; @@ -280,7 +280,7 @@ void FDKaacEnc_AacInitDefaultConfig(AACENC_CONFIG *config) config->useTns = TNS_ENABLE_MASK; /* tns enabled completly */ config->usePns = 1; /* depending on channelBitrate this might be set to 0 later */ config->useIS = 1; /* Intensity Stereo Configuration */ - config->framelength = DEFAULT_FRAMELENGTH; /* used frame size */ + config->framelength = -1; /* Framesize not configured */ config->syntaxFlags = 0; /* default syntax with no specialities */ config->epConfig = -1; /* no ER syntax -> no additional error protection */ config->nSubFrames = 1; /* default, no sub frames */ @@ -451,11 +451,8 @@ AAC_ENCODER_ERROR FDKaacEnc_Initialize(HANDLE_AAC_ENC hAacEnc, switch (config->framelength) { case 1024: - if ( config->audioObjectType != AOT_AAC_LC - && config->audioObjectType != AOT_SBR - && config->audioObjectType != AOT_PS - && config->audioObjectType != AOT_ER_AAC_LC - && config->audioObjectType != AOT_AAC_SCAL ) + if ( config->audioObjectType == AOT_ER_AAC_LD + || config->audioObjectType == AOT_ER_AAC_ELD ) { return AAC_ENC_INVALID_FRAME_LENGTH; } |