diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-07-12 12:59:20 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-07-30 09:50:48 -0700 |
| commit | d054c32443a493513ab63529b0c8b1aca290278c (patch) | |
| tree | fc68ba259ded1dd4960bee2938a9bcc7c599c9a3 /include | |
| parent | 96f60d8f04432a1ed503b3e24d5736d28c63c9a2 (diff) | |
| download | frameworks_av-d054c32443a493513ab63529b0c8b1aca290278c.zip frameworks_av-d054c32443a493513ab63529b0c8b1aca290278c.tar.gz frameworks_av-d054c32443a493513ab63529b0c8b1aca290278c.tar.bz2 | |
Move control block mName to createTrack() output
This is part of a series of CLs to clean up the shared memory
control block, by removing any fields that don't have to be there.
Change-Id: I6e51003a1293b6800258c31b22cff2eba42162e7
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 1 | ||||
| -rw-r--r-- | include/media/IAudioFlinger.h | 4 | ||||
| -rw-r--r-- | include/private/media/AudioTrackShared.h | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index da13a7f..523bd32 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -726,6 +726,7 @@ protected: sp<AudioTrackClientProxy> mProxy; // primary owner of the memory bool mInUnderrun; // whether track is currently in underrun state + String8 mName; // server's name for this IAudioTrack private: class DeathNotifier : public IBinder::DeathRecipient { diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index de45aa8..82aae62 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -67,6 +67,10 @@ public: audio_io_handle_t output, pid_t tid, // -1 means unused, otherwise must be valid non-0 int *sessionId, + // input: ignored + // output: server's description of IAudioTrack for display in logs. + // Don't attempt to parse, as the format could change. + String8& name, status_t *status) = 0; virtual sp<IAudioRecord> openRecord( diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index c5d8145..6d778dd 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -122,11 +122,9 @@ private: // client write-only, server read-only uint16_t mSendLevel; // Fixed point U4.12 so 0x1000 means 1.0 - uint8_t mPad2; // unused + uint16_t mPad2; // unused public: - // read-only for client, server writes once at initialization and is then read-only - uint8_t mName; // normal tracks: track name, fast tracks: track index volatile int32_t mFlags; // combinations of CBLK_* |