| commit | 2c3a8890730e386b9aa0e56fcd417514a1e91cfe | [log] [tgz] |
|---|---|---|
| author | Dongwon Kang <dwkang@google.com> | Thu Mar 08 01:38:57 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 08 01:38:57 2018 +0000 |
| tree | 026260552f2ede35cf8aa59746481a9904b77b37 | |
| parent | 49d4aa0a7407ea6632c4a3441c7a4d922d003ea5 [diff] | |
| parent | 3f60a22fd8b0dfd812818611ebe1f726023ef615 [diff] |
[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 Change-Id: Ia614999bf0716fad5e9ebfddeaaffecc655edf79
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; }