diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-12 22:53:28 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-12 22:53:28 -0800 |
| commit | 583892d0185d102f3c9ca69ea48fe38af31ecd31 (patch) | |
| tree | 81d50ceb87a4f1f7a1d61bd75480619580c5c5d5 /media/libmedia | |
| parent | 1aaa563c2cb0df3f414aa0cfc13f9ae7b457dc49 (diff) | |
| parent | 2b584244930c9de0e3bc46898a801e9ccb731900 (diff) | |
| download | frameworks_av-583892d0185d102f3c9ca69ea48fe38af31ecd31.zip frameworks_av-583892d0185d102f3c9ca69ea48fe38af31ecd31.tar.gz frameworks_av-583892d0185d102f3c9ca69ea48fe38af31ecd31.tar.bz2 | |
Merge change Iad79689a into eclair
* changes:
Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 8529a8e..cedd79d 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -318,26 +318,35 @@ void AudioTrack::start() } if (android_atomic_or(1, &mActive) == 0) { - audio_io_handle_t output = AudioTrack::getOutput(); + audio_io_handle_t output = getOutput(); + AudioSystem::startOutput(output, (AudioSystem::stream_type)mStreamType); + mNewPosition = mCblk->server + mUpdatePeriod; + mCblk->bufferTimeoutMs = MAX_STARTUP_TIMEOUT_MS; + mCblk->waitTimeMs = 0; + if (t != 0) { + t->run("AudioTrackThread", THREAD_PRIORITY_AUDIO_CLIENT); + } else { + setpriority(PRIO_PROCESS, 0, THREAD_PRIORITY_AUDIO_CLIENT); + } + status_t status = mAudioTrack->start(); if (status == DEAD_OBJECT) { LOGV("start() dead IAudioTrack: creating a new one"); status = createTrack(mStreamType, mCblk->sampleRate, mFormat, mChannelCount, mFrameCount, mFlags, mSharedBuffer, output); - } - if (status == NO_ERROR) { - AudioSystem::startOutput(output, (AudioSystem::stream_type)mStreamType); mNewPosition = mCblk->server + mUpdatePeriod; mCblk->bufferTimeoutMs = MAX_STARTUP_TIMEOUT_MS; mCblk->waitTimeMs = 0; + } + if (status != NO_ERROR) { + LOGV("start() failed"); + android_atomic_and(~1, &mActive); if (t != 0) { - t->run("AudioTrackThread", THREAD_PRIORITY_AUDIO_CLIENT); + t->requestExit(); } else { - setpriority(PRIO_PROCESS, 0, THREAD_PRIORITY_AUDIO_CLIENT); + setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_NORMAL); } - } else { - LOGV("start() failed"); - android_atomic_and(~1, &mActive); + AudioSystem::stopOutput(output, (AudioSystem::stream_type)mStreamType); } } |