diff options
| author | Andreas Huber <andih@google.com> | 2009-12-01 17:10:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-01 17:10:19 -0800 |
| commit | baeb6dddd1b848320457b9af8c5eb415b43f181a (patch) | |
| tree | 680365164233fcebf8ebca13347a2edf43fb0d9f /include | |
| parent | ab762493da1f36e41ba6239bd5b8fa1b8af293fa (diff) | |
| parent | c297fccffc4ab1cb3b9f5c6a5b0802be057f3e0f (diff) | |
| download | frameworks_av-baeb6dddd1b848320457b9af8c5eb415b43f181a.zip frameworks_av-baeb6dddd1b848320457b9af8c5eb415b43f181a.tar.gz frameworks_av-baeb6dddd1b848320457b9af8c5eb415b43f181a.tar.bz2 | |
am 781ac162: Merge change I8768f2cc into eclair-mr2
Merge commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb' into eclair-mr2-plus-aosp
* commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb':
A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 4c60623..4199252 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -146,8 +146,7 @@ private: void setComponentRole(); - void setAMRFormat(); - void setAMRWBFormat(); + void setAMRFormat(bool isWAMR); void setAACFormat(int32_t numChannels, int32_t sampleRate); status_t setVideoPortFormatType( |