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 /include/media/IMediaPlayerService.h | |
| 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 'include/media/IMediaPlayerService.h')
| -rw-r--r-- | include/media/IMediaPlayerService.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h index 93bbe13..4f46fcd 100644 --- a/include/media/IMediaPlayerService.h +++ b/include/media/IMediaPlayerService.h @@ -23,6 +23,7 @@ #include <utils/String8.h> #include <binder/IInterface.h> #include <binder/Parcel.h> +#include <system/audio.h> #include <media/IMediaPlayerClient.h> #include <media/IMediaPlayer.h> @@ -43,8 +44,8 @@ public: virtual sp<IMediaMetadataRetriever> createMetadataRetriever(pid_t pid) = 0; virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, int audioSessionId = 0) = 0; - virtual sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) = 0; - virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) = 0; + virtual sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat) = 0; + virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat) = 0; virtual sp<IOMX> getOMX() = 0; // codecs and audio devices usage tracking for the battery app |