commit 28fa5fe9bd221399d147ffffa14666d9540b79a9
author Dongwon Kang <dwkang@google.com> Thu Mar 08 02:31:26 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 08 02:31:26 2018 +0000
tree 58b3abba805c487b4663c264484783a0285c673a
parent f74906c3d490465e77e817fb136558774514077b
parent 7139891cdf868b0f7d3f06bc7fd4f1d1da8fa3d7

[automerger] Handle bad bitrate index in mp3dec. am: 8b63812376 am: 1c388693ae am: d1cd373be8 am: b589cde346 am: c512ab83dc am: 1527d62132 am: 93783a217f am: 04ba4099f3 am: c8d96838ba am: 2bd167ec3c am: 3f60a22fd8 am: 2c3a889073 am: 4db55b03d3
am: 7139891cdf

Change-Id: I83c6af9dba0e548851016e5a2696e5084501218d

media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp

diff --git a/media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp b/media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp
index d443b7c..bc5fd79 100644
--- a/media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp
+++ b/media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp
@@ -184,7 +184,7 @@
     info->emphasis           = (temp << 30) >> 30;  /* 2 */
 
 
-    if (!info->bitrate_index || info->sampling_frequency == 3)
+    if (!info->bitrate_index || info->bitrate_index == 15 || info->sampling_frequency == 3)
     {
         err = UNSUPPORTED_FREE_BITRATE;
     }