diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2023-04-25 17:04:25 +0000 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2023-04-25 17:11:26 +0000 |
| commit | 167dcc380a53c0eb69cdfae97d0ba0fdc5af398d (patch) | |
| tree | 677db936c0bf06d1b58794241d6c43709c90370e /libAACdec/src/aacdecoder.cpp | |
| parent | 0f065e796bfd2c6889c7af6fd99004491b1b6b73 (diff) | |
| download | fdk-aac-167dcc380a53c0eb69cdfae97d0ba0fdc5af398d.tar.gz fdk-aac-167dcc380a53c0eb69cdfae97d0ba0fdc5af398d.tar.bz2 fdk-aac-167dcc380a53c0eb69cdfae97d0ba0fdc5af398d.zip | |
Remove obsolete uni drc precedence handling
Bug: 241391733
Test: see bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4c41b05b6c60275c2a6b28918f40c218a8b818f6)
Merged-In: I0ddc479626fb6a89d04bc989256ad1d8ec4275a3
Change-Id: I0ddc479626fb6a89d04bc989256ad1d8ec4275a3
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 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( |