summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaDefs.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-04-12 16:05:57 -0700
committerAndreas Huber <andih@google.com>2010-04-12 16:05:57 -0700
commit81f82c32459029bf0744e28c73f95a7f18cab5ac (patch)
tree7bc1f309ecd5f3d7ce4f3377837ccd3cb7728bbf /media/libstagefright/MediaDefs.cpp
parent874b55f51c4c062c65aee043ec0f26044b504556 (diff)
downloadframeworks_av-81f82c32459029bf0744e28c73f95a7f18cab5ac.zip
frameworks_av-81f82c32459029bf0744e28c73f95a7f18cab5ac.tar.gz
frameworks_av-81f82c32459029bf0744e28c73f95a7f18cab5ac.tar.bz2
Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
Change-Id: Ic9a9198413431db4ea40bb63b9de91aa8a7183af related-to-bug: 2587341
Diffstat (limited to 'media/libstagefright/MediaDefs.cpp')
-rw-r--r--media/libstagefright/MediaDefs.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp
index 04b1454..3a89170 100644
--- a/media/libstagefright/MediaDefs.cpp
+++ b/media/libstagefright/MediaDefs.cpp
@@ -29,6 +29,7 @@ const char *MEDIA_MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";
const char *MEDIA_MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";
const char *MEDIA_MIMETYPE_AUDIO_MPEG = "audio/mpeg";
const char *MEDIA_MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";
+const char *MEDIA_MIMETYPE_AUDIO_QCELP = "audio/qcelp";
const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw";
const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4";