diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-11-07 14:03:00 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-11-14 11:58:17 -0800 |
| commit | 22eb4e239fbe9103568147d566d7482e480350b8 (patch) | |
| tree | 132fa6ac8c0bc47fd6d3b1cc67d1724dc3b939a2 /include | |
| parent | 2d81f665461409f0c5d0be674a35a0aea63a4fc8 (diff) | |
| download | frameworks_av-22eb4e239fbe9103568147d566d7482e480350b8.zip frameworks_av-22eb4e239fbe9103568147d566d7482e480350b8.tar.gz frameworks_av-22eb4e239fbe9103568147d566d7482e480350b8.tar.bz2 | |
Update audio comments
Change-Id: I85d7d2f6381b251db5695202fec75128883a8662
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 9 | ||||
| -rw-r--r-- | include/private/media/AudioTrackShared.h | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 3504f1f..b82f814 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -422,6 +422,7 @@ public: * After error return: * frameCount 0 * size 0 + * raw undefined * After successful return: * frameCount actual number of frames available, <= number requested * size actual number of bytes available @@ -510,7 +511,13 @@ protected: uint32_t mFrameCount; audio_track_cblk_t* mCblk; // re-load after mLock.unlock() - void* mBuffers; // starting address of buffers in shared memory + + // Starting address of buffers in shared memory. If there is a shared buffer, mBuffers + // is the value of pointer() for the shared buffer, otherwise mBuffers points + // immediately after the control block. This address is for the mapping within client + // address space. AudioFlinger::TrackBase::mBuffer is for the server address space. + void* mBuffers; + audio_format_t mFormat; audio_stream_type_t mStreamType; uint8_t mChannelCount; diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index 3063448..bbc5e26 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -54,9 +54,10 @@ struct audio_track_cblk_t uint32_t serverBase; int mPad1; // unused, but preserves cache line alignment + uint32_t frameCount; - // Cache line boundary + // Cache line boundary (32 bytes) uint32_t loopStart; uint32_t loopEnd; // read-only for server, read/write for client |