summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrack.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-02-24 15:16:07 -0800
committerGlenn Kasten <gkasten@google.com>2014-02-24 17:21:41 -0800
commit5f631515d098c29603cda88f7a7e7580a2d55b57 (patch)
tree74b2b5ec4b6aeddeffcb6c04c833a3d4030660dd /media/libmedia/AudioTrack.cpp
parente3247bf8dd4f8fa8dfa3a108260241ae4a967569 (diff)
downloadframeworks_av-5f631515d098c29603cda88f7a7e7580a2d55b57.zip
frameworks_av-5f631515d098c29603cda88f7a7e7580a2d55b57.tar.gz
frameworks_av-5f631515d098c29603cda88f7a7e7580a2d55b57.tar.bz2
Unify comments and whitespace between AudioTrack and AudioRecord
Change-Id: I5320a6b2d7f7077cb12d7da4f2ca30a940100bf2
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
-rw-r--r--media/libmedia/AudioTrack.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 0eb0915..eed7a0b 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -1039,6 +1039,7 @@ status_t AudioTrack::createTrack_l(size_t epoch)
mDeathNotifier.clear();
}
mAudioTrack = track;
+
mCblkMemory = iMem;
audio_track_cblk_t* cblk = static_cast<audio_track_cblk_t*>(iMemPointer);
mCblk = cblk;
@@ -1050,6 +1051,7 @@ status_t AudioTrack::createTrack_l(size_t epoch)
ALOGW("Requested frameCount %u but received frameCount %u", frameCount, temp);
}
frameCount = temp;
+
mAwaitBoost = false;
if (mFlags & AUDIO_OUTPUT_FLAG_FAST) {
if (trackFlags & IAudioFlinger::TRACK_FAST) {
@@ -1103,6 +1105,7 @@ status_t AudioTrack::createTrack_l(size_t epoch)
mAudioTrack->attachAuxEffect(mAuxEffectId);
// FIXME don't believe this lie
mLatency = afLatency + (1000*frameCount) / mSampleRate;
+
mFrameCount = frameCount;
// If IAudioTrack is re-created, don't let the requested frameCount
// decrease. This can confuse clients that cache frameCount().