diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-05-01 17:00:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-01 17:00:17 +0000 |
| commit | dc087c5c908e093950de056d5d35618d5e73cabb (patch) | |
| tree | 677db936c0bf06d1b58794241d6c43709c90370e /libAACdec/src/aacdecoder.cpp | |
| parent | a6afc4ee4430a0028aa591551ac6f6e594916efc (diff) | |
| parent | 7f83eb07af2d829f1117f52a12f4df9d982283f0 (diff) | |
| download | fdk-aac-dc087c5c908e093950de056d5d35618d5e73cabb.tar.gz fdk-aac-dc087c5c908e093950de056d5d35618d5e73cabb.tar.bz2 fdk-aac-dc087c5c908e093950de056d5d35618d5e73cabb.zip | |
Merge "Remove obsolete uni drc precedence handling" am: 7f83eb07af
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562610
Change-Id: I8d29d1b5b13251bd3f375da79156dfeead7104d8
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 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( |