diff options
| author | Marco Nelissen <marcone@google.com> | 2015-03-22 00:40:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-22 00:40:42 +0000 |
| commit | 76fa9ec3e831ce97aeb2f1aa688972f5b85d9c30 (patch) | |
| tree | ccd88ef9f0cd1fe4d1e3516c77caf448e1cc1a5e /include | |
| parent | 9efdf956cc2eef63fef609375901d6c8df6351b6 (diff) | |
| parent | f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba (diff) | |
| download | frameworks_av-76fa9ec3e831ce97aeb2f1aa688972f5b85d9c30.zip frameworks_av-76fa9ec3e831ce97aeb2f1aa688972f5b85d9c30.tar.gz frameworks_av-76fa9ec3e831ce97aeb2f1aa688972f5b85d9c30.tar.bz2 | |
am f1300d31: am cdf96ffa: Merge "ulaw and alaw aren\'t limited to 8kHz"
* commit 'f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba':
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 aa91485..c1483f3 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -291,7 +291,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, |