commit 6049d7a2bee805e0b016ff00562379813221e7d0
author Jin Xue <jin.xue@intel.com> Wed Nov 08 14:13:46 2017 +0800
committer Dongwon Kang <dwkang@google.com> Thu Nov 23 00:11:04 2017 +0000
tree 4374e39cd5984a3bcbbcd9918e389786da8a6871
parent c4defa724e89a62c16176fb9731670f29ea50358

Disable detection of MP3 audio contained in MPEG1

Media files of MPEG1 container should not be detected
because MPEG1 container is not supported

Bug: 69278105
Test: manual - push a MPEG1 file whose audio track is of mp3 format
Merged-In: Ia6b49bd05e86f0056efa1359d982feaf20e7063d
Change-Id: Ia6b49bd05e86f0056efa1359d982feaf20e7063d
Signed-off-by: Jin Xue <jin.xue@intel.com>

media/libstagefright/MP3Extractor.cpp

diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp
index 22df522..13f9928 100644
--- a/media/libstagefright/MP3Extractor.cpp
+++ b/media/libstagefright/MP3Extractor.cpp
@@ -672,6 +672,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 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;
     }