diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-12 10:30:28 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-12 10:30:28 -0800 |
| commit | 4cc55d53d542c4f4ed645738cebb65b9e7eb6c44 (patch) | |
| tree | 417efab1bc349bfaa4bdf7fccdff0e53fb76e7c0 /media/libmedia/mediaplayer.cpp | |
| parent | d5a8bf0bca459389cdb81fdcc30893516bdce951 (diff) | |
| parent | e1c3962e268ffc12bfd1bd9ea84da1f135f36960 (diff) | |
| download | frameworks_av-4cc55d53d542c4f4ed645738cebb65b9e7eb6c44.zip frameworks_av-4cc55d53d542c4f4ed645738cebb65b9e7eb6c44.tar.gz frameworks_av-4cc55d53d542c4f4ed645738cebb65b9e7eb6c44.tar.bz2 | |
Merge "Use audio_format_t consistently"
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 2284927..4be960c 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; |