summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2013-12-14 18:17:31 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2013-12-14 18:17:31 +0100
commit8ef2e966cc8e07bb1d0c242070f7226e42776605 (patch)
treed61afc824047f2a85a66529e638454450f24c7c0
parent72b69beb5b1c2b26773649ca2f24dd0531d9c9a7 (diff)
downloadfdk-aac-8ef2e966cc8e07bb1d0c242070f7226e42776605.tar.gz
fdk-aac-8ef2e966cc8e07bb1d0c242070f7226e42776605.tar.bz2
fdk-aac-8ef2e966cc8e07bb1d0c242070f7226e42776605.zip
remove old call to aacEncoder_LimitBitrate
-rw-r--r--libAACenc/src/aacenc_lib.cpp17
1 files changed, 2 insertions, 15 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp
index b88a22c..50218f5 100644
--- a/libAACenc/src/aacenc_lib.cpp
+++ b/libAACenc/src/aacenc_lib.cpp
@@ -879,21 +879,6 @@ AACENC_ERROR FDKaacEnc_AdjustEncSettings(HANDLE_AACENCODER hAacEncoder,
break;
}
- /* We need the frame length to call aacEncoder_LimitBitrate() */
- fprintf(stderr, "##### WARNING ##### REMOVE ME");
- fprintf(stderr, "config->userBitrate=%d\n", config->userBitrate);
- hAacConfig->bitRate = aacEncoder_LimitBitrate(
- NULL,
- hAacConfig->sampleRate,
- hAacConfig->framelength,
- hAacConfig->nChannels,
- hAacConfig->channelMode,
- config->userBitrate,
- hAacConfig->nSubFrames,
- isSbrActive(hAacConfig),
- hAacConfig->audioObjectType
- );
- fprintf(stderr, "hAacConfig->bitRate=%d\n", hAacConfig->bitRate);
switch ( hAacConfig->audioObjectType ) {
case AOT_ER_AAC_LD:
@@ -995,6 +980,7 @@ AACENC_ERROR FDKaacEnc_AdjustEncSettings(HANDLE_AACENCODER hAacEncoder,
+ fprintf(stderr, "config->userBitrate=%d\n", config->userBitrate);
/* We need the frame length to call aacEncoder_LimitBitrate() */
hAacConfig->bitRate = aacEncoder_LimitBitrate(
NULL,
@@ -1008,6 +994,7 @@ AACENC_ERROR FDKaacEnc_AdjustEncSettings(HANDLE_AACENCODER hAacEncoder,
hAacConfig->sbrRatio,
hAacConfig->audioObjectType
);
+ fprintf(stderr, "hAacConfig->bitRate=%d\n", hAacConfig->bitRate);
/* Configure PNS */
if ( ((hAacConfig->bitrateMode>=1) && (hAacConfig->bitrateMode<=5)) /* VBR without PNS. */