diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2023-04-25 17:09:22 +0000 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2023-04-25 17:11:39 +0000 |
| commit | b5b590367af9043aaf5e13b0d573aa7261945880 (patch) | |
| tree | 39b8a978dcf2c9c2b190818bc0f3cb302db13e2d /libAACdec/src/aacdecoder_lib.cpp | |
| parent | 0f065e796bfd2c6889c7af6fd99004491b1b6b73 (diff) | |
| download | fdk-aac-b5b590367af9043aaf5e13b0d573aa7261945880.tar.gz fdk-aac-b5b590367af9043aaf5e13b0d573aa7261945880.tar.bz2 fdk-aac-b5b590367af9043aaf5e13b0d573aa7261945880.zip | |
Disable MPEG-D DRC for legacy AOTs
Disable MPEG-D DRC metadata for legacy AOTs 2 (AAC-LC), 5 (HE-AAC),
and 29 (HE-AAC v2).
Bug: 241391733
Test: see bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2f4c595c4abd721967ecb494f5aec3f6b6dafb9e)
Merged-In: Ie84badaa24bb4169adfdb1d3243525c32b44d3e9
Change-Id: Ie84badaa24bb4169adfdb1d3243525c32b44d3e9
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; |