am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1

* commit '20398fac99ff78cb3ec3dd122930e45d409e0524':
  audioflinger: reduce sleep time to avoid underrun

diff --cc services/audioflinger/AudioFlinger.cpp
index 83b0321,aea31a8..18e7a62
--- 1/services/audioflinger/AudioFlinger.cpp
--- 2/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@@ -2031,22 -1958,13 +2039,26 @@@ bool AudioFlinger::MixerThread::threadL
         }
  
          if (LIKELY(mixerStatus == MIXER_TRACKS_READY)) {
 +            // obtain the presentation timestamp of the next output buffer
 +            int64_t pts;
 +            status_t status = INVALID_OPERATION;
 +
 +            if (NULL != mOutput->stream->get_next_write_timestamp) {
 +                status = mOutput->stream->get_next_write_timestamp(
 +                        mOutput->stream, &pts);
 +            }
 +
 +            if (status != NO_ERROR) {
 +                pts = AudioBufferProvider::kInvalidPTS;
 +            }
 +
              // mix buffers...
 -            mAudioMixer->process();
 +            mAudioMixer->process(pts);
              sleepTime = 0;
+             // increase sleep time progressively when application underrun condition clears
+             if (sleepTimeShift > 0) {
+                 sleepTimeShift--;
+             }
              standbyTime = systemTime() + kStandbyTimeInNsecs;
              //TODO: delay standby when effects have a tail
          } else {