diff options
| author | James Dong <jdong@google.com> | 2012-02-03 11:03:56 -0800 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-02-03 11:20:03 -0800 |
| commit | c71f6e2392bf55cc85ee7c1a376441e9b9aae4c8 (patch) | |
| tree | 276014eca0b627f7500e404940c3a08ce49e0e73 /media/libstagefright | |
| parent | d45ee9d9d61af0791c7c3c51f8d4fe6794ef02a5 (diff) | |
| download | frameworks_av-c71f6e2392bf55cc85ee7c1a376441e9b9aae4c8.zip frameworks_av-c71f6e2392bf55cc85ee7c1a376441e9b9aae4c8.tar.gz frameworks_av-c71f6e2392bf55cc85ee7c1a376441e9b9aae4c8.tar.bz2 | |
Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine
o this should be reverted after the problem is fixed.
o related-to-bug: 5947347
Change-Id: Iaec4b59d2c99c975e83f0588a813e9a4bfcb7ee2
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/Android.mk | 1 | ||||
| -rwxr-xr-x | media/libstagefright/OMXCodec.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 03e8a06..483e5ab 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -78,6 +78,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libstagefright_color_conversion \ + libstagefright_aacenc \ libstagefright_avcenc \ libstagefright_m4vh263enc \ libstagefright_matroska \ diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index af4aa79..381320b 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -18,6 +18,7 @@ #define LOG_TAG "OMXCodec" #include <utils/Log.h> +#include "include/AACEncoder.h" #include "include/AVCEncoder.h" #include "include/M4vH263Encoder.h" @@ -68,6 +69,7 @@ static sp<MediaSource> Make##name(const sp<MediaSource> &source, const sp<MetaDa #define FACTORY_REF(name) { #name, Make##name }, +FACTORY_CREATE_ENCODER(AACEncoder) FACTORY_CREATE_ENCODER(AVCEncoder) FACTORY_CREATE_ENCODER(M4vH263Encoder) @@ -80,6 +82,7 @@ static sp<MediaSource> InstantiateSoftwareEncoder( }; static const FactoryInfo kFactoryInfo[] = { + FACTORY_REF(AACEncoder) FACTORY_REF(AVCEncoder) FACTORY_REF(M4vH263Encoder) }; @@ -145,6 +148,7 @@ static const CodecInfo kEncoderInfo[] = { { MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.google.amrwb.encoder" }, { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.TI.AAC.encode" }, { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.google.aac.encoder" }, + { MEDIA_MIMETYPE_AUDIO_AAC, "AACEncoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.DUCATI1.VIDEO.MPEG4E" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.7x30.video.encoder.mpeg4" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.video.encoder.mpeg4" }, |