diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2023-04-25 18:12:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-25 18:12:02 +0000 |
| commit | 27d3cbd0a24cfb2aa25decee614c206df9f593d8 (patch) | |
| tree | 776881f8708db1327df74a5b7befec8319365338 /libAACdec/src/aacdecoder_lib.cpp | |
| parent | 5a27b681bcc0308cd4511afa2c1594f46ca25ba8 (diff) | |
| parent | b763a98c9d97e55fd216c5b033c41b7480e36298 (diff) | |
| download | fdk-aac-27d3cbd0a24cfb2aa25decee614c206df9f593d8.tar.gz fdk-aac-27d3cbd0a24cfb2aa25decee614c206df9f593d8.tar.bz2 fdk-aac-27d3cbd0a24cfb2aa25decee614c206df9f593d8.zip | |
Disable MPEG-D DRC for legacy AOTs am: 2f4c595c4a am: b763a98c9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/22789794
Change-Id: I9944ae6a0d0bd7906851443529e1838295a87d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libAACdec/src/aacdecoder_lib.cpp')
| -rw-r--r-- | libAACdec/src/aacdecoder_lib.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp index 0c83191..c74ec1a 100644 --- a/libAACdec/src/aacdecoder_lib.cpp +++ b/libAACdec/src/aacdecoder_lib.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2021 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 @@ -1681,7 +1681,7 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_DecodeFrame(HANDLE_AACDECODER self, { if ((FDK_drcDec_GetParam(self->hUniDrcDecoder, DRC_DEC_IS_ACTIVE)) && - !(self->flags[0] & AC_RSV603DA)) { + (self->flags[0] & AC_USAC)) { /* Apply DRC gains*/ int ch, drcDelay = 0; int needsDeinterleaving = 0; |