| commit | 16ac9b680a7a965b49b443dc5a1e03ef4f14ab99 | [log] [tgz] |
|---|---|---|
| author | Jaewan Kim <jaewan@google.com> | Thu Mar 08 08:56:50 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 08 08:56:50 2018 +0000 |
| tree | 167615b8fbfc9f7327af408bfdf420cc08b110af | |
| parent | 4db55b03d35155737e65ddaa0e802c3452371969 [diff] | |
| parent | c8508bf04576790230c5a32b329a4b47468ac7fb [diff] |
Merge "MediaSession2: Clean up TODOs under frameworks/base" into pi-dev
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; }