diff options
| author | Simon Wilson <simonwilson@google.com> | 2012-11-29 15:26:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-29 15:26:49 -0800 |
| commit | e8cb004257565111cb261f3e9c786adba881859a (patch) | |
| tree | 4b2771e072eb073abf52d558d1cb48df45b00a1f /services | |
| parent | a4e441095b217af3cfe68e2f8c5ec6cf188a901a (diff) | |
| parent | 7a90bc9265782788675af577c7b1c56e5d5be709 (diff) | |
| download | frameworks_av-e8cb004257565111cb261f3e9c786adba881859a.zip frameworks_av-e8cb004257565111cb261f3e9c786adba881859a.tar.gz frameworks_av-e8cb004257565111cb261f3e9c786adba881859a.tar.bz2 | |
Merge "Use ATRACE macros instead of Tracer statics"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/FastMixer.cpp | 4 | ||||
| -rw-r--r-- | services/audioflinger/Threads.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index 3c8a256..2160ea3 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -425,11 +425,11 @@ bool FastMixer::threadLoop() // but this code should be modified to handle both non-blocking and blocking sinks dumpState->mWriteSequence++; #if defined(ATRACE_TAG) && (ATRACE_TAG != ATRACE_TAG_NEVER) - Tracer::traceBegin(ATRACE_TAG, "write"); + ATRACE_BEGIN("write"); #endif ssize_t framesWritten = outputSink->write(mixBuffer, frameCount); #if defined(ATRACE_TAG) && (ATRACE_TAG != ATRACE_TAG_NEVER) - Tracer::traceEnd(ATRACE_TAG); + ATRACE_END(); #endif dumpState->mWriteSequence++; if (framesWritten >= 0) { diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 1ceb850..6cada0a 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1653,7 +1653,7 @@ void AudioFlinger::PlaybackThread::threadLoop_write() #define mBitShift 2 // FIXME size_t count = mixBufferSize >> mBitShift; #if defined(ATRACE_TAG) && (ATRACE_TAG != ATRACE_TAG_NEVER) - Tracer::traceBegin(ATRACE_TAG, "write"); + ATRACE_BEGIN("write"); #endif // update the setpoint when AudioFlinger::mScreenState changes uint32_t screenState = AudioFlinger::mScreenState; @@ -1667,7 +1667,7 @@ void AudioFlinger::PlaybackThread::threadLoop_write() } ssize_t framesWritten = mNormalSink->write(mMixBuffer, count); #if defined(ATRACE_TAG) && (ATRACE_TAG != ATRACE_TAG_NEVER) - Tracer::traceEnd(ATRACE_TAG); + ATRACE_END(); #endif if (framesWritten > 0) { bytesWritten = framesWritten << mBitShift; |