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 /include/media | |
| 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 'include/media')
| -rw-r--r-- | include/media/mediarecorder.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/AACWriter.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/ACodec.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 2 |
5 files changed, 5 insertions, 2 deletions
diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h index 30db642..3891809 100644 --- a/include/media/mediarecorder.h +++ b/include/media/mediarecorder.h @@ -77,6 +77,7 @@ enum audio_encoder { AUDIO_ENCODER_AAC = 3, AUDIO_ENCODER_AAC_PLUS = 4, AUDIO_ENCODER_EAAC_PLUS = 5, + AUDIO_ENCODER_AAC_ELD = 6, AUDIO_ENCODER_LIST_END // must be the last - used to validate the audio encoder type }; diff --git a/include/media/stagefright/AACWriter.h b/include/media/stagefright/AACWriter.h index 49397ee..df1b053 100644 --- a/include/media/stagefright/AACWriter.h +++ b/include/media/stagefright/AACWriter.h @@ -59,6 +59,7 @@ private: int64_t mEstimatedDurationUs; int32_t mChannelCount; int32_t mSampleRate; + int32_t mAACProfile; int32_t mFrameDurationUs; static void *ThreadWrapper(void *); diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 7d7af63..b8d925e 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -182,7 +182,7 @@ private: status_t setupAACCodec( bool encoder, int32_t numChannels, int32_t sampleRate, int32_t bitRate, - bool isADTS); + int32_t aacProfile, bool isADTS); status_t selectAudioPortFormat( OMX_U32 portIndex, OMX_AUDIO_CODINGTYPE desiredFormat); diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 8a87d83..3c25a14 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -49,6 +49,7 @@ enum { kKeyFrameRate = 'frmR', // int32_t (video frame rate fps) kKeyBitRate = 'brte', // int32_t (bps) kKeyESDS = 'esds', // raw data + kKeyAACProfile = 'aacp', // int32_t kKeyAVCC = 'avcc', // raw data kKeyD263 = 'd263', // raw data kKeyVorbisInfo = 'vinf', // raw data diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 055da5d..887ce5d 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -243,7 +243,7 @@ private: status_t setAACFormat( int32_t numChannels, int32_t sampleRate, int32_t bitRate, - bool isADTS); + int32_t aacProfile, bool isADTS); void setG711Format(int32_t numChannels); |