diff options
author | Glenn Kasten <gkasten@google.com> | 2013-12-19 08:56:45 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2013-12-20 08:40:55 -0800 |
commit | 74935e44734c1ec235c2b6677db3e0dbefa5ddb8 (patch) | |
tree | dc7bc2c9f496097e95ff36440fcd79886517ba53 /include | |
parent | bd72d22097f78f5bd668b223bc8c94e351311e31 (diff) | |
download | frameworks_av-74935e44734c1ec235c2b6677db3e0dbefa5ddb8.zip frameworks_av-74935e44734c1ec235c2b6677db3e0dbefa5ddb8.tar.gz frameworks_av-74935e44734c1ec235c2b6677db3e0dbefa5ddb8.tar.bz2 |
Replace control block frameCount_ by explicit in/out parameter
in IAudioFlinger::createTrack and IAudioFlinger::openRecord
Change-Id: I09c644c80e92c8e744b1b99055988a2588b2a83d
Diffstat (limited to 'include')
-rw-r--r-- | include/media/IAudioFlinger.h | 4 | ||||
-rw-r--r-- | include/private/media/AudioTrackShared.h | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 899d79f..85298ec 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -64,7 +64,7 @@ public: uint32_t sampleRate, audio_format_t format, audio_channel_mask_t channelMask, - size_t frameCount, + size_t *pFrameCount, track_flags_t *flags, const sp<IMemory>& sharedBuffer, audio_io_handle_t output, @@ -82,7 +82,7 @@ public: uint32_t sampleRate, audio_format_t format, audio_channel_mask_t channelMask, - size_t frameCount, + size_t *pFrameCount, track_flags_t *flags, pid_t tid, // -1 means unused, otherwise must be valid non-0 int *sessionId, diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index 85862a8..b5a4c0b 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -96,11 +96,7 @@ struct audio_track_cblk_t // The value should be used "for entertainment purposes only", // which means don't make important decisions based on it. - size_t frameCount_; // used during creation to pass actual track buffer size - // from AudioFlinger to client, and not referenced again - // FIXME remove here and replace by createTrack() in/out - // parameter - // renamed to "_" to detect incorrect use + uint32_t mPad1; // unused volatile int32_t mFutex; // event flag: down (P) by client, // up (V) by server or binderDied() or interrupt() |