diff options
| author | Martin Storsjo <martin@martin.st> | 2021-01-14 15:38:20 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2021-01-14 15:38:20 +0200 |
| commit | a52114dd6953ec21520cd92fd36739bc8498e86f (patch) | |
| tree | 0f7d6063743452f37217ca70afeb6f1f7798d7ee /libAACenc/src/aacenc_lib.cpp | |
| parent | d75500444a76f6aef8a8ff35620118de84cce65f (diff) | |
| parent | 093573a63431efe273b97c8fba0fbfb57737403c (diff) | |
| download | fdk-aac-a52114dd6953ec21520cd92fd36739bc8498e86f.tar.gz fdk-aac-a52114dd6953ec21520cd92fd36739bc8498e86f.tar.bz2 fdk-aac-a52114dd6953ec21520cd92fd36739bc8498e86f.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libAACenc/src/aacenc_lib.cpp')
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index d2cb801..0df12f2 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -1028,6 +1028,13 @@ static AACENC_ERROR FDKaacEnc_AdjustEncSettings(HANDLE_AACENCODER hAacEncoder, case AACENC_BR_MODE_VBR_3: case AACENC_BR_MODE_VBR_4: case AACENC_BR_MODE_VBR_5: + /* Adjust bitrate mode in case given peak bitrate is lower than expected + * VBR bitrate. */ + if ((INT)config->userPeakBitrate != -1) { + hAacConfig->bitrateMode = FDKaacEnc_AdjustVBRBitrateMode( + hAacConfig->bitrateMode, config->userPeakBitrate, + hAacConfig->channelMode); + } /* Get bitrate in VBR configuration */ /* In VBR mode; SBR-modul depends on bitrate, core encoder on bitrateMode. */ |