1
0
mirror of https://github.com/mstorsjo/fdk-aac.git synced 2025-02-18 12:10:38 +01:00

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: I8ea16bff79bee98ecc43d393eb07b27f858c15d2
This commit is contained in:
Fraunhofer IIS FDK 2021-05-07 21:49:41 +00:00 committed by Automerger Merge Worker
commit b71181dec5

View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android 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. Forschung e.V. All rights reserved.
1. INTRODUCTION 1. INTRODUCTION
@ -1626,6 +1626,11 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_DecodeFrame(HANDLE_AACDECODER self,
/* set params */ /* set params */
sbrDecoder_SetParam(self->hSbrDecoder, SBR_SYSTEM_BITSTREAM_DELAY, sbrDecoder_SetParam(self->hSbrDecoder, SBR_SYSTEM_BITSTREAM_DELAY,
self->sbrParams.bsDelay); 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); sbrDecoder_SetParam(self->hSbrDecoder, SBR_SKIP_QMF, 1);