diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-22 11:06:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-22 11:06:49 -0700 |
| commit | a411f779465504ff3e1a59c8ffa43d18385852b8 (patch) | |
| tree | a152f05bd2b5dd70ee5bfaa261fcbdeb5ee6d8ac /media | |
| parent | a98478bfbcc0f7fb4b164d3dce40ca96df75667d (diff) | |
| parent | 291f4d505aff81969e6666049d3cc3446f836af2 (diff) | |
| download | frameworks_av-a411f779465504ff3e1a59c8ffa43d18385852b8.zip frameworks_av-a411f779465504ff3e1a59c8ffa43d18385852b8.tar.gz frameworks_av-a411f779465504ff3e1a59c8ffa43d18385852b8.tar.bz2 | |
Merge "Remove enforceFrameCount"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 55cd3ad..50fbf36 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -261,8 +261,7 @@ status_t AudioTrack::set( frameCount, flags, sharedBuffer, - output, - true); + output); if (status != NO_ERROR) { return status; @@ -741,8 +740,7 @@ status_t AudioTrack::createTrack_l( int frameCount, audio_policy_output_flags_t flags, const sp<IMemory>& sharedBuffer, - audio_io_handle_t output, - bool enforceFrameCount) + audio_io_handle_t output) { status_t status; const sp<IAudioFlinger>& audioFlinger = AudioSystem::get_audio_flinger(); @@ -789,7 +787,8 @@ status_t AudioTrack::createTrack_l( mNotificationFramesAct = frameCount/2; } if (frameCount < minFrameCount) { - ALOGW_IF(enforceFrameCount, "Minimum buffer size corrected from %d to %d", + // not ALOGW because it happens all the time when playing key clicks over A2DP + ALOGV("Minimum buffer size corrected from %d to %d", frameCount, minFrameCount); frameCount = minFrameCount; } @@ -1249,8 +1248,7 @@ status_t AudioTrack::restoreTrack_l(audio_track_cblk_t*& cblk, bool fromStart) mFrameCount, mFlags, mSharedBuffer, - getOutput_l(), - false); + getOutput_l()); if (result == NO_ERROR) { uint32_t user = cblk->user; |