commit cd742b9174eac9f8b6a108512818f2d3a2392ea8
author Dongwon Kang <dwkang@google.com> Thu Nov 23 00:09:49 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 23 00:09:49 2017 +0000
tree f336d3af8ec25530d7d4b835da6c137e99482c47
parent ef6cf3fc6cfb12e089e787efcbf1fc485ed54931
parent 247767321d6c3b481dd8255091f41d7c0de66975

Merge "Disable detection of MP3 audio contained in MPEG1"

media/extractors/mp3/MP3Extractor.cpp

diff --git a/media/extractors/mp3/MP3Extractor.cpp b/media/extractors/mp3/MP3Extractor.cpp
index 2731f0f..f26ed25 100644
--- a/media/extractors/mp3/MP3Extractor.cpp
+++ b/media/extractors/mp3/MP3Extractor.cpp
@@ -678,6 +678,15 @@
     off64_t pos = 0;
     off64_t post_id3_pos;
     uint32_t header;
+    uint8_t mpeg_header[5];
+    if (source->readAt(0, mpeg_header, sizeof(mpeg_header)) < (ssize_t)sizeof(mpeg_header)) {
+        return NULL;
+    }
+
+    if (!memcmp("\x00\x00\x01\xba", mpeg_header, 4) && (mpeg_header[4] >> 4) == 2) {
+        ALOGV("MPEG1PS container is not supported!");
+        return NULL;
+    }
     if (!Resync(source, 0, &pos, &post_id3_pos, &header)) {
         return NULL;
     }