aboutsummaryrefslogtreecommitdiffstats
path: root/libDRCdec/include/FDK_drcDecLib.h
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2019-10-08 14:53:07 +0300
committerMartin Storsjo <martin@martin.st>2019-10-08 14:53:07 +0300
commite365f4f27802954f0cf65d3e2eac88b7fdebc83c (patch)
treed0ef656126c0ad2758164a0cf04136efccfe14c1 /libDRCdec/include/FDK_drcDecLib.h
parentd387d3b6ed79ff9a82c60440bdd86e6e5e324bec (diff)
parentd929f68a05f5cbdd812dca287c8115a39439acf1 (diff)
downloadfdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.tar.gz
fdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.tar.bz2
fdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.zip
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libDRCdec/include/FDK_drcDecLib.h')
-rw-r--r--libDRCdec/include/FDK_drcDecLib.h5
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,