diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2012-10-16 11:34:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-16 11:34:52 -0700 |
| commit | ca794bc9fb43f24addff4c1915d397269d1568ab (patch) | |
| tree | c5f5fdf6fcda6ad0cc31f4d7a96855966671b301 /services | |
| parent | a15809ee0dbfd82afd28c4ea2014f682934857b1 (diff) | |
| parent | bb14027200efa61b1c6a84bc93206f79c4237c4a (diff) | |
| download | frameworks_av-ca794bc9fb43f24addff4c1915d397269d1568ab.zip frameworks_av-ca794bc9fb43f24addff4c1915d397269d1568ab.tar.gz frameworks_av-ca794bc9fb43f24addff4c1915d397269d1568ab.tar.bz2 | |
am aa00830e: am bbe11e46: Merge "Fix track estimation for presentation complete" into jb-mr1-dev
* commit 'aa00830e46cb7494af7217246788c1bca83b1d04':
Fix track estimation for presentation complete
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index aa30864..6a35053 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -3275,8 +3275,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac // Remove it from the list of active tracks. // TODO: use actual buffer filling status instead of latency when available from // audio HAL - size_t audioHALFrames = - (mOutput->stream->get_latency(mOutput->stream)*mSampleRate) / 1000; + size_t audioHALFrames = (latency_l() * mSampleRate) / 1000; size_t framesWritten = mBytesWritten / audio_stream_frame_size(&mOutput->stream->common); if (track->presentationComplete(framesWritten, audioHALFrames)) { @@ -3799,8 +3798,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep // We have consumed all the buffers of this track. // Remove it from the list of active tracks. // TODO: implement behavior for compressed audio - size_t audioHALFrames = - (mOutput->stream->get_latency(mOutput->stream)*mSampleRate) / 1000; + size_t audioHALFrames = (latency_l() * mSampleRate) / 1000; size_t framesWritten = mBytesWritten / audio_stream_frame_size(&mOutput->stream->common); if (track->presentationComplete(framesWritten, audioHALFrames)) { |