diff options
| author | Fraunhofer IIS FDK <audio-fdk@iis.fraunhofer.de> | 2021-05-07 22:11:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-07 22:11:53 +0000 |
| commit | ef265e496f5e5503cfd1924db8598554ba662129 (patch) | |
| tree | 60bbd96193d045a530cc71505bcbe06ada70c63e | |
| parent | 1456244fff9ba1e7750bbd06fb38c7a65fda3d89 (diff) | |
| parent | db4e46c9a638953a34fa07c1fcbc927828f5e81b (diff) | |
| download | fdk-aac-ef265e496f5e5503cfd1924db8598554ba662129.tar.gz fdk-aac-ef265e496f5e5503cfd1924db8598554ba662129.tar.bz2 fdk-aac-ef265e496f5e5503cfd1924db8598554ba662129.zip | |
Pass flushing flag to SBR module for stereo config index 3 as for stereo config index 1 and 2. am: 92dd536642 am: db4e46c9a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14470259
Change-Id: I6eeade1a212ac9bb17e9feb508cd7e2f0a965ce0
| -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); |