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 /include | |
| 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 '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 a794e87..4bd111a 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, // On successful return, AudioFlinger takes over the handle @@ -88,7 +88,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() |