summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Extractor.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-02-24 21:16:54 -0800
committerJames Dong <jdong@google.com>2011-02-25 11:19:40 -0800
commit633b4c8cc1f41370576aa43e6c5a70e4865a36df (patch)
tree9232fad7dac365eeaad84efbbdd973cb0f0b851a /media/libstagefright/MPEG4Extractor.cpp
parent18eb42eca6949158e630eae38a70db8f837c17c8 (diff)
downloadframeworks_av-633b4c8cc1f41370576aa43e6c5a70e4865a36df.zip
frameworks_av-633b4c8cc1f41370576aa43e6c5a70e4865a36df.tar.gz
frameworks_av-633b4c8cc1f41370576aa43e6c5a70e4865a36df.tar.bz2
mp4a box contains mp3 audio when the object type indication is 0x6b
In this case, the MediaExtractor returns ERROR_UNSUPPORTED since our software MP3 audio decoder may not be able to handle packetized MP3 audio. bug - 3377570 Change-Id: I8bb6b3813716b5fa019e318842e8e1908b3c8bf8
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
-rw-r--r--media/libstagefright/MPEG4Extractor.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index cf4cbe5..7b96d01 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1596,6 +1596,14 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
return OK;
}
+ if (objectTypeIndication == 0x6b) {
+ // The media subtype is MP3 audio
+ // Our software MP3 audio decoder may not be able to handle
+ // packetized MP3 audio; for now, lets just return ERROR_UNSUPPORTED
+ LOGE("MP3 track in MP4/3GPP file is not supported");
+ return ERROR_UNSUPPORTED;
+ }
+
const uint8_t *csd;
size_t csd_size;
if (esds.getCodecSpecificInfo(