summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-01-13 10:26:32 -0800
committerGlenn Kasten <gkasten@google.com>2014-01-16 17:03:08 -0800
commitdd5f4c8c4059f890e81b28b026a688febb4e1dd9 (patch)
treef109b6d755352250744e91b22ca1eb567aeacd25 /include/media
parent0cde076ddb283c84c3801a2df4cc3df99bd1577f (diff)
downloadframeworks_av-dd5f4c8c4059f890e81b28b026a688febb4e1dd9.zip
frameworks_av-dd5f4c8c4059f890e81b28b026a688febb4e1dd9.tar.gz
frameworks_av-dd5f4c8c4059f890e81b28b026a688febb4e1dd9.tar.bz2
Move up initialization of mFormat, mStreamType, and mSharedBuffer earlier
This will allow removal of most of the parameter list to createTrack_l. Also check for valid stream type at client so we can log a better error message. Change-Id: Ia7176896d47fbb49106119fca26d9de8e7efe859
Diffstat (limited to 'include/media')
-rw-r--r--include/media/AudioTrack.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index c86a67b..789d255 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
bool mMarkerReached;