commit f87befcf3b88a973e375f4b20b5587e1a6d35530
author Jean-Michel Trivi <jmtrivi@google.com> Wed Dec 26 18:19:10 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 26 18:19:10 2018 -0800
tree 6135959bd6a4806f235fbab38167ce0dab2a935f
parent 3f50499c9c8f95725c13e7eee25a3439822c7307
parent 0f7ae8601cef080fd87345c980834f9a4c87059b

Merge "Improve error robustness in arithmetic decoder" am: ecdec651da am: 485d02df73
am: 0f7ae8601c

Change-Id: I65666dfc9df6d4d7cda7b3c2781171e16170ff77

libAACdec/src/usacdec_lpd.cpp

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 @@
       (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;
   }