diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-11 13:47:53 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-02-11 13:53:20 +0000 |
| commit | 1d6fa7af1288b550faabe4ec2cf98684236723db (patch) | |
| tree | a8801ca9a0925ba1faccf17acea4aa78d71a9d29 /services/audioflinger/Tracks.cpp | |
| parent | b82a9f105f89d6b3684c9f626918042bd8977912 (diff) | |
| parent | 566be7c33fc56ae4c34168ecbee5316374f7e3c5 (diff) | |
| download | frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.zip frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.tar.gz frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.tar.bz2 | |
resolved conflicts for merge of 566be7c3 to master
Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index faaa6da..e5152b8 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -502,8 +502,8 @@ void AudioFlinger::PlaybackThread::Track::dump(char* buffer, size_t size, bool a nowInUnderrun = '?'; break; } - snprintf(&buffer[8], size-8, " %6s %6u %4u %08X %08X %7u %6u %1c %1d %5u %5.2g %5.2g " - "%08X %08X %08X 0x%03X %9u%c\n", + snprintf(&buffer[8], size-8, " %6s %6u %4u %08X %08X %7u %6zu %1c %1d %5u %5.2g %5.2g " + "%08X %p %p 0x%03X %9u%c\n", active ? "yes" : "no", (mClient == 0) ? getpid_cached : mClient->pid(), mStreamType, @@ -517,8 +517,8 @@ void AudioFlinger::PlaybackThread::Track::dump(char* buffer, size_t size, bool a 20.0 * log10((vlr & 0xFFFF) / 4096.0), 20.0 * log10((vlr >> 16) / 4096.0), mCblk->mServer, - (int)mMainBuffer, - (int)mAuxBuffer, + mMainBuffer, + mAuxBuffer, mCblk->mFlags, mAudioTrackServerProxy->getUnderrunFrames(), nowInUnderrun); @@ -1873,7 +1873,7 @@ void AudioFlinger::RecordThread::RecordTrack::invalidate() void AudioFlinger::RecordThread::RecordTrack::dump(char* buffer, size_t size, bool active) { - snprintf(buffer, size, " %6s %6u %3u %08X %7u %1d %08X %6u\n", + snprintf(buffer, size, " %6s %6u %3u %08X %7u %1d %08X %6zu\n", active ? "yes" : "no", (mClient == 0) ? getpid_cached : mClient->pid(), mFormat, |