diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-01-17 20:00:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-17 20:00:48 +0000 |
| commit | 543140eb709a07bc386eb5f667a4a72e31dba56c (patch) | |
| tree | b48f2d74e75f6de5a8db09ac47eaf9caefc089ff /include | |
| parent | 0ce5ca5e113d58cbcb7cb48615d6dbbf3fbe7c66 (diff) | |
| parent | dd5f4c8c4059f890e81b28b026a688febb4e1dd9 (diff) | |
| download | frameworks_av-543140eb709a07bc386eb5f667a4a72e31dba56c.zip frameworks_av-543140eb709a07bc386eb5f667a4a72e31dba56c.tar.gz frameworks_av-543140eb709a07bc386eb5f667a4a72e31dba56c.tar.bz2 | |
Merge "Move up initialization of mFormat, mStreamType, and mSharedBuffer earlier"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 88a5a4c..e59b0df 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -674,6 +674,7 @@ protected: audio_stream_type_t mStreamType; uint32_t mChannelCount; audio_channel_mask_t mChannelMask; + sp<IMemory> mSharedBuffer; transfer_type mTransfer; // mFrameSize is equal to mFrameSizeAF for non-PCM or 16-bit PCM data. For 8-bit PCM data, it's @@ -715,7 +716,6 @@ protected: bool mRetryOnPartialBuffer; // sleep and retry after partial obtainBuffer() uint32_t mObservedSequence; // last observed value of mSequence - sp<IMemory> mSharedBuffer; uint32_t mLoopPeriod; // in frames, zero means looping is disabled uint32_t mMarkerPosition; // in wrapping (overflow) frame units |