diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-02-25 21:23:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-25 21:23:36 +0000 |
| commit | 7c1b8941bb54e38f2a717e41af0d9565f5977c27 (patch) | |
| tree | 7c5af10bfbea4a9c10356facdc24a9306693fee9 | |
| parent | 6c69333431b2fdd995a1c2eb6f01182155f4a691 (diff) | |
| parent | 5f631515d098c29603cda88f7a7e7580a2d55b57 (diff) | |
| download | frameworks_av-7c1b8941bb54e38f2a717e41af0d9565f5977c27.zip frameworks_av-7c1b8941bb54e38f2a717e41af0d9565f5977c27.tar.gz frameworks_av-7c1b8941bb54e38f2a717e41af0d9565f5977c27.tar.bz2 | |
Merge "Unify comments and whitespace between AudioTrack and AudioRecord"
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 3 | ||||
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index 9c04f17..f2351d5 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -167,6 +167,7 @@ status_t AudioRecord::set( return INVALID_OPERATION; } + // handle default values first. if (inputSource == AUDIO_SOURCE_DEFAULT) { inputSource = AUDIO_SOURCE_MIC; } @@ -511,7 +512,7 @@ status_t AudioRecord::openRecord_l(size_t epoch) mCblkMemory = iMem; audio_track_cblk_t* cblk = static_cast<audio_track_cblk_t*>(iMemPointer); mCblk = cblk; - // note that temp is the (possibly revised) value of mFrameCount + // note that temp is the (possibly revised) value of frameCount if (temp < frameCount || (frameCount == 0 && temp == 0)) { ALOGW("Requested frameCount %u but received frameCount %u", frameCount, temp); } 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(). |