commit a30d40083856cb4edd225faf8b488fab156e5976
author Andreas Huber <andih@google.com> Tue Dec 08 15:40:06 2009 -0800
committer Andreas Huber <andih@google.com> Thu Dec 10 12:23:55 2009 -0800
tree 7b629ef3508812455dc70891e8e10f3a449fdcb1
parent a50d450863cb84805ac6809a4c1f7b83984da1ee

Initial check in of AMR (NB and WB) decoders based on PV source code.

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 07508e7..093e2e0 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -20,6 +20,8 @@
 
 #if BUILD_WITH_FULL_STAGEFRIGHT
 #include "include/AACDecoder.h"
+#include "include/AMRNBDecoder.h"
+#include "include/AMRWBDecoder.h"
 #include "include/MP3Decoder.h"
 #endif
 
@@ -292,6 +294,10 @@
 #if BUILD_WITH_FULL_STAGEFRIGHT
     if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) {
         return new AACDecoder(source);
+    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AMR_NB)) {
+        return new AMRNBDecoder(source);
+    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AMR_WB)) {
+        return new AMRWBDecoder(source);
     } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_MPEG)) {
         return new MP3Decoder(source);
     }