summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-01-24 16:13:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-24 16:13:51 +0000
commitf0002d142e6d24c5438600b2c259679de710f8ac (patch)
tree20e5013fa14f2d5339868c1b08396f7b852a2123 /services/audioflinger/AudioFlinger.cpp
parentc69b91ceae6255e41c5413796fb0ed4f7af45b15 (diff)
parent74935e44734c1ec235c2b6677db3e0dbefa5ddb8 (diff)
downloadframeworks_av-f0002d142e6d24c5438600b2c259679de710f8ac.zip
frameworks_av-f0002d142e6d24c5438600b2c259679de710f8ac.tar.gz
frameworks_av-f0002d142e6d24c5438600b2c259679de710f8ac.tar.bz2
Merge "Replace control block frameCount_ by explicit in/out parameter"
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
-rw-r--r--services/audioflinger/AudioFlinger.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 1257161..f9cc17b 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -481,7 +481,7 @@ sp<IAudioTrack> AudioFlinger::createTrack(
uint32_t sampleRate,
audio_format_t format,
audio_channel_mask_t channelMask,
- size_t frameCount,
+ size_t *frameCount,
IAudioFlinger::track_flags_t *flags,
const sp<IMemory>& sharedBuffer,
audio_io_handle_t output,
@@ -1277,7 +1277,7 @@ sp<IAudioRecord> AudioFlinger::openRecord(
uint32_t sampleRate,
audio_format_t format,
audio_channel_mask_t channelMask,
- size_t frameCount,
+ size_t *frameCount,
IAudioFlinger::track_flags_t *flags,
pid_t tid,
int *sessionId,