summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-03-07 02:26:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 02:26:36 +0000
commite857b65c1d3aa055281cb48f59c9b5eb4a062dd0 (patch)
tree9d0780a2aebbb8839ec74fe16b1b868e6d45e3e9 /include
parentce9be73c7e7f379d68e1a0d0210a6f7b9418269f (diff)
parent3c9130a8a12ce962dc8d22e04243b135b9e98b01 (diff)
downloadframeworks_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 'include')
-rw-r--r--include/media/AudioSystem.h4
-rw-r--r--include/media/IAudioFlinger.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index 225ef76..4c22412 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -127,8 +127,8 @@ public:
// NOTE: this feature is not supported on all hardware platforms and it is
// necessary to check returned status before using the returned values.
static status_t getRenderPosition(audio_io_handle_t output,
- size_t *halFrames,
- size_t *dspFrames,
+ uint32_t *halFrames,
+ uint32_t *dspFrames,
audio_stream_type_t stream = AUDIO_STREAM_DEFAULT);
// return the number of input frames lost by HAL implementation, or 0 if the handle is invalid
diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h
index 899d79f..282f275 100644
--- a/include/media/IAudioFlinger.h
+++ b/include/media/IAudioFlinger.h
@@ -167,10 +167,10 @@ public:
virtual status_t setVoiceVolume(float volume) = 0;
- virtual status_t getRenderPosition(size_t *halFrames, size_t *dspFrames,
+ virtual status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames,
audio_io_handle_t output) const = 0;
- virtual size_t getInputFramesLost(audio_io_handle_t ioHandle) const = 0;
+ virtual uint32_t getInputFramesLost(audio_io_handle_t ioHandle) const = 0;
virtual int newAudioSessionId() = 0;