summaryrefslogtreecommitdiffstats
path: root/services/audioflinger
diff options
context:
space:
mode:
authorSimon Wilson <simonwilson@google.com>2012-11-29 15:18:50 -0800
committerSimon Wilson <simonwilson@google.com>2012-11-29 15:19:46 -0800
commit2d590964aa58e137d17a43e095e6443dd0fe2e98 (patch)
tree6327d555b89f3e7222f6db7aa1a0c3a8f0b293c6 /services/audioflinger
parentc67d057596d81aea8fcd4868453cfcb501157297 (diff)
downloadframeworks_av-2d590964aa58e137d17a43e095e6443dd0fe2e98.zip
frameworks_av-2d590964aa58e137d17a43e095e6443dd0fe2e98.tar.gz
frameworks_av-2d590964aa58e137d17a43e095e6443dd0fe2e98.tar.bz2
Use ATRACE macros instead of Tracer statics
ATRACE_BEGIN and ATRACE_END have replaced the static Tracer::traceBegin and Tracer::traceEnd functions, so use them instead. Fixes compilation errors when tracing is enabled. Change-Id: I4d1147d2f76afcdf113e9986f0544cb848802b15
Diffstat (limited to 'services/audioflinger')
-rw-r--r--services/audioflinger/FastMixer.cpp4
-rw-r--r--services/audioflinger/Threads.cpp4
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;