diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-01-24 16:13:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-24 16:13:51 +0000 |
| commit | f0002d142e6d24c5438600b2c259679de710f8ac (patch) | |
| tree | 20e5013fa14f2d5339868c1b08396f7b852a2123 /services/audioflinger/AudioFlinger.h | |
| parent | c69b91ceae6255e41c5413796fb0ed4f7af45b15 (diff) | |
| parent | 74935e44734c1ec235c2b6677db3e0dbefa5ddb8 (diff) | |
| download | frameworks_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.h')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 0ab43e0..e0d1404 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -102,7 +102,7 @@ public: uint32_t sampleRate, audio_format_t format, audio_channel_mask_t channelMask, - size_t frameCount, + size_t *pFrameCount, IAudioFlinger::track_flags_t *flags, const sp<IMemory>& sharedBuffer, audio_io_handle_t output, @@ -117,7 +117,7 @@ public: uint32_t sampleRate, audio_format_t format, audio_channel_mask_t channelMask, - size_t frameCount, + size_t *pFrameCount, IAudioFlinger::track_flags_t *flags, pid_t tid, int *sessionId, |