diff options
| author | Andreas Huber <andih@google.com> | 2012-01-31 14:34:59 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-02-01 10:39:26 -0800 |
| commit | 252353088a5ebf8508fbc01439ff417805ef1417 (patch) | |
| tree | 6abbd71af66f1d24791e5151aa41649f9b649b44 /media/libstagefright/OMXCodec.cpp | |
| parent | 2af955b7437ac5345d75a5e528ebbb749667af7e (diff) | |
| download | frameworks_av-252353088a5ebf8508fbc01439ff417805ef1417.zip frameworks_av-252353088a5ebf8508fbc01439ff417805ef1417.tar.gz frameworks_av-252353088a5ebf8508fbc01439ff417805ef1417.tar.bz2 | |
The software AMR NB encoder is now an OMX component.
Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rwxr-xr-x | media/libstagefright/OMXCodec.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 1f26cbe..9b947e5 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -18,7 +18,6 @@ #define LOG_TAG "OMXCodec" #include <utils/Log.h> -#include "include/AMRNBEncoder.h" #include "include/AMRWBEncoder.h" #include "include/AVCEncoder.h" #include "include/M4vH263Encoder.h" @@ -70,7 +69,6 @@ static sp<MediaSource> Make##name(const sp<MediaSource> &source, const sp<MetaDa #define FACTORY_REF(name) { #name, Make##name }, -FACTORY_CREATE_ENCODER(AMRNBEncoder) FACTORY_CREATE_ENCODER(AMRWBEncoder) FACTORY_CREATE_ENCODER(AVCEncoder) FACTORY_CREATE_ENCODER(M4vH263Encoder) @@ -84,7 +82,6 @@ static sp<MediaSource> InstantiateSoftwareEncoder( }; static const FactoryInfo kFactoryInfo[] = { - FACTORY_REF(AMRNBEncoder) FACTORY_REF(AMRWBEncoder) FACTORY_REF(AVCEncoder) FACTORY_REF(M4vH263Encoder) @@ -146,7 +143,7 @@ static const CodecInfo kDecoderInfo[] = { static const CodecInfo kEncoderInfo[] = { { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.TI.AMR.encode" }, - { MEDIA_MIMETYPE_AUDIO_AMR_NB, "AMRNBEncoder" }, + { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.google.amrnb.encoder" }, { MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.TI.WBAMR.encode" }, { MEDIA_MIMETYPE_AUDIO_AMR_WB, "AMRWBEncoder" }, { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.TI.AAC.encode" }, |