diff options
author | Glenn Kasten <gkasten@google.com> | 2012-11-13 08:48:57 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-13 08:48:58 -0800 |
commit | 93a7efd45c28becb994f0818ea29c00ec45eea57 (patch) | |
tree | 769ea02675c8956c9e52ba7b24ade6217625f92c /include/private | |
parent | f4fca226d2cb08862d0faa4918e181b3e73f6a0c (diff) | |
parent | 83a0382dc17364567667a4e6135db43f5bd92efc (diff) | |
download | frameworks_av-93a7efd45c28becb994f0818ea29c00ec45eea57.zip frameworks_av-93a7efd45c28becb994f0818ea29c00ec45eea57.tar.gz frameworks_av-93a7efd45c28becb994f0818ea29c00ec45eea57.tar.bz2 |
Merge "Move frame size out of the control block"
Diffstat (limited to 'include/private')
-rw-r--r-- | include/private/media/AudioTrackShared.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index 8ef90c7..ac5372f 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -77,12 +77,9 @@ public: uint32_t sampleRate; - // NOTE: audio_track_cblk_t::frameSize is not equal to AudioTrack::frameSize() for - // 8 bit PCM data: in this case, mCblk->frameSize is based on a sample size of - // 16 bit because data is converted to 16 bit before being stored in buffer + uint8_t mPad2; // unused // read-only for client, server writes once at initialization and is then read-only - uint8_t frameSize; // would normally be size_t, but 8 bits is plenty uint8_t mName; // normal tracks: track name, fast tracks: track index // used by client only @@ -111,7 +108,7 @@ public: // if there is a shared buffer, "buffers" is the value of pointer() for the shared // buffer, otherwise "buffers" points immediately after the control block - void* buffer(void *buffers, uint32_t offset) const; + void* buffer(void *buffers, uint32_t frameSize, uint32_t offset) const; uint32_t framesAvailableIn() { return framesAvailable(false); } uint32_t framesAvailableOut() { return framesAvailable(true); } |