summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioSystem.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-01-17 16:33:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-17 16:33:35 +0000
commit6a507298357c9ff869b97db57a890e58bd6bdec0 (patch)
tree7063a78765b7fd214a747fda6a7cfa4eaa939b89 /media/libmedia/AudioSystem.cpp
parent32a7e0a5f7b000951b9adb80b17796f35b024816 (diff)
parent5f972c031d4061f4f037c9fda1ea4bd9b6a756cd (diff)
downloadframeworks_av-6a507298357c9ff869b97db57a890e58bd6bdec0.zip
frameworks_av-6a507298357c9ff869b97db57a890e58bd6bdec0.tar.gz
frameworks_av-6a507298357c9ff869b97db57a890e58bd6bdec0.tar.bz2
Merge "AudioRecord::getInputFramesLost() cleanup"
Diffstat (limited to 'media/libmedia/AudioSystem.cpp')
-rw-r--r--media/libmedia/AudioSystem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
index 69d9273..dcb72f8 100644
--- a/media/libmedia/AudioSystem.cpp
+++ b/media/libmedia/AudioSystem.cpp
@@ -413,9 +413,9 @@ status_t AudioSystem::getRenderPosition(audio_io_handle_t output, size_t *halFra
return af->getRenderPosition(halFrames, dspFrames, output);
}
-size_t AudioSystem::getInputFramesLost(audio_io_handle_t ioHandle) {
+uint32_t AudioSystem::getInputFramesLost(audio_io_handle_t ioHandle) {
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
- unsigned int result = 0;
+ uint32_t result = 0;
if (af == 0) return result;
if (ioHandle == 0) return result;