diff options
| author | Marco Nelissen <marcone@google.com> | 2015-03-20 19:23:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 19:23:13 +0000 |
| commit | f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba (patch) | |
| tree | ec0f96c66e44c39e83800bb7a02792ab57781e99 /include | |
| parent | 76b54aa5240ee2052aabe7b671965a0836159fdb (diff) | |
| parent | cdf96ffa2693a1ae15d9b76cc24548764353d64f (diff) | |
| download | frameworks_av-f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba.zip frameworks_av-f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba.tar.gz frameworks_av-f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba.tar.bz2 | |
am cdf96ffa: Merge "ulaw and alaw aren\'t limited to 8kHz"
* commit 'cdf96ffa2693a1ae15d9b76cc24548764353d64f':
ulaw and alaw aren't limited to 8kHz
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 595ace8..cd2bd27 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -290,7 +290,7 @@ private: OMX_U32 portIndex, OMX_AUDIO_CODINGTYPE desiredFormat); status_t setupAMRCodec(bool encoder, bool isWAMR, int32_t bitRate); - status_t setupG711Codec(bool encoder, int32_t numChannels); + status_t setupG711Codec(bool encoder, int32_t sampleRate, int32_t numChannels); status_t setupFlacCodec( bool encoder, int32_t numChannels, int32_t sampleRate, int32_t compressionLevel); diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index e341160..84b1b1a 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -250,7 +250,7 @@ private: status_t setAC3Format(int32_t numChannels, int32_t sampleRate); - void setG711Format(int32_t numChannels); + void setG711Format(int32_t sampleRate, int32_t numChannels); status_t setVideoPortFormatType( OMX_U32 portIndex, |