diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-08 16:10:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-08 16:10:59 +0000 |
| commit | 31529975883fb1ccce9f4e5692f56eb403cf9e74 (patch) | |
| tree | 3907998d7ca9d6c2d05884d11a266df6351434c8 /libAACenc/src/aacenc.h | |
| parent | b831187d3a47f3cbe5d0060f4f064621eb484efd (diff) | |
| parent | 5d8224586cdab3e96647a2fa7243ec5110b2146a (diff) | |
| download | fdk-aac-31529975883fb1ccce9f4e5692f56eb403cf9e74.tar.gz fdk-aac-31529975883fb1ccce9f4e5692f56eb403cf9e74.tar.bz2 fdk-aac-31529975883fb1ccce9f4e5692f56eb403cf9e74.zip | |
Merge "Adjust VBR mode depending on given peak bitrate and fix crash recovery usage." am: 5d8224586c
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1542709
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I676c98594c21af87992da5e4286d8c83f6a11098
Diffstat (limited to 'libAACenc/src/aacenc.h')
| -rw-r--r-- | libAACenc/src/aacenc.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libAACenc/src/aacenc.h b/libAACenc/src/aacenc.h index 0e0d8c1..b7e0ef2 100644 --- a/libAACenc/src/aacenc.h +++ b/libAACenc/src/aacenc.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -335,6 +335,19 @@ INT FDKaacEnc_GetVBRBitrate(AACENC_BITRATE_MODE bitrateMode, /*----------------------------------------------------------------------------- + functionname: FDKaacEnc_AdjustVBRBitrateMode + description: Adjust bitrate mode to given bitrate parameter + input params: int vbrQuality (VBR0, VBR1, VBR2) + bitrate + channelMode + returns: vbr bitrate mode + + ------------------------------------------------------------------------------*/ +AACENC_BITRATE_MODE FDKaacEnc_AdjustVBRBitrateMode( + AACENC_BITRATE_MODE bitrateMode, INT bitrate, CHANNEL_MODE channelMode); + +/*----------------------------------------------------------------------------- + functionname: FDKaacEnc_AacInitDefaultConfig description: gives reasonable default configuration returns: --- |