diff options
| author | Marco Nelissen <marcone@google.com> | 2015-03-20 09:15:11 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-03-20 09:15:11 -0700 |
| commit | 17c39e708ed657b8fa66f8acce5128e51696915c (patch) | |
| tree | ec0f96c66e44c39e83800bb7a02792ab57781e99 /include | |
| parent | 340cebdaa2875ba2ab9725b81218ebc59d84164b (diff) | |
| download | frameworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.zip frameworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.tar.gz frameworks_av-17c39e708ed657b8fa66f8acce5128e51696915c.tar.bz2 | |
ulaw and alaw aren't limited to 8kHz
Bug: https://code.google.com/p/android/issues/detail?id=158490
Change-Id: Ib30e156c99a997db861bb85e17244a5effdd55cf
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, |