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/aacdec_drc.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/aacdec_drc.cpp')
-rw-r--r-- | libAACdec/src/aacdec_drc.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libAACdec/src/aacdec_drc.cpp b/libAACdec/src/aacdec_drc.cpp index 760a9ba..abb9af7 100644 --- a/libAACdec/src/aacdec_drc.cpp +++ b/libAACdec/src/aacdec_drc.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2023 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -217,7 +217,6 @@ void aacDecoder_drcInit(HANDLE_AAC_DRC self) { self->progRefLevel = pParams->targetRefLevel; self->progRefLevelPresent = 0; self->presMode = -1; - self->uniDrcPrecedence = 0; aacDecoder_drcReset(self); } @@ -353,12 +352,6 @@ AAC_DECODER_ERROR aacDecoder_drcSetParam(HANDLE_AAC_DRC self, self->numOutChannels = (INT)value; self->update = 1; break; - case UNIDRC_PRECEDENCE: - if (self == NULL) { - return AAC_DEC_INVALID_HANDLE; - } - self->uniDrcPrecedence = (UCHAR)value; - break; default: return AAC_DEC_SET_PARAM_FAIL; } /* switch(param) */ @@ -1258,7 +1251,6 @@ static void aacDecoder_drcParameterHandling(HANDLE_AAC_DRC self, /* switch on/off processing */ self->enable = ((p->boost > (FIXP_DBL)0) || (p->cut > (FIXP_DBL)0) || (p->applyHeavyCompression == ON) || (p->targetRefLevel >= 0)); - self->enable = (self->enable && !self->uniDrcPrecedence); self->prevAacNumChannels = aacNumChannels; self->update = 0; |