diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-07 02:26:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 02:26:36 +0000 |
| commit | e857b65c1d3aa055281cb48f59c9b5eb4a062dd0 (patch) | |
| tree | 9d0780a2aebbb8839ec74fe16b1b868e6d45e3e9 /services/audioflinger/AudioFlinger.cpp | |
| parent | ce9be73c7e7f379d68e1a0d0210a6f7b9418269f (diff) | |
| parent | 3c9130a8a12ce962dc8d22e04243b135b9e98b01 (diff) | |
| download | frameworks_av-e857b65c1d3aa055281cb48f59c9b5eb4a062dd0.zip frameworks_av-e857b65c1d3aa055281cb48f59c9b5eb4a062dd0.tar.gz frameworks_av-e857b65c1d3aa055281cb48f59c9b5eb4a062dd0.tar.bz2 | |
am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"
* commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index acbd19a..26dac95 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1012,7 +1012,7 @@ size_t AudioFlinger::getInputBufferSize(uint32_t sampleRate, audio_format_t form return size; } -unsigned int AudioFlinger::getInputFramesLost(audio_io_handle_t ioHandle) const +uint32_t AudioFlinger::getInputFramesLost(audio_io_handle_t ioHandle) const { Mutex::Autolock _l(mLock); @@ -1044,7 +1044,7 @@ status_t AudioFlinger::setVoiceVolume(float value) return ret; } -status_t AudioFlinger::getRenderPosition(size_t *halFrames, size_t *dspFrames, +status_t AudioFlinger::getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames, audio_io_handle_t output) const { status_t status; |