Merge "Disable detection of MP3 audio contained in MPEG1" am: d9272a936e

am: 8e1e78ebb9

Change-Id: Ie381648e45653be544634f81d9e0ce35d72188b6

media/libstagefright/MP3Extractor.cpp

@@ -672,6 +672,15 @@ bool SniffMP3(
     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 false;
+    }
+
+    if (!memcmp("\x00\x00\x01\xba", mpeg_header, 4) && (mpeg_header[4] >> 4) == 2) {
+        ALOGV("MPEG1PS container is not supported!");
+        return false;
+    }
     if (!Resync(source, 0, &pos, &post_id3_pos, &header)) {
         return false;
     }