diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-04 09:36:37 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-01-05 13:34:54 -0800 |
| commit | e1c3962e268ffc12bfd1bd9ea84da1f135f36960 (patch) | |
| tree | d24fac9434dbe5808a6c31a50414da7b5ce47c9a /media/libmedia/mediaplayer.cpp | |
| parent | a2a0a5d7d56baa831870f4bf2a0d942a477d92ef (diff) | |
| download | frameworks_av-e1c3962e268ffc12bfd1bd9ea84da1f135f36960.zip frameworks_av-e1c3962e268ffc12bfd1bd9ea84da1f135f36960.tar.gz frameworks_av-e1c3962e268ffc12bfd1bd9ea84da1f135f36960.tar.bz2 | |
Use audio_format_t consistently
Was int, uint32_t, uint16_t, and uint8_t with 2-bit bitfield.
Also replace 0 by AUDIO_FORMAT_DEFAULT and replace 1 by
AUDIO_FORMAT_PCM_16_BIT.
Change-Id: Ia8804f53f1725669e368857d5bb2044917e17975
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 695c4a8..92f3eb9 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -709,7 +709,7 @@ void MediaPlayer::notify(int msg, int ext1, int ext2, const Parcel *obj) } } -/*static*/ sp<IMemory> MediaPlayer::decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) +/*static*/ sp<IMemory> MediaPlayer::decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat) { ALOGV("decode(%s)", url); sp<IMemory> p; @@ -729,7 +729,7 @@ void MediaPlayer::died() notify(MEDIA_ERROR, MEDIA_ERROR_SERVER_DIED, 0); } -/*static*/ sp<IMemory> MediaPlayer::decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) +/*static*/ sp<IMemory> MediaPlayer::decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat) { ALOGV("decode(%d, %lld, %lld)", fd, offset, length); sp<IMemory> p; |