diff options
| author | Xin Li <delphij@google.com> | 2020-09-10 17:22:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-09-10 17:22:12 +0000 |
| commit | 89b6626d5d9f5968da53d107e7f6c2666ef5400f (patch) | |
| tree | 0e353968c34e8c9699663a9b252836b70847c30b /libFDK/src/fixpoint_math.cpp | |
| parent | 946a672b0f5b8481eb3a429f854fcb34d847d692 (diff) | |
| parent | 7f7e67fe023aa5e479aba0388a7e3fb591bda4e5 (diff) | |
| download | fdk-aac-89b6626d5d9f5968da53d107e7f6c2666ef5400f.tar.gz fdk-aac-89b6626d5d9f5968da53d107e7f6c2666ef5400f.tar.bz2 fdk-aac-89b6626d5d9f5968da53d107e7f6c2666ef5400f.zip | |
Merge "Merge Android R"
Diffstat (limited to 'libFDK/src/fixpoint_math.cpp')
| -rw-r--r-- | libFDK/src/fixpoint_math.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libFDK/src/fixpoint_math.cpp b/libFDK/src/fixpoint_math.cpp index 6c656fa..1e26420 100644 --- a/libFDK/src/fixpoint_math.cpp +++ b/libFDK/src/fixpoint_math.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -650,6 +650,12 @@ FIXP_DBL fPow(FIXP_DBL base_m, INT base_e, FIXP_DBL exp_m, INT exp_e, INT ans_lg2_e, baselg2_e; FIXP_DBL base_lg2, ans_lg2, result; + if (base_m <= (FIXP_DBL)0) { + result = (FIXP_DBL)0; + *result_e = 0; + return result; + } + /* Calc log2 of base */ base_lg2 = fLog2(base_m, base_e, &baselg2_e); |