summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaDefs.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-11-15 14:31:56 -0800
committerMarco Nelissen <marcone@google.com>2012-11-16 07:35:42 -0800
commitba933df89521d63f75ca66af12ce9d7ae9496b9e (patch)
treee56824b10c2cefd2a6762659e220abadcf6050f6 /media/libstagefright/MediaDefs.cpp
parent33cf42ff2264ba4e806ab82ca7a4139b1682192b (diff)
downloadframeworks_av-ba933df89521d63f75ca66af12ce9d7ae9496b9e.zip
frameworks_av-ba933df89521d63f75ca66af12ce9d7ae9496b9e.tar.gz
frameworks_av-ba933df89521d63f75ca66af12ce9d7ae9496b9e.tar.bz2
Add GSM 6.10 decoder
Supports Microsoft frame packing only, since that's what the sample file used. b/6620569 Change-Id: Ia89d95bcbf0f8dcbaad42148a7401728f60e079d
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 e7b5903..5d8029c 100644
--- a/media/libstagefright/MediaDefs.cpp
+++ b/media/libstagefright/MediaDefs.cpp
@@ -40,6 +40,7 @@ const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";
const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw";
const char *MEDIA_MIMETYPE_AUDIO_FLAC = "audio/flac";
const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS = "audio/aac-adts";
+const char *MEDIA_MIMETYPE_AUDIO_MSGSM = "audio/gsm";
const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mp4";
const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/x-wav";