diff options
| author | Andreas Huber <andih@google.com> | 2009-09-10 14:13:30 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2009-09-10 14:43:36 -0700 |
| commit | e6c409632f773e41f33188272a0072be9fcb783f (patch) | |
| tree | 228c0d88ce6818974b8bab7062e9fef05f3ba250 /media/libstagefright/MediaExtractor.cpp | |
| parent | d9ca6a79c6ac9cc8790aabbb42fe2ce579001528 (diff) | |
| download | frameworks_base-e6c409632f773e41f33188272a0072be9fcb783f.zip frameworks_base-e6c409632f773e41f33188272a0072be9fcb783f.tar.gz frameworks_base-e6c409632f773e41f33188272a0072be9fcb783f.tar.bz2 | |
Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
Diffstat (limited to 'media/libstagefright/MediaExtractor.cpp')
| -rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index 8afa8e1..8535f52 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -20,6 +20,7 @@ #include <media/stagefright/AMRExtractor.h> #include <media/stagefright/DataSource.h> +#include <media/stagefright/MediaDefs.h> #include <media/stagefright/MP3Extractor.h> #include <media/stagefright/MPEG4Extractor.h> #include <media/stagefright/MediaExtractor.h> @@ -44,12 +45,13 @@ sp<MediaExtractor> MediaExtractor::Create( mime, confidence); } - if (!strcasecmp(mime, "video/mp4") || !strcasecmp(mime, "audio/mp4")) { + if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG4) + || !strcasecmp(mime, "audio/mp4")) { return new MPEG4Extractor(source); - } else if (!strcasecmp(mime, "audio/mpeg")) { + } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_MPEG)) { return new MP3Extractor(source); - } else if (!strcasecmp(mime, "audio/3gpp") - || !strcasecmp(mime, "audio/amr-wb")) { + } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AMR_NB) + || !strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AMR_WB)) { return new AMRExtractor(source); } |