diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-05-14 15:06:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-14 15:06:01 +0000 |
| commit | deb9081a61b446dbe50461082974a4228899f178 (patch) | |
| tree | c33345fcecaed0e76e22173f5ca1fdfe8286b028 /services/audioflinger/Tracks.cpp | |
| parent | cbe6fddebe3ec84176037de7f9681d2407fa1113 (diff) | |
| parent | 755b0a611f539dfa49e88aac592a938427c7e1b8 (diff) | |
| download | frameworks_av-deb9081a61b446dbe50461082974a4228899f178.zip frameworks_av-deb9081a61b446dbe50461082974a4228899f178.tar.gz frameworks_av-deb9081a61b446dbe50461082974a4228899f178.tar.bz2 | |
Merge "Pull up mFlags and isFastTrack from Track to TrackBase"
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 88ead74..6dc7f30 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -69,6 +69,7 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( const sp<IMemory>& sharedBuffer, int sessionId, int clientUid, + IAudioFlinger::track_flags_t flags, bool isOut, bool useReadOnlyHeap) : RefBase(), @@ -85,6 +86,7 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( mChannelCount * audio_bytes_per_sample(format) : sizeof(int8_t)), mFrameCount(frameCount), mSessionId(sessionId), + mFlags(flags), mIsOut(isOut), mServerProxy(NULL), mId(android_atomic_inc(&nextTrackId)), @@ -349,7 +351,7 @@ AudioFlinger::PlaybackThread::Track::Track( int uid, IAudioFlinger::track_flags_t flags) : TrackBase(thread, client, sampleRate, format, channelMask, frameCount, sharedBuffer, - sessionId, uid, true /*isOut*/), + sessionId, uid, flags, true /*isOut*/), mFillingUpStatus(FS_INVALID), // mRetryCount initialized later when needed mSharedBuffer(sharedBuffer), @@ -359,7 +361,6 @@ AudioFlinger::PlaybackThread::Track::Track( mAuxBuffer(NULL), mAuxEffectId(0), mHasVolumeController(false), mPresentationCompleteFrames(0), - mFlags(flags), mFastIndex(-1), mCachedVolume(1.0), mIsInvalid(false), @@ -1833,10 +1834,11 @@ AudioFlinger::RecordThread::RecordTrack::RecordTrack( size_t frameCount, int sessionId, int uid, - bool isFast) + IAudioFlinger::track_flags_t flags) : TrackBase(thread, client, sampleRate, format, - channelMask, frameCount, 0 /*sharedBuffer*/, sessionId, uid, false /*isOut*/, - isFast /*useReadOnlyHeap*/), + channelMask, frameCount, 0 /*sharedBuffer*/, sessionId, uid, + flags, false /*isOut*/, + (flags & IAudioFlinger::TRACK_FAST) != 0 /*useReadOnlyHeap*/), mOverflow(false), mResampler(NULL), mRsmpOutBuffer(NULL), mRsmpOutFrameCount(0), // See real initialization of mRsmpInFront at RecordThread::start() mRsmpInUnrel(0), mRsmpInFront(0), mFramesToDrop(0), mResamplerBufferProvider(NULL) |