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/libmediaplayerservice/MediaPlayerService.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 'media/libmediaplayerservice/MediaPlayerService.h')
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index 04d9e28..66f245d 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -83,7 +83,7 @@ class MediaPlayerService : public BnMediaPlayerService virtual status_t open( uint32_t sampleRate, int channelCount, - int format, int bufferCount, + audio_format_t format, int bufferCount, AudioCallback cb, void *cookie); virtual void start(); @@ -139,7 +139,7 @@ class MediaPlayerService : public BnMediaPlayerService virtual int getSessionId(); virtual status_t open( - uint32_t sampleRate, int channelCount, int format, + uint32_t sampleRate, int channelCount, audio_format_t format, int bufferCount = 1, AudioCallback cb = NULL, void *cookie = NULL); @@ -152,7 +152,7 @@ class MediaPlayerService : public BnMediaPlayerService void setAudioStreamType(int streamType) {} void setVolume(float left, float right) {} uint32_t sampleRate() const { return mSampleRate; } - uint32_t format() const { return (uint32_t)mFormat; } + audio_format_t format() const { return mFormat; } size_t size() const { return mSize; } status_t wait(); @@ -170,7 +170,7 @@ class MediaPlayerService : public BnMediaPlayerService sp<MemoryHeapBase> mHeap; float mMsecsPerFrame; uint16_t mChannelCount; - uint16_t mFormat; + audio_format_t mFormat; ssize_t mFrameCount; uint32_t mSampleRate; uint32_t mSize; @@ -190,8 +190,8 @@ public: virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, int audioSessionId); - virtual sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat); - virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat); + virtual sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat); + virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat); virtual sp<IOMX> getOMX(); virtual status_t dump(int fd, const Vector<String16>& args); |