aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.bp3
-rw-r--r--libAACdec/src/usacdec_lpd.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index dce6fdd..80a0347 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,7 +30,8 @@ cc_library_static {
"signed-integer-overflow",
"bounds",
],
- cfi: true,
+ // Enable CFI if this becomes a shared library.
+ // cfi: true,
},
shared_libs: [
"liblog",
diff --git a/libAACdec/src/usacdec_lpd.cpp b/libAACdec/src/usacdec_lpd.cpp
index 2110172..e0a2631 100644
--- a/libAACdec/src/usacdec_lpd.cpp
+++ b/libAACdec/src/usacdec_lpd.cpp
@@ -1222,7 +1222,7 @@ AAC_DECODER_ERROR CLpdChannelStream_Read(
(INT)(samplingRate * PIT_MIN_12k8 + (FSCALE_DENOM / 2)) / FSCALE_DENOM -
(INT)PIT_MIN_12k8;
- if ((samplingRate < FAC_FSCALE_MIN) || (samplingRate > FAC_FSCALE_MAX)) {
+ if ((samplingRate < 6000) || (samplingRate > 24000)) {
error = AAC_DEC_PARSE_ERROR;
goto bail;
}