diff options
author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2023-04-25 17:23:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-25 17:23:06 +0000 |
commit | 7db7dc35b978ed095051c53077287c06dff343d1 (patch) | |
tree | 0fa1cb1a220cbfe89b75ac392d98f2b9fdb15ea0 /libAACdec/src/aacdecoder.cpp | |
parent | a6ab9ba89b3ce8e11b578e4a3bd7cc0feb794ad8 (diff) | |
parent | 4c41b05b6c60275c2a6b28918f40c218a8b818f6 (diff) | |
download | fdk-aac-7db7dc35b978ed095051c53077287c06dff343d1.tar.gz fdk-aac-7db7dc35b978ed095051c53077287c06dff343d1.tar.bz2 fdk-aac-7db7dc35b978ed095051c53077287c06dff343d1.zip |
Remove obsolete uni drc precedence handling am: 4c41b05b6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/22789795
Change-Id: I1918a1e75e006ab291625065bba8943237777f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libAACdec/src/aacdecoder.cpp')
-rw-r--r-- | libAACdec/src/aacdecoder.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp index ee448c3..ad8ce0d 100644 --- a/libAACdec/src/aacdecoder.cpp +++ b/libAACdec/src/aacdecoder.cpp @@ -3273,12 +3273,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame( FDKmemcpy(drcChMap, self->chMapping, (8) * sizeof(UCHAR)); } - /* deactivate legacy DRC in case uniDrc is active, i.e. uniDrc payload is - * present and one of DRC or Loudness Normalization is switched on */ - aacDecoder_drcSetParam( - self->hDrcInfo, UNIDRC_PRECEDENCE, - FDK_drcDec_GetParam(self->hUniDrcDecoder, DRC_DEC_IS_ACTIVE)); - /* Extract DRC control data and map it to channels (without bitstream delay) */ mapped = aacDecoder_drcProlog( |