commit | c8d96838ba8524aab0a872b42e7bdce53b5ec0ea | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Fri Feb 23 20:52:41 2018 +0000 |
committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Fri Feb 23 20:52:41 2018 +0000 |
tree | 02ce75797e788c959b08f7b914d3117d25b5e75b | |
parent | 7e571e4cb91e6df8c64d98715ce50f7dc6aaeac3 [diff] | |
parent | 04ba4099f3d0e97da0644feee72a967cc7b39a4c [diff] |
[automerger] Handle bad bitrate index in mp3dec. am: 8b63812376 am: 1c388693ae am: d1cd373be8 am: b589cde346 am: c512ab83dc am: 1527d62132 am: 93783a217f am: 04ba4099f3 Change-Id: I0ecd5c6baf15ecbac04a88ccebcdb66c11dc32fc
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; }