diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-05-01 17:42:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-01 17:42:45 +0000 |
| commit | f0f384d36376a044b1b9cc3ee235614c56df9916 (patch) | |
| tree | 625fb1d46282ddcad0eea2fb5d6ba1cd0345dbae /libAACdec/src/aacdecoder_lib.cpp | |
| parent | bc912c47802fe461fe1fd8281961d62e1df00246 (diff) | |
| parent | b3318ce69147b3795ef74062a9dd84a0fb4afb60 (diff) | |
| download | fdk-aac-f0f384d36376a044b1b9cc3ee235614c56df9916.tar.gz fdk-aac-f0f384d36376a044b1b9cc3ee235614c56df9916.tar.bz2 fdk-aac-f0f384d36376a044b1b9cc3ee235614c56df9916.zip | |
Merge "Disable MPEG-D DRC for legacy AOTs" am: aa9650bdc4 am: b3318ce691
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/2562630
Change-Id: I06f7f454988a27cf05c329b85d7bc668eb5673d9
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 af29366..ef0515c 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; |