diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-08-05 22:44:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-05 00:29:22 +0000 |
| commit | 3c9879b980ad195797543ce237ecbe479267e16f (patch) | |
| tree | e6ffdab9fe1fb81dfb1ba381bbe96f06baefb0fc /include | |
| parent | e46711343b43786c049a007369a72c1c78e6c5db (diff) | |
| parent | b97cc6a9a3c81215e365c61b071a932073b56ff2 (diff) | |
| download | frameworks_av-3c9879b980ad195797543ce237ecbe479267e16f.zip frameworks_av-3c9879b980ad195797543ce237ecbe479267e16f.tar.gz frameworks_av-3c9879b980ad195797543ce237ecbe479267e16f.tar.bz2 | |
Merge "AAC encoder: add support for SBR mode selection" into lmp-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 7e4a1d9..a68adea 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -251,7 +251,7 @@ private: status_t setupAACCodec( bool encoder, int32_t numChannels, int32_t sampleRate, int32_t bitRate, - int32_t aacProfile, bool isADTS); + int32_t aacProfile, bool isADTS, int32_t sbrMode); status_t setupAC3Codec(bool encoder, int32_t numChannels, int32_t sampleRate); |