diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-09 05:44:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-09 05:44:33 +0000 |
| commit | 3b6fe4a90f0e82094a7e5826bf0b3517faf9cfcc (patch) | |
| tree | 359ed01256a717b0161bfba21783634f1250471a /libSBRdec/src/env_dec.cpp | |
| parent | 4a5a256a01c0f6aa0ebd1b94bba77a70fcac75ee (diff) | |
| parent | 3fbcee802021fc12db8fd6e9e346a2111fe333a9 (diff) | |
| download | fdk-aac-3b6fe4a90f0e82094a7e5826bf0b3517faf9cfcc.tar.gz fdk-aac-3b6fe4a90f0e82094a7e5826bf0b3517faf9cfcc.tar.bz2 fdk-aac-3b6fe4a90f0e82094a7e5826bf0b3517faf9cfcc.zip | |
AAC/SBR decoder improvements and bugfixes am: 203e3f2
am: 3fbcee8
* commit '3fbcee802021fc12db8fd6e9e346a2111fe333a9':
AAC/SBR decoder improvements and bugfixes
Change-Id: Ic370a51ba08eb6079ab1b74413385e35bf29ecba
Diffstat (limited to 'libSBRdec/src/env_dec.cpp')
| -rw-r--r-- | libSBRdec/src/env_dec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libSBRdec/src/env_dec.cpp b/libSBRdec/src/env_dec.cpp index 24b2d3b..c65c169 100644 --- a/libSBRdec/src/env_dec.cpp +++ b/libSBRdec/src/env_dec.cpp @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. +© Copyright 1995 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -369,7 +369,7 @@ leanSbrConcealment(HANDLE_SBR_HEADER_DATA hHeaderData, /*!< Static control d FIXP_SGL step; /* speed of fade */ int i; - int currentStartPos = h_prev_data->stopPos - hHeaderData->numberTimeSlots; + int currentStartPos = FDKmax(0, h_prev_data->stopPos - hHeaderData->numberTimeSlots); int currentStopPos = hHeaderData->numberTimeSlots; |