diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-07-25 14:21:14 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-07-29 09:40:19 -0700 |
| commit | bd4c4fbb3b073e48963185d11a15da1fa18d2e54 (patch) | |
| tree | 00ebf9a7c78cd47ca27ca22b072142e3b21e7c04 /services/audioflinger/Tracks.cpp | |
| parent | afbbc6c5f6bc470d504dcf24ceb3ac21d57fb78d (diff) | |
| download | frameworks_av-bd4c4fbb3b073e48963185d11a15da1fa18d2e54.zip frameworks_av-bd4c4fbb3b073e48963185d11a15da1fa18d2e54.tar.gz frameworks_av-bd4c4fbb3b073e48963185d11a15da1fa18d2e54.tar.bz2 | |
Remove obsolete TrackBase::step(), mStepCount, mStepServerFailed
Change-Id: I6347096f066b8b19451c6472db7b0671f0cf7702
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 52518ae..ad4db98 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -76,7 +76,6 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( mCblk(NULL), // mBuffer // mBufferEnd - mStepCount(0), mState(IDLE), mSampleRate(sampleRate), mFormat(format), @@ -85,7 +84,6 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( mFrameSize(audio_is_linear_pcm(format) ? mChannelCount * audio_bytes_per_sample(format) : sizeof(int8_t)), mFrameCount(frameCount), - mStepServerFailed(false), mSessionId(sessionId), mIsOut(isOut), mServerProxy(NULL), @@ -395,8 +393,8 @@ void AudioFlinger::PlaybackThread::Track::destroy() /*static*/ void AudioFlinger::PlaybackThread::Track::appendDumpHeader(String8& result) { - result.append(" Name Client Type Fmt Chn mask Session StpCnt fCount S F SRate " - "L dB R dB Server Main buf Aux Buf Flags Underruns\n"); + result.append(" Name Client Type Fmt Chn mask Session fCount S F SRate " + "L dB R dB Server Main buf Aux Buf Flags Underruns\n"); } void AudioFlinger::PlaybackThread::Track::dump(char* buffer, size_t size) @@ -460,14 +458,13 @@ void AudioFlinger::PlaybackThread::Track::dump(char* buffer, size_t size) nowInUnderrun = '?'; break; } - snprintf(&buffer[7], size-7, " %6d %4u 0x%08x 0x%08x %7u %6u %6u %1c %1d %5u %5.2g %5.2g " - "0x%08x 0x%08x 0x%08x %#5x %9u%c\n", + snprintf(&buffer[7], size-7, " %6u %4u %3u %08X %7u %6u %1c %1d %5u %5.2g %5.2g " + "%08X %08X %08X 0x%03X %9u%c\n", (mClient == 0) ? getpid_cached : mClient->pid(), mStreamType, mFormat, mChannelMask, mSessionId, - mStepCount, mFrameCount, stateChar, mFillingUpStatus, @@ -1732,17 +1729,16 @@ void AudioFlinger::RecordThread::RecordTrack::destroy() /*static*/ void AudioFlinger::RecordThread::RecordTrack::appendDumpHeader(String8& result) { - result.append(" Clien Fmt Chn mask Session Step S Serv FrameCount\n"); + result.append("Client Fmt Chn mask Session S Server fCount\n"); } void AudioFlinger::RecordThread::RecordTrack::dump(char* buffer, size_t size) { - snprintf(buffer, size, " %05d %03u 0x%08x %05d %04u %01d %08x %05d\n", + snprintf(buffer, size, "%6u %3u %08X %7u %1d %08X %6u\n", (mClient == 0) ? getpid_cached : mClient->pid(), mFormat, mChannelMask, mSessionId, - mStepCount, mState, mCblk->server, mFrameCount); |