diff options
| author | Eric Laurent <elaurent@google.com> | 2018-11-20 14:54:31 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2018-12-04 12:06:37 -0800 |
| commit | 973db02ac18fa1de9ce6221f47b01af1bdc4bec2 (patch) | |
| tree | e2dda15a881c963a14520117128b5b9857834759 /services/audioflinger/Tracks.cpp | |
| parent | f4a342abd2959904caa18b5a0671e8107581ff24 (diff) | |
| download | frameworks_av-973db02ac18fa1de9ce6221f47b01af1bdc4bec2.tar.gz frameworks_av-973db02ac18fa1de9ce6221f47b01af1bdc4bec2.tar.bz2 frameworks_av-973db02ac18fa1de9ce6221f47b01af1bdc4bec2.zip | |
audio flinger: return port ID as track ID to client
Return the port ID allocated by audio policy manager instead of the
internal track ID allocated by audio flinger when an AudioTrack or
AudioRecord is created.
This information is more useful for logs and allows to associate information coming
from audiopolicy manager with a specific client instance.
Bug: 111438757
Test: Manual playback and capture tests
Change-Id: Ib467d8fcc34d9a8aa7bcaac0770a741982b847c5
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index dd81c71026..9a7f1f1c94 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -502,7 +502,7 @@ void AudioFlinger::PlaybackThread::Track::destroy() void AudioFlinger::PlaybackThread::Track::appendDumpHeader(String8& result) { - result.appendFormat("Type Id Active Client Session S Flags " + result.appendFormat("Type Id Active Client Session Port Id S Flags " " Format Chn mask SRate " "ST Usg CT " " G db L dB R dB VS dB " @@ -588,7 +588,7 @@ void AudioFlinger::PlaybackThread::Track::appendDump(String8& result, bool activ ? 'r' /* buffer reduced */: bufferSizeInFrames > mFrameCount ? 'e' /* error */ : ' ' /* identical */; - result.appendFormat("%7s %6u %7u %2s 0x%03X " + result.appendFormat("%7s %6u %7u %7u %2s 0x%03X " "%08X %08X %6u " "%2u %3x %2x " "%5.2g %5.2g %5.2g %5.2g%c " @@ -596,6 +596,7 @@ void AudioFlinger::PlaybackThread::Track::appendDump(String8& result, bool activ active ? "yes" : "no", (mClient == 0) ? getpid() : mClient->pid(), mSessionId, + mPortId, getTrackStateString(), mCblk->mFlags, @@ -1886,7 +1887,7 @@ void AudioFlinger::RecordThread::RecordTrack::invalidate() void AudioFlinger::RecordThread::RecordTrack::appendDumpHeader(String8& result) { - result.appendFormat("Active Id Client Session S Flags " + result.appendFormat("Active Id Client Session Port Id S Flags " " Format Chn mask SRate Source " " Server FrmCnt FrmRdy Sil%s\n", isServerLatencySupported() ? " Latency" : ""); @@ -1894,7 +1895,7 @@ void AudioFlinger::RecordThread::RecordTrack::appendDumpHeader(String8& result) void AudioFlinger::RecordThread::RecordTrack::appendDump(String8& result, bool active) { - result.appendFormat("%c%5s %6d %6u %7u %2s 0x%03X " + result.appendFormat("%c%5s %6d %6u %7u %7u %2s 0x%03X " "%08X %08X %6u %6X " "%08X %6zu %6zu %3c", isFastTrack() ? 'F' : ' ', @@ -1902,6 +1903,7 @@ void AudioFlinger::RecordThread::RecordTrack::appendDump(String8& result, bool a mId, (mClient == 0) ? getpid() : mClient->pid(), mSessionId, + mPortId, getTrackStateString(), mCblk->mFlags, @@ -2142,15 +2144,16 @@ void AudioFlinger::MmapThread::MmapTrack::onTimestamp(const ExtendedTimestamp &t void AudioFlinger::MmapThread::MmapTrack::appendDumpHeader(String8& result) { - result.appendFormat("Client Session Format Chn mask SRate Flags %s\n", + result.appendFormat("Client Session Port Id Format Chn mask SRate Flags %s\n", isOut() ? "Usg CT": "Source"); } void AudioFlinger::MmapThread::MmapTrack::appendDump(String8& result, bool active __unused) { - result.appendFormat("%6u %7u %08X %08X %6u 0x%03X ", + result.appendFormat("%6u %7u %7u %08X %08X %6u 0x%03X ", mPid, mSessionId, + mPortId, mFormat, mChannelMask, mSampleRate, |