Merge "Improve dumpsys for capture threads" into lmp-dev (ca4805b6) · Commits · e / os / android_frameworks_av

services/audioflinger/Threads.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -4783,7 +4783,7 @@ AudioFlinger::RecordThread::RecordThread(const sp<AudioFlinger>& audioFlinger,
		, mPipeFramesP2(0)
		// mPipeMemory
		// mFastCaptureNBLogWriter
		, mFastTrackAvail(true)
		, mFastTrackAvail(false)
		{
		snprintf(mName, kNameLength, "AudioIn_%X", id);
		mNBLogWriter = audioFlinger->newWriter_l(kLogSize, mName);
		@@ -4895,6 +4895,7 @@ AudioFlinger::RecordThread::RecordThread(const sp<AudioFlinger>& audioFlinger,
		// FIXME
		#endif

		mFastTrackAvail = true;
		}
		failed: ;

		@@ -5745,6 +5746,7 @@ void AudioFlinger::RecordThread::dumpInternals(int fd, const Vector<String16>& a
		} else {
		dprintf(fd, " No active record clients\n");
		}
		dprintf(fd, " Fast capture thread: %s\n", hasFastCapture() ? "yes" : "no");
		dprintf(fd, " Fast track available: %s\n", mFastTrackAvail ? "yes" : "no");

		dumpBase(fd, args);

+3 −3

Original line number	Diff line number	Diff line
		@@ -1987,12 +1987,12 @@ void AudioFlinger::RecordThread::RecordTrack::invalidate()

		/static/ void AudioFlinger::RecordThread::RecordTrack::appendDumpHeader(String8& result)
		{
		result.append(" Active Client Fmt Chn mask Session S Server fCount Resampling\n");
		result.append(" Active Client Fmt Chn mask Session S Server fCount SRate\n");
		}

		void AudioFlinger::RecordThread::RecordTrack::dump(char* buffer, size_t size, bool active)
		{
		snprintf(buffer, size, " %6s %6u %3u %08X %7u %1d %08X %6zu %10d\n",
		snprintf(buffer, size, " %6s %6u %3u %08X %7u %1d %08X %6zu %5u\n",
		active ? "yes" : "no",
		(mClient == 0) ? getpid_cached : mClient->pid(),
		mFormat,
		@@ -2001,7 +2001,7 @@ void AudioFlinger::RecordThread::RecordTrack::dump(char* buffer, size_t size, bo
		mState,
		mCblk->mServer,
		mFrameCount,
		mResampler != NULL);
		mSampleRate);

		}