summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaDefs.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-09 09:54:59 -0700
committerAndreas Huber <andih@google.com>2010-08-09 10:01:26 -0700
commit42d66f25af9cb8089a93c6796876a6bc16e36cea (patch)
tree5db576e682def943eaf39ada08c3c10235fd4d31 /media/libstagefright/MediaDefs.cpp
parent8bf59e735760af0b6a85747fd90bf8cf1e5388d7 (diff)
downloadframeworks_av-42d66f25af9cb8089a93c6796876a6bc16e36cea.zip
frameworks_av-42d66f25af9cb8089a93c6796876a6bc16e36cea.tar.gz
frameworks_av-42d66f25af9cb8089a93c6796876a6bc16e36cea.tar.bz2
Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
Change-Id: I92685d09456c220b8c09842defb721bd55b0b9f6 related-to-bug: 2900021
Diffstat (limited to 'media/libstagefright/MediaDefs.cpp')
-rw-r--r--media/libstagefright/MediaDefs.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp
index 39d264c..7648d42 100644
--- a/media/libstagefright/MediaDefs.cpp
+++ b/media/libstagefright/MediaDefs.cpp
@@ -32,6 +32,8 @@ 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_VORBIS = "audio/vorbis";
+const char *MEDIA_MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";
+const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";
const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw";
const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4";