aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec/src/aacdecoder.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-05-01 16:18:51 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-05-01 16:18:51 +0000
commit7f83eb07af2d829f1117f52a12f4df9d982283f0 (patch)
tree677db936c0bf06d1b58794241d6c43709c90370e /libAACdec/src/aacdecoder.cpp
parent0f065e796bfd2c6889c7af6fd99004491b1b6b73 (diff)
parent167dcc380a53c0eb69cdfae97d0ba0fdc5af398d (diff)
downloadfdk-aac-7f83eb07af2d829f1117f52a12f4df9d982283f0.tar.gz
fdk-aac-7f83eb07af2d829f1117f52a12f4df9d982283f0.tar.bz2
fdk-aac-7f83eb07af2d829f1117f52a12f4df9d982283f0.zip
Merge "Remove obsolete uni drc precedence handling"
Diffstat (limited to 'libAACdec/src/aacdecoder.cpp')
-rw-r--r--libAACdec/src/aacdecoder.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp
index d5f0cea..ab8dc79 100644
--- a/libAACdec/src/aacdecoder.cpp
+++ b/libAACdec/src/aacdecoder.cpp
@@ -3310,12 +3310,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(