commit e6c409632f773e41f33188272a0072be9fcb783f
author Andreas Huber <andih@google.com> Thu Sep 10 14:13:30 2009 -0700
committer Andreas Huber <andih@google.com> Thu Sep 10 14:43:36 2009 -0700
tree 228c0d88ce6818974b8bab7062e9fef05f3ba250
parent d9ca6a79c6ac9cc8790aabbb42fe2ce579001528

Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.

media/libstagefright/MediaExtractor.cpp

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 @@
              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);
     }