aboutsummaryrefslogtreecommitdiffstats
path: root/fdk-aac/libAACdec
diff options
context:
space:
mode:
Diffstat (limited to 'fdk-aac/libAACdec')
-rw-r--r--fdk-aac/libAACdec/include/aacdecoder_lib.h111
-rw-r--r--fdk-aac/libAACdec/src/aacdec_drc.cpp6
-rw-r--r--fdk-aac/libAACdec/src/aacdec_hcr.cpp3
-rw-r--r--fdk-aac/libAACdec/src/aacdecoder.cpp5
-rw-r--r--fdk-aac/libAACdec/src/aacdecoder_lib.cpp22
-rw-r--r--fdk-aac/libAACdec/src/usacdec_lpd.cpp2
6 files changed, 91 insertions, 58 deletions
diff --git a/fdk-aac/libAACdec/include/aacdecoder_lib.h b/fdk-aac/libAACdec/include/aacdecoder_lib.h
index 5f0dd02..2dfc65a 100644
--- a/fdk-aac/libAACdec/include/aacdecoder_lib.h
+++ b/fdk-aac/libAACdec/include/aacdecoder_lib.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
@@ -459,8 +459,8 @@ Where N equals to CStreamInfo::frameSize .
#include "genericStds.h"
#define AACDECODER_LIB_VL0 3
-#define AACDECODER_LIB_VL1 0
-#define AACDECODER_LIB_VL2 0
+#define AACDECODER_LIB_VL1 1
+#define AACDECODER_LIB_VL2 2
/**
* \brief AAC decoder error codes.
@@ -746,66 +746,77 @@ typedef enum {
::CONCEAL_INTER. only some AOTs are
supported). \n */
AAC_DRC_BOOST_FACTOR =
- 0x0200, /*!< Dynamic Range Control: Scaling factor for boosting gain
- values. Defines how the boosting DRC factors (conveyed in the
- bitstream) will be applied to the decoded signal. The valid
- values range from 0 (don't apply boost factors) to 127 (fully
- apply boost factors). Default value is 0. */
- AAC_DRC_ATTENUATION_FACTOR =
- 0x0201, /*!< Dynamic Range Control: Scaling factor for attenuating gain
- values. Same as
- ::AAC_DRC_BOOST_FACTOR but for attenuating DRC factors. */
+ 0x0200, /*!< MPEG-4 / MPEG-D Dynamic Range Control (DRC): Scaling factor
+ for boosting gain values. Defines how the boosting DRC factors
+ (conveyed in the bitstream) will be applied to the decoded
+ signal. The valid values range from 0 (don't apply boost
+ factors) to 127 (fully apply boost factors). Default value is 0
+ for MPEG-4 DRC and 127 for MPEG-D DRC. */
+ AAC_DRC_ATTENUATION_FACTOR = 0x0201, /*!< MPEG-4 / MPEG-D DRC: Scaling factor
+ for attenuating gain values. Same as
+ ::AAC_DRC_BOOST_FACTOR but for
+ attenuating DRC factors. */
AAC_DRC_REFERENCE_LEVEL =
- 0x0202, /*!< Dynamic Range Control (DRC): Target reference level. Defines
- the level below full-scale (quantized in steps of 0.25dB) to
- which the output audio signal will be normalized to by the DRC
- module. The parameter controls loudness normalization for both
- MPEG-4 DRC and MPEG-D DRC. The valid values range from 40 (-10
- dBFS) to 127 (-31.75 dBFS). Any value smaller than 0 switches
- off loudness normalization and MPEG-4 DRC. By default, loudness
- normalization and MPEG-4 DRC is switched off. */
+ 0x0202, /*!< MPEG-4 / MPEG-D DRC: Target reference level / decoder target
+ loudness.\n Defines the level below full-scale (quantized in
+ steps of 0.25dB) to which the output audio signal will be
+ normalized to by the DRC module.\n The parameter controls
+ loudness normalization for both MPEG-4 DRC and MPEG-D DRC. The
+ valid values range from 40 (-10 dBFS) to 127 (-31.75 dBFS).\n
+ Example values:\n
+ 124 (-31 dBFS) for audio/video receivers (AVR) or other
+ devices allowing audio playback with high dynamic range,\n 96
+ (-24 dBFS) for TV sets or equivalent devices (default),\n 64
+ (-16 dBFS) for mobile devices where the dynamic range of audio
+ playback is restricted.\n Any value smaller than 0 switches off
+ loudness normalization and MPEG-4 DRC. */
AAC_DRC_HEAVY_COMPRESSION =
- 0x0203, /*!< Dynamic Range Control: En-/Disable DVB specific heavy
- compression (aka RF mode). If set to 1, the decoder will apply
- the compression values from the DVB specific ancillary data
- field. At the same time the MPEG-4 Dynamic Range Control tool
- will be disabled. By default, heavy compression is disabled. */
+ 0x0203, /*!< MPEG-4 DRC: En-/Disable DVB specific heavy compression (aka
+ RF mode). If set to 1, the decoder will apply the compression
+ values from the DVB specific ancillary data field. At the same
+ time the MPEG-4 Dynamic Range Control tool will be disabled. By
+ default, heavy compression is disabled. */
AAC_DRC_DEFAULT_PRESENTATION_MODE =
- 0x0204, /*!< Dynamic Range Control: Default presentation mode (DRC
- parameter handling). \n Defines the handling of the DRC
- parameters boost factor, attenuation factor and heavy
- compression, if no presentation mode is indicated in the
- bitstream.\n For options, see
- ::AAC_DRC_DEFAULT_PRESENTATION_MODE_OPTIONS.\n Default:
+ 0x0204, /*!< MPEG-4 DRC: Default presentation mode (DRC parameter
+ handling). \n Defines the handling of the DRC parameters boost
+ factor, attenuation factor and heavy compression, if no
+ presentation mode is indicated in the bitstream.\n For options,
+ see ::AAC_DRC_DEFAULT_PRESENTATION_MODE_OPTIONS.\n Default:
::AAC_DRC_PARAMETER_HANDLING_DISABLED */
AAC_DRC_ENC_TARGET_LEVEL =
- 0x0205, /*!< Dynamic Range Control: Encoder target level for light (i.e.
- not heavy) compression.\n If known, this declares the target
- reference level that was assumed at the encoder for calculation
- of limiting gains. The valid values range from 0 (full-scale)
- to 127 (31.75 dB below full-scale). This parameter is used only
+ 0x0205, /*!< MPEG-4 DRC: Encoder target level for light (i.e. not heavy)
+ compression.\n If known, this declares the target reference
+ level that was assumed at the encoder for calculation of
+ limiting gains. The valid values range from 0 (full-scale) to
+ 127 (31.75 dB below full-scale). This parameter is used only
with ::AAC_DRC_PARAMETER_HANDLING_ENABLED and ignored
otherwise.\n Default: 127 (worst-case assumption).\n */
+ AAC_UNIDRC_SET_EFFECT = 0x0206, /*!< MPEG-D DRC: Request a DRC effect type for
+ selection of a DRC set.\n Supported indices
+ are:\n -1: DRC off. Completely disables
+ MPEG-D DRC.\n 0: None (default). Disables
+ MPEG-D DRC, but automatically enables DRC
+ if necessary to prevent clipping.\n 1: Late
+ night\n 2: Noisy environment\n 3: Limited
+ playback range\n 4: Low playback level\n 5:
+ Dialog enhancement\n 6: General
+ compression. Used for generally enabling
+ MPEG-D DRC without particular request.\n */
+ AAC_UNIDRC_ALBUM_MODE =
+ 0x0207, /*!< MPEG-D DRC: Enable album mode. 0: Disabled (default), 1:
+ Enabled.\n Disabled album mode leads to application of gain
+ sequences for fading in and out, if provided in the
+ bitstream.\n Enabled album mode makes use of dedicated album
+ loudness information, if provided in the bitstream.\n */
AAC_QMF_LOWPOWER = 0x0300, /*!< Quadrature Mirror Filter (QMF) Bank processing
mode. \n -1: Use internal default. Implies MPEG
Surround partially complex accordingly. \n 0:
Use complex QMF data mode. \n 1: Use real (low
power) QMF data mode. \n */
AAC_TPDEC_CLEAR_BUFFER =
- 0x0603, /*!< Clear internal bit stream buffer of transport layers. The
- decoder will start decoding at new data passed after this event
- and any previous data is discarded. */
- AAC_UNIDRC_SET_EFFECT = 0x0903 /*!< MPEG-D DRC: Request a DRC effect type for
- selection of a DRC set.\n Supported indices
- are:\n -1: DRC off. Completely disables
- MPEG-D DRC.\n 0: None (default). Disables
- MPEG-D DRC, but automatically enables DRC if
- necessary to prevent clipping.\n 1: Late
- night\n 2: Noisy environment\n 3: Limited
- playback range\n 4: Low playback level\n 5:
- Dialog enhancement\n 6: General compression.
- Used for generally enabling MPEG-D DRC
- without particular request.\n */
+ 0x0603 /*!< Clear internal bit stream buffer of transport layers. The
+ decoder will start decoding at new data passed after this event
+ and any previous data is discarded. */
} AACDEC_PARAM;
diff --git a/fdk-aac/libAACdec/src/aacdec_drc.cpp b/fdk-aac/libAACdec/src/aacdec_drc.cpp
index 922a09e..4129d0f 100644
--- a/fdk-aac/libAACdec/src/aacdec_drc.cpp
+++ b/fdk-aac/libAACdec/src/aacdec_drc.cpp
@@ -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
@@ -174,9 +174,9 @@ void aacDecoder_drcInit(HANDLE_AAC_DRC self) {
pParams->usrCut = FL2FXCONST_DBL(0.0f);
pParams->boost = FL2FXCONST_DBL(0.0f);
pParams->usrBoost = FL2FXCONST_DBL(0.0f);
- pParams->targetRefLevel = -1;
+ pParams->targetRefLevel = 96;
pParams->expiryFrame = AACDEC_DRC_DFLT_EXPIRY_FRAMES;
- pParams->applyDigitalNorm = OFF;
+ pParams->applyDigitalNorm = ON;
pParams->applyHeavyCompression = OFF;
pParams->usrApplyHeavyCompression = OFF;
diff --git a/fdk-aac/libAACdec/src/aacdec_hcr.cpp b/fdk-aac/libAACdec/src/aacdec_hcr.cpp
index 6114756..26fdd97 100644
--- a/fdk-aac/libAACdec/src/aacdec_hcr.cpp
+++ b/fdk-aac/libAACdec/src/aacdec_hcr.cpp
@@ -1423,6 +1423,9 @@ static INT DecodeEscapeSequence(HANDLE_FDK_BITSTREAM bs, const INT bsAnchor,
sign = (quantSpecCoef >= 0) ? 1 : -1;
+ if (escapeOnesCounter > 30)
+ escapeOnesCounter = 30;
+
quantSpecCoef = sign * (((INT)1 << escapeOnesCounter) + escape_word);
return quantSpecCoef;
diff --git a/fdk-aac/libAACdec/src/aacdecoder.cpp b/fdk-aac/libAACdec/src/aacdecoder.cpp
index 8f03328..7617937 100644
--- a/fdk-aac/libAACdec/src/aacdecoder.cpp
+++ b/fdk-aac/libAACdec/src/aacdecoder.cpp
@@ -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
@@ -1815,6 +1815,9 @@ CAacDecoder_Init(HANDLE_AACDECODER self, const CSAudioSpecificConfig *asc,
self->useLdQmfTimeAlign =
asc->m_sc.m_eldSpecificConfig.m_useLdQmfTimeAlign;
}
+ if (self->sbrEnabled != asc->m_sbrPresentFlag) {
+ ascChanged = 1;
+ }
}
self->streamInfo.extAot = asc->m_extensionAudioObjectType;
diff --git a/fdk-aac/libAACdec/src/aacdecoder_lib.cpp b/fdk-aac/libAACdec/src/aacdecoder_lib.cpp
index 7df17b9..8685a30 100644
--- a/fdk-aac/libAACdec/src/aacdecoder_lib.cpp
+++ b/fdk-aac/libAACdec/src/aacdecoder_lib.cpp
@@ -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
@@ -119,8 +119,8 @@ amm-info@iis.fraunhofer.de
/* Decoder library info */
#define AACDECODER_LIB_VL0 3
-#define AACDECODER_LIB_VL1 0
-#define AACDECODER_LIB_VL2 0
+#define AACDECODER_LIB_VL1 1
+#define AACDECODER_LIB_VL2 2
#define AACDECODER_LIB_TITLE "AAC Decoder Lib"
#ifdef __ANDROID__
#define AACDECODER_LIB_BUILD_DATE ""
@@ -823,11 +823,15 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_SetParam(
case AAC_DRC_ATTENUATION_FACTOR:
/* DRC compression factor (where 0 is no and 127 is max compression) */
errorStatus = aacDecoder_drcSetParam(hDrcInfo, DRC_CUT_SCALE, value);
+ uniDrcErr = FDK_drcDec_SetParam(self->hUniDrcDecoder, DRC_DEC_COMPRESS,
+ value * (FL2FXCONST_DBL(0.5f / 127.0f)));
break;
case AAC_DRC_BOOST_FACTOR:
/* DRC boost factor (where 0 is no and 127 is max boost) */
errorStatus = aacDecoder_drcSetParam(hDrcInfo, DRC_BOOST_SCALE, value);
+ uniDrcErr = FDK_drcDec_SetParam(self->hUniDrcDecoder, DRC_DEC_BOOST,
+ value * (FL2FXCONST_DBL(0.5f / 127.0f)));
break;
case AAC_DRC_REFERENCE_LEVEL:
@@ -871,6 +875,11 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_SetParam(
uniDrcErr = FDK_drcDec_SetParam(self->hUniDrcDecoder, DRC_DEC_EFFECT_TYPE,
(FIXP_DBL)value);
break;
+ case AAC_UNIDRC_ALBUM_MODE:
+ uniDrcErr = FDK_drcDec_SetParam(self->hUniDrcDecoder, DRC_DEC_ALBUM_MODE,
+ (FIXP_DBL)value);
+ break;
+
case AAC_TPDEC_CLEAR_BUFFER:
errTp = transportDec_SetParam(hTpDec, TPDEC_PARAM_RESET, 1);
self->streamInfo.numLostAccessUnits = 0;
@@ -1669,6 +1678,13 @@ aacDecoder_DecodeFrame(HANDLE_AACDECODER self, INT_PCM *pTimeData_extern,
reverseOutChannelMap[ch] = ch;
}
+ /* Update sampleRate and frameSize. This may be necessary in case of
+ * implicit SBR signaling */
+ FDK_drcDec_SetParam(self->hUniDrcDecoder, DRC_DEC_SAMPLE_RATE,
+ self->streamInfo.sampleRate);
+ FDK_drcDec_SetParam(self->hUniDrcDecoder, DRC_DEC_FRAME_SIZE,
+ self->streamInfo.frameSize);
+
/* If SBR and/or MPS is active, the DRC gains are aligned to the QMF
domain signal before the QMF synthesis. Therefore the DRC gains
need to be delayed by the QMF synthesis delay. */
diff --git a/fdk-aac/libAACdec/src/usacdec_lpd.cpp b/fdk-aac/libAACdec/src/usacdec_lpd.cpp
index 2110172..e0a2631 100644
--- a/fdk-aac/libAACdec/src/usacdec_lpd.cpp
+++ b/fdk-aac/libAACdec/src/usacdec_lpd.cpp
@@ -1222,7 +1222,7 @@ AAC_DECODER_ERROR CLpdChannelStream_Read(
(INT)(samplingRate * PIT_MIN_12k8 + (FSCALE_DENOM / 2)) / FSCALE_DENOM -
(INT)PIT_MIN_12k8;
- if ((samplingRate < FAC_FSCALE_MIN) || (samplingRate > FAC_FSCALE_MAX)) {
+ if ((samplingRate < 6000) || (samplingRate > 24000)) {
error = AAC_DEC_PARSE_ERROR;
goto bail;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 10:05:32 +0000