diff options
author | Andreas Huber <andih@google.com> | 2009-12-08 15:40:06 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2009-12-10 12:23:55 -0800 |
commit | 4f1efc098cb5791c3e9f483f2af84aef70d2d0a0 (patch) | |
tree | a2873e84aed3eecb1198f85954e24cddb1bdc380 /media/libstagefright/OMXCodec.cpp | |
parent | c54176addef15699a518b69cd6bbd40ffc95e72e (diff) | |
download | frameworks_av-4f1efc098cb5791c3e9f483f2af84aef70d2d0a0.zip frameworks_av-4f1efc098cb5791c3e9f483f2af84aef70d2d0a0.tar.gz frameworks_av-4f1efc098cb5791c3e9f483f2af84aef70d2d0a0.tar.bz2 |
Initial check in of AMR (NB and WB) decoders based on PV source code.
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
-rw-r--r-- | media/libstagefright/OMXCodec.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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 @@ sp<MediaSource> OMXCodec::Create( #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); } |