summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaExtractor.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2009-09-08 16:07:15 -0700
committerAndreas Huber <andih@google.com>2009-09-09 11:05:42 -0700
commitf75978f63a25e79c683e96611f95cb5cd49efd3d (patch)
treedd74697325270da0b961fb6dadc2ecb2b95be9a4 /media/libstagefright/MediaExtractor.cpp
parent03480f8ae9df41902b6523493fe19a2a513b8d98 (diff)
downloadframeworks_av-f75978f63a25e79c683e96611f95cb5cd49efd3d.zip
frameworks_av-f75978f63a25e79c683e96611f95cb5cd49efd3d.tar.gz
frameworks_av-f75978f63a25e79c683e96611f95cb5cd49efd3d.tar.bz2
Added a .amr file extractor (for AMR-NB and AMR-WB content).
Diffstat (limited to 'media/libstagefright/MediaExtractor.cpp')
-rw-r--r--media/libstagefright/MediaExtractor.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp
index 5f78e12..8afa8e1 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -18,6 +18,7 @@
#define LOG_TAG "MediaExtractor"
#include <utils/Log.h>
+#include <media/stagefright/AMRExtractor.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MP3Extractor.h>
#include <media/stagefright/MPEG4Extractor.h>
@@ -47,6 +48,9 @@ sp<MediaExtractor> MediaExtractor::Create(
return new MPEG4Extractor(source);
} else if (!strcasecmp(mime, "audio/mpeg")) {
return new MP3Extractor(source);
+ } else if (!strcasecmp(mime, "audio/3gpp")
+ || !strcasecmp(mime, "audio/amr-wb")) {
+ return new AMRExtractor(source);
}
return NULL;