summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongwon Kang <dwkang@google.com>2018-02-23 08:59:27 -0800
committerMSe <mse1969@posteo.de>2018-05-22 10:49:16 +0200
commitfa824d71a2df57b8de3e90e2488ade7ef132884f (patch)
tree66d9e8c13c0ab5c8021d07cfeb0d4d0c41a572d0
parent1aaaef2a808df2de8a92132c55415a08971bf53b (diff)
downloadframeworks_av-fa824d71a2df57b8de3e90e2488ade7ef132884f.tar.gz
frameworks_av-fa824d71a2df57b8de3e90e2488ade7ef132884f.tar.bz2
frameworks_av-fa824d71a2df57b8de3e90e2488ade7ef132884f.zip
Handle bad bitrate index in mp3dec.
Reference: https://www.mp3-tech.org/programmer/frame_header.html Test: run poc with and without this patch. Bug: 71868329 Change-Id: Ibf6196eba0b99459e84989ac8c13db57c816c572 (cherry picked from commit 8b638123760bd93958f6cc2f5c7c4f5dbd0a754a)
-rw-r--r--media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp b/media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp
index d443b7ccfe..bc5fd79526 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 @@ ERROR_CODE pvmp3_decode_header(tmp3Bits *inputStream,
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;
}