Merge "Fix track estimation for presentation complete" into jb-mr1-dev (9bccfb55) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3275,8 +3275,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac
	// Remove it from the list of active tracks.		// Remove it from the list of active tracks.
	// TODO: use actual buffer filling status instead of latency when available from		// TODO: use actual buffer filling status instead of latency when available from
	// audio HAL		// audio HAL
	size_t audioHALFrames =		size_t audioHALFrames = (latency_l() * mSampleRate) / 1000;
	(mOutput->stream->get_latency(mOutput->stream)*mSampleRate) / 1000;
	size_t framesWritten =		size_t framesWritten =
	mBytesWritten / audio_stream_frame_size(&mOutput->stream->common);		mBytesWritten / audio_stream_frame_size(&mOutput->stream->common);
	if (track->presentationComplete(framesWritten, audioHALFrames)) {		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.		// We have consumed all the buffers of this track.
	// Remove it from the list of active tracks.		// Remove it from the list of active tracks.
	// TODO: implement behavior for compressed audio		// TODO: implement behavior for compressed audio
	size_t audioHALFrames =		size_t audioHALFrames = (latency_l() * mSampleRate) / 1000;
	(mOutput->stream->get_latency(mOutput->stream)*mSampleRate) / 1000;
	size_t framesWritten =		size_t framesWritten =
	mBytesWritten / audio_stream_frame_size(&mOutput->stream->common);		mBytesWritten / audio_stream_frame_size(&mOutput->stream->common);
	if (track->presentationComplete(framesWritten, audioHALFrames)) {		if (track->presentationComplete(framesWritten, audioHALFrames)) {