diff options
| author | Xin Li <delphij@google.com> | 2019-07-01 20:59:18 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-07-01 20:59:18 +0000 |
| commit | 4d56b880e2d129757bd0855859da83cad0399965 (patch) | |
| tree | fa62c4f58bc140ba5c0a27e2c913d3ea0a5bfe98 /libDRCdec/include/FDK_drcDecLib.h | |
| parent | c10b5daa8da7e059eeaebbe7ac22c9635a6af26d (diff) | |
| parent | 058d1295f4d9e3418eafb1fd7c92602000ff5c53 (diff) | |
| download | fdk-aac-4d56b880e2d129757bd0855859da83cad0399965.tar.gz fdk-aac-4d56b880e2d129757bd0855859da83cad0399965.tar.bz2 fdk-aac-4d56b880e2d129757bd0855859da83cad0399965.zip | |
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I30ab93ed5c2fa3c47306058d1a0f749b8101b01e
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, |