diff options
| author | Xin Li <delphij@google.com> | 2019-09-05 16:53:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-05 16:53:26 +0000 |
| commit | d929f68a05f5cbdd812dca287c8115a39439acf1 (patch) | |
| tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /libDRCdec/include/FDK_drcDecLib.h | |
| parent | c2eb64586d6dfc0f067ea66631b38d1922a106ed (diff) | |
| parent | a209adb315f970aa97044a82551a6f5617d61ded (diff) | |
| download | fdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.tar.gz fdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.tar.bz2 fdk-aac-d929f68a05f5cbdd812dca287c8115a39439acf1.zip | |
Merge "DO NOT MERGE - Merge Android 10 into master"
Diffstat (limited to 'libDRCdec/include/FDK_drcDecLib.h')
| -rw-r--r-- | libDRCdec/include/FDK_drcDecLib.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libDRCdec/include/FDK_drcDecLib.h b/libDRCdec/include/FDK_drcDecLib.h index e187e18..2d28d23 100644 --- a/libDRCdec/include/FDK_drcDecLib.h +++ b/libDRCdec/include/FDK_drcDecLib.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 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -134,6 +134,7 @@ typedef enum { DRC_DEC_EFFECT_TYPE, DRC_DEC_EFFECT_TYPE_FALLBACK_CODE, DRC_DEC_LOUDNESS_MEASUREMENT_METHOD, + DRC_DEC_ALBUM_MODE, /* set only system (not user) parameters */ DRC_DEC_DOWNMIX_ID, DRC_DEC_TARGET_CHANNEL_COUNT_REQUESTED, /**< number of output channels @@ -141,6 +142,8 @@ typedef enum { choosing an appropriate downmixInstruction */ DRC_DEC_BASE_CHANNEL_COUNT, + DRC_DEC_FRAME_SIZE, + DRC_DEC_SAMPLE_RATE, /* get only system parameters */ DRC_DEC_IS_MULTIBAND_DRC_1, DRC_DEC_IS_MULTIBAND_DRC_2, |