diff options
| author | Dave Burke <daveburke@google.com> | 2012-04-19 00:14:27 -0700 |
|---|---|---|
| committer | Dave Burke <daveburke@google.com> | 2012-04-25 22:02:58 -0700 |
| commit | aeb8fd460ed87d032b3fb8bb61e21eb542ce0f5b (patch) | |
| tree | f8b459d895acef1717c96cb7133675dda3e458b7 /media/libstagefright/AACWriter.cpp | |
| parent | e0fa467e1150c65a7b1b1ed904c579b40f97c9df (diff) | |
| download | frameworks_av-aeb8fd460ed87d032b3fb8bb61e21eb542ce0f5b.zip frameworks_av-aeb8fd460ed87d032b3fb8bb61e21eb542ce0f5b.tar.gz frameworks_av-aeb8fd460ed87d032b3fb8bb61e21eb542ce0f5b.tar.bz2 | |
Add Fraunhofer AAC encoder with AAC-ELD support.
Change-Id: I6cd499d257d72f50a5b508bed97796a591a51506
Diffstat (limited to 'media/libstagefright/AACWriter.cpp')
| -rw-r--r-- | media/libstagefright/AACWriter.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/AACWriter.cpp b/media/libstagefright/AACWriter.cpp index 9cdb463..21c5428 100644 --- a/media/libstagefright/AACWriter.cpp +++ b/media/libstagefright/AACWriter.cpp @@ -18,6 +18,7 @@ #define LOG_TAG "AACWriter" #include <utils/Log.h> +#include <media/openmax/OMX_Audio.h> #include <media/stagefright/AACWriter.h> #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/foundation/ADebug.h> @@ -38,7 +39,8 @@ AACWriter::AACWriter(const char *filename) mPaused(false), mResumed(false), mChannelCount(-1), - mSampleRate(-1) { + mSampleRate(-1), + mAACProfile(OMX_AUDIO_AACObjectLC) { ALOGV("AACWriter Constructor"); @@ -96,6 +98,7 @@ status_t AACWriter::addSource(const sp<MediaSource> &source) { CHECK(!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)); CHECK(meta->findInt32(kKeyChannelCount, &mChannelCount)); CHECK(meta->findInt32(kKeySampleRate, &mSampleRate)); + CHECK(meta->findInt32(kKeyAACProfile, &mAACProfile)); CHECK(mChannelCount >= 1 && mChannelCount <= 2); mSource = source; @@ -254,7 +257,7 @@ status_t AACWriter::writeAdtsHeader(uint32_t frameLength) { data |= kProtectionAbsense; write(mFd, &data, 1); - const uint8_t kProfileCode = 1; // AAC-LC + const uint8_t kProfileCode = mAACProfile - 1; uint8_t kSampleFreqIndex; CHECK(getSampleRateTableIndex(mSampleRate, &kSampleFreqIndex)); const uint8_t kPrivateStream = 0; |