diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-03-04 22:38:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-04 22:38:34 +0000 |
| commit | d573622dc001c23223cb26b1f55fb75be189e77d (patch) | |
| tree | 48ed99063098b017143f92560fe2eeabed8e8dc5 /services/audioflinger/Threads.cpp | |
| parent | 8602e5501a653a00e2f82d6fd3f7558382fea1dd (diff) | |
| parent | c9b2e20f7c9a71e07ef398152709c76079decbcd (diff) | |
| download | frameworks_av-d573622dc001c23223cb26b1f55fb75be189e77d.zip frameworks_av-d573622dc001c23223cb26b1f55fb75be189e77d.tar.gz frameworks_av-d573622dc001c23223cb26b1f55fb75be189e77d.tar.bz2 | |
Merge "Miscellaneous cleanup" into jb-mr2-dev
Diffstat (limited to 'services/audioflinger/Threads.cpp')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index ec8ffa0..9d98f0b 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -2795,7 +2795,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac // No buffers for this track. Give it a few chances to // fill a buffer, then remove it from active list. if (--(track->mRetryCount) <= 0) { - ALOGV("BUFFER TIMEOUT: remove(%d) from active list on thread %p", name, this); + ALOGI("BUFFER TIMEOUT: remove(%d) from active list on thread %p", name, this); tracksToRemove->add(track); // indicate to client process that the track was disabled because of underrun; // it will then automatically call start() when data is available @@ -3725,7 +3725,8 @@ bool AudioFlinger::RecordThread::threadLoop() readInto = mRsmpInBuffer; mRsmpInIndex = 0; } - mBytesRead = mInput->stream->read(mInput->stream, readInto, mInputBytes); + mBytesRead = mInput->stream->read(mInput->stream, readInto, + mInputBytes); if (mBytesRead <= 0) { if ((mBytesRead < 0) && (mActiveTrack->mState == TrackBase::ACTIVE)) { |