diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-11 13:41:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-11 13:41:54 +0000 |
| commit | 566be7c33fc56ae4c34168ecbee5316374f7e3c5 (patch) | |
| tree | 6a7f5163818f67bee2bcbeffc5f9c2f12e9aa49d /media/libmedia/AudioSystem.cpp | |
| parent | 66e05682e4e5d52673b11e7950c0559532f4b6cb (diff) | |
| parent | 3c9130a8a12ce962dc8d22e04243b135b9e98b01 (diff) | |
| download | frameworks_av-566be7c33fc56ae4c34168ecbee5316374f7e3c5.zip frameworks_av-566be7c33fc56ae4c34168ecbee5316374f7e3c5.tar.gz frameworks_av-566be7c33fc56ae4c34168ecbee5316374f7e3c5.tar.bz2 | |
am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"
* commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 8033c2c..cc5b810 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -370,8 +370,8 @@ status_t AudioSystem::setVoiceVolume(float value) return af->setVoiceVolume(value); } -status_t AudioSystem::getRenderPosition(audio_io_handle_t output, size_t *halFrames, - size_t *dspFrames, audio_stream_type_t stream) +status_t AudioSystem::getRenderPosition(audio_io_handle_t output, uint32_t *halFrames, + uint32_t *dspFrames, audio_stream_type_t stream) { const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger(); if (af == 0) return PERMISSION_DENIED; |