diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-01-17 20:15:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-17 20:15:08 +0000 |
| commit | 1071915ad4ffb47825a946706f8fa73c0d22d7f8 (patch) | |
| tree | a67c0a6d91515f0fffb90e102d4897626c5f5d79 /include | |
| parent | 9c1aaa7fee4b17d3675af6108c5ff28f3a84c8ec (diff) | |
| parent | b5ccb2d99b2af400c70777a6452f090ac14f5a96 (diff) | |
| download | frameworks_av-1071915ad4ffb47825a946706f8fa73c0d22d7f8.zip frameworks_av-1071915ad4ffb47825a946706f8fa73c0d22d7f8.tar.gz frameworks_av-1071915ad4ffb47825a946706f8fa73c0d22d7f8.tar.bz2 | |
Merge "Make copy of audio_offload_info_t for future use"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index e59b0df..644e55c 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -661,6 +661,7 @@ protected: audio_track_cblk_t* mCblk; // re-load after mLock.unlock() sp<AudioTrackThread> mAudioTrackThread; + float mVolume[2]; float mSendLevel; mutable uint32_t mSampleRate; // mutable because getSampleRate() can update it. @@ -676,6 +677,8 @@ protected: audio_channel_mask_t mChannelMask; sp<IMemory> mSharedBuffer; transfer_type mTransfer; + audio_offload_info_t mOffloadInfoCopy; + const audio_offload_info_t* mOffloadInfo; // mFrameSize is equal to mFrameSizeAF for non-PCM or 16-bit PCM data. For 8-bit PCM data, it's // twice as large as mFrameSize because data is expanded to 16-bit before it's stored in buffer. |