diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2021-05-07 21:49:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-07 21:49:51 +0000 |
| commit | 5df817f9383fd1bf586ae4df3b9d2f71c884f643 (patch) | |
| tree | 60bbd96193d045a530cc71505bcbe06ada70c63e /libAACdec | |
| parent | 6de1029823211a74dc66a3d0cf73c4fe514a506c (diff) | |
| parent | 92dd536642e0cc64ef0112e255dbfba14da461c1 (diff) | |
| download | fdk-aac-5df817f9383fd1bf586ae4df3b9d2f71c884f643.tar.gz fdk-aac-5df817f9383fd1bf586ae4df3b9d2f71c884f643.tar.bz2 fdk-aac-5df817f9383fd1bf586ae4df3b9d2f71c884f643.zip | |
Pass flushing flag to SBR module for stereo config index 3 as for stereo config index 1 and 2. am: 92dd536642
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470259
Change-Id: I28a19b03795f2e51b679fade211f959fe75460e6
Diffstat (limited to 'libAACdec')
| -rw-r--r-- | libAACdec/src/aacdecoder_lib.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp index 9d36d10..0c83191 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 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -1626,6 +1626,11 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_DecodeFrame(HANDLE_AACDECODER self, /* set params */ sbrDecoder_SetParam(self->hSbrDecoder, SBR_SYSTEM_BITSTREAM_DELAY, self->sbrParams.bsDelay); + sbrDecoder_SetParam( + self->hSbrDecoder, SBR_FLUSH_DATA, + (flags & AACDEC_FLUSH) | + ((self->flushStatus && !(flags & AACDEC_CONCEAL)) ? AACDEC_FLUSH + : 0)); sbrDecoder_SetParam(self->hSbrDecoder, SBR_SKIP_QMF, 1); |